From cfc84188c66e938874a7c36d4d254db4001885cd Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Fri, 24 Jun 2016 07:16:08 -0700
Subject: [PATCH] Fixed bug with game load.

---
 Platform/Apple/virtual/src/plasma/diskops.pla  | 2 +-
 Platform/Apple/virtual/src/plasma/gameloop.pla | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Platform/Apple/virtual/src/plasma/diskops.pla b/Platform/Apple/virtual/src/plasma/diskops.pla
index c3669c58..45503e89 100644
--- a/Platform/Apple/virtual/src/plasma/diskops.pla
+++ b/Platform/Apple/virtual/src/plasma/diskops.pla
@@ -175,10 +175,10 @@ end
 def _saveGame()
 
   // Perform garbage collection and record the size of the heap so we can restore it correctly
+  mmgr(FINISH_LOAD, WITH_CLOSE)
   global=>w_heapSize = mmgr(HEAP_COLLECT, 0) - HEAP_BOTTOM
 
   // Copy data to main memory
-  mmgr(FINISH_LOAD, WITH_CLOSE)
   showMapName("Saving game...")
   diskActivity($FF)
   copyHeap(0)  // aux to main
diff --git a/Platform/Apple/virtual/src/plasma/gameloop.pla b/Platform/Apple/virtual/src/plasma/gameloop.pla
index ecc8e6e2..21f01353 100644
--- a/Platform/Apple/virtual/src/plasma/gameloop.pla
+++ b/Platform/Apple/virtual/src/plasma/gameloop.pla
@@ -2151,6 +2151,7 @@ def startGame()
     q_mapNum = 0
     initMap(q_x, q_y, q_dir)
   else
+    q_mapNum = 0
     restoreMapPos()
   fin
 end