[Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.36,1.37 script_v6.cpp,1.183,1.184 string.cpp,1.156,1.157

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25738

Modified Files:
	actor.h script_v6.cpp string.cpp 
Log Message:
fix for bug #782086 (COMI: a long walk)

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- actor.h	3 Sep 2003 17:00:33 -0000	1.36
+++ actor.h	9 Sep 2003 19:30:25 -0000	1.37
@@ -157,7 +157,9 @@
 	byte *getActorName();
 	void startWalkActor(int x, int y, int dir);
 	void stopActorMoving();
+protected:
 	void startWalkAnim(int cmd, int angle);
+public:
 	void startAnimActor(int frame);
 
 	void remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- script_v6.cpp	7 Sep 2003 19:28:45 -0000	1.183
+++ script_v6.cpp	9 Sep 2003 19:30:25 -0000	1.184
@@ -1167,7 +1167,7 @@
 
 	_fullRedraw = 1;
 
-	if (x != -1) {
+	if (x != -1 && x != 0x7FFFFFFF) {
 		a->startWalkActor(x, y, -1);
 	}
 }

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- string.cpp	1 Sep 2003 03:08:32 -0000	1.156
+++ string.cpp	9 Sep 2003 19:30:25 -0000	1.157
@@ -690,8 +690,6 @@
 }
 
 void Scumm::drawBlastTexts() {
-	// FIXME
-
 	byte *buf;
 	int c;
 	int i;