[Scummvm-cvs-logs] CVS: scummvm/queen walk.cpp,1.17,1.18

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv16403

Modified Files:
	walk.cpp 
Log Message:
init Walk::_joeMoveBlock at the right place

Index: walk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/walk.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- walk.cpp	2 Nov 2003 16:47:31 -0000	1.17
+++ walk.cpp	3 Nov 2003 14:48:07 -0000	1.18
@@ -292,6 +292,7 @@
 
 int16 Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) {
 
+	_joeMoveBlock = false;
 	int16 can = 0;
 	initWalkData();
 
@@ -330,6 +331,7 @@
 	// XXX walkgameload=0;
 	if (_joeMoveBlock) {
 		can = -2;
+		_joeMoveBlock = false;
 	}
 	else if (direction > 0) {
 		_logic->joeFacing(direction);
@@ -595,7 +597,6 @@
 	memset(_areaStrike, 0, sizeof(_areaStrike));
 	_areaListCount = 0;
 	memset(_areaList, 0, sizeof(_areaList));
-	_joeMoveBlock = false;
 }