From ba46785fecb00dad37f9b41169ceb7e974839bc8 Mon Sep 17 00:00:00 2001 From: Martin Haye Date: Wed, 28 Mar 2018 14:48:43 -0700 Subject: [PATCH] Fix return to 2D map from automap. --- Platform/Apple/virtual/src/plasma/gameloop.pla | 5 +++++ Platform/Apple/virtual/src/tile/tileEngine.s | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Platform/Apple/virtual/src/plasma/gameloop.pla b/Platform/Apple/virtual/src/plasma/gameloop.pla index 740c471a..4cbcaa82 100644 --- a/Platform/Apple/virtual/src/plasma/gameloop.pla +++ b/Platform/Apple/virtual/src/plasma/gameloop.pla @@ -2983,7 +2983,12 @@ end /////////////////////////////////////////////////////////////////////////////////////////////////// // Load the automap engine and display the map def showAutomap()#1 + word x, y + getPos(@x, @y) loadEngine(MOD_AUTOMAP)=>automap_show() + if !mapIs3D + setPos(x, y) // Force tile engine to reload its maps and textures + fin returnFromEngine(TRUE) return 0 end diff --git a/Platform/Apple/virtual/src/tile/tileEngine.s b/Platform/Apple/virtual/src/tile/tileEngine.s index 6e893226..15eddd8b 100644 --- a/Platform/Apple/virtual/src/tile/tileEngine.s +++ b/Platform/Apple/virtual/src/tile/tileEngine.s @@ -1169,8 +1169,7 @@ SETPOS: +loadSection SE_MAP_LOC JSR FINISH_MAP_LOAD - ; And finally, render the first frame. - JSR DRAW + ; Let the client choose when to render the first frame. !if DEBUG { JSR .dbg } RTS