rename some methods (purely cosmetic) and fix some walking problems when closing Journal screen

svn-id: r11373

1 files changed, 8 insertions, 4 deletions

diff --git a/queen/walk.h b/queen/walk.h
index 879e81364f..b503270c4a 100644
--- a/queen/walk.h
+++ b/queen/walk.h
@@ -71,18 +71,20 @@ public:
 
 	Walk(Logic *logic, Graphics *graphics);
 
-	int16 joeMove(int direction, int16 endx, int16 endy, bool inCutaway);
-	
-	int16 personMove(const Person *pp, int16 endx, int16 endy, uint16 curImage, int direction);
+	int16 moveJoe(int direction, int16 endx, int16 endy, bool inCutaway);
+	int16 movePerson(const Person *pp, int16 endx, int16 endy, uint16 curImage, int direction);
+
+	void stopJoe();
 
 	enum {
 		MAX_WALK_DATA = 16
 	};
 
+
 private:
 
 	void animateJoePrepare();
-	bool animateJoe();
+	void animateJoe();
 
 	void animatePersonPrepare(const MovePersonData *mpd, int direction);
 	void animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum, uint16 bankNum, int direction);
@@ -121,6 +123,8 @@ private:
 	uint16 _areaList[MAX_WALK_DATA];
 	uint16 _areaListCount;
 
+	bool _joeInterrupted;
+
 	//! set if customMoveJoe() is called in joeAnimate()
 	bool _joeMoveBlock;