From 329a7070ce896963741e1f775bde41f5ac6973ba Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Wed, 6 May 2015 09:45:59 -0700
Subject: [PATCH] Cleaned some debug stuff up.

---
 .../Apple/virtual/src/plasma/gameloop.pla     | 24 ++++++-------------
 Platform/Apple/virtual/src/tile/tile.s        |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Platform/Apple/virtual/src/plasma/gameloop.pla b/Platform/Apple/virtual/src/plasma/gameloop.pla
index 6abac668..119cb7ec 100644
--- a/Platform/Apple/virtual/src/plasma/gameloop.pla
+++ b/Platform/Apple/virtual/src/plasma/gameloop.pla
@@ -573,7 +573,7 @@ def loadFrameImg()
     titleLoaded = FALSE
   fin
   loader(SET_MEM_TARGET, MAIN_MEM, $2000)
-  loader(QUEUE_LOAD,     MAIN_MEM, (3-mapIs3D)<<8 | RES_TYPE_SCREEN)
+  loader(QUEUE_LOAD,     MAIN_MEM, (mapIs3D+2)<<8 | RES_TYPE_SCREEN)
   loader(LOCK_MEMORY,    MAIN_MEM, $2000)
 end
 
@@ -618,9 +618,7 @@ def initMap(x, y, dir)
   // Start up the display engine with map data and starting position. This will also load and
   // init the script module, if any, which will end up calling us back at the setScriptInfo
   triggerTbl = NULL
-  printf2("initDisplay: mapNum=%d pMap=%x\n", mapNum, pMap)
   initDisplay(mapNum, pMap, x, y, dir)
-  puts("Back from initDisplay.\n")
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -775,23 +773,18 @@ def setMap(is3D, num, x, y, dir)
   checkScripts()
 end
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def debugPos()
-  word x, y
-  ^$c053
-  getPos(@x, @y)
-  printf2("x=%d y=%d\n", x, y)  
-end
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def teleport()
   word x, y
   ^$c053
-  if ^$25 < 20; ^$25 = 20; crout(); fin
-  puts("X: ")
+  if ^$25 < 23; ^$25 = 23; fin
+  getPos(@x, @y)
+  printf2("\nCurrent location: X=%d Y=%d\n", x, y)
+  puts("New X: ")
   x = parseDec(getstr())
-  puts("Y: ")
+  puts("New Y: ")
   y = parseDec(getstr())
+  ^$c052
   setMap(mapIs3D, mapNum, x, y, 0)
 end
 
@@ -813,7 +806,6 @@ def kbdLoop()
       func = cmdTbl[key]
       if func; func(); fin
     fin
-    debugPos()
   loop
 end
 
@@ -822,8 +814,6 @@ end
 // is called by the init function for the scripts.
 def setScriptInfo(mapName, trigTbl)
 
-  printf2("scriptInfo: mapName=%x trigTbl=%x\n", mapName, trigTbl)
-
   // Record the trigger table pointer
   triggerTbl = trigTbl
 
diff --git a/Platform/Apple/virtual/src/tile/tile.s b/Platform/Apple/virtual/src/tile/tile.s
index e1fb74ac..c1686ec8 100644
--- a/Platform/Apple/virtual/src/tile/tile.s
+++ b/Platform/Apple/virtual/src/tile/tile.s
@@ -12,7 +12,7 @@
 !source "../include/mem.i"
 !source "../include/plasma.i"
 
-DEBUG       = 1     ; 1=some logging, 2=lots of logging
+DEBUG       = 0     ; 1=some logging, 2=lots of logging
 
 HEADER_LENGTH=6
 SECTION_WIDTH=22