[Scummvm-cvs-logs] CVS: scummvm/queen graphics.h,1.26,1.27 graphics.cpp,1.29,1.30

[Gregory Montoir]

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

Modified Files:
	graphics.h graphics.cpp 
Log Message:
fix truck intro problem

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- graphics.h	18 Oct 2003 17:12:50 -0000	1.26
+++ graphics.h	18 Oct 2003 19:40:11 -0000	1.27
@@ -55,7 +55,7 @@
 	//! associated BobFrame
 	uint16 frameNum;
 	//! 'direction' for the next frame (-1, 1)
-	uint8 frameDir;
+	int frameDir;
 
 	//! animation stuff
 	bool animating;

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- graphics.cpp	18 Oct 2003 17:12:50 -0000	1.29
+++ graphics.cpp	18 Oct 2003 19:40:11 -0000	1.30
@@ -155,6 +155,8 @@
 
 void Graphics::bobAnimNormal(uint32 bobnum, uint16 firstFrame, uint16 lastFrame, uint16 speed, bool rebound, bool xflip) {
 
+	debug(9, "Graphics::bobAnimNormal(%d, %d, %d, %d)", bobnum, firstFrame, lastFrame, speed);
+
 	BobSlot *pbs = &_bobs[bobnum];
 	pbs->active = true;
 	pbs->animating = true;
@@ -281,7 +283,7 @@
 		if(anim.speed == 0) {
 			anim.speed = anim.speedBak;
 
-			uint16 nextFrame = frameNum + frameDir;
+			int16 nextFrame = frameNum + frameDir;
 			if (nextFrame > anim.normal.lastFrame || nextFrame < anim.normal.firstFrame) {
 				if (anim.normal.rebound) {
 					frameDir *= -1;
@@ -426,6 +428,7 @@
 
 	pbs->active = 0;
 	pbs->xflip  = false;
+	pbs->animating = false;
 	pbs->anim.string.buffer = NULL;
 	pbs->moving = false;
 	pbs->scale  = 100;