From 871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Wed, 26 Nov 2003 20:40:43 +0000
Subject: rename some methods (purely cosmetic) and fix some walking problems
 when closing Journal screen

svn-id: r11373
---
 queen/logic.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'queen/logic.cpp')

diff --git a/queen/logic.cpp b/queen/logic.cpp
index 5ce1995a65..7b20e4c593 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -1244,7 +1244,7 @@ void Logic::roomDisplay(const char *room, RoomDisplayMode mode, uint16 scale, in
 		}
 //	}
 	if (pod != NULL) {
-		_walk->joeMove(0, pod->x, pod->y, inCutaway);
+		_walk->moveJoe(0, pod->x, pod->y, inCutaway);
 	}
 }
 
@@ -2556,15 +2556,26 @@ void Logic::useJournal() {
 		Talk::speak("This is a demo, so I can't load or save games*14", NULL, "", _graphics, _input, this, _resource, _sound);
 	}
 	else {
-		// XXX (execute.c l.428-437 & queen.c l.350-365)
+
 		// XXX save some vars
+		// 
+		// XXX tmpbamflag=bamflag;
+		// XXX bamflag=0;
+		// XXX in_journal=1;
+
+		_cmd->clear(false);
+
 		Journal j(this, _graphics, _display, _sound, &_settings);
 		j.use();
+
+		_walk->stopJoe();
+
 		// XXX restore vars
+		// 
+		// XXX in_journal=0;
+		// XXX bamflag=tmpbamflag;
+		// XXX TALKQUIT=CUTQUIT=0; Make sure that we turn off cut stuff in case we use Journal during cutaways
 
-		// _graphics->bob(0)->moving = false;
-		// joeWalk(JWM_EXECUTE); // make sure we exit Move_Joe()
-		// XXX _walk->stopJoe();
 	}
 }
 
-- 
cgit v1.2.3