[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.75,1.76 logic.cpp,1.116,1.117 graphics.h,1.44,1.45 graphics.cpp,1.54,1.55 cutaway.cpp,1.77,1.78 talk.cpp,1.50,1.51

[Gregory Montoir]

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

Modified Files:
	logic.h logic.cpp graphics.h graphics.cpp cutaway.cpp talk.cpp 
Log Message:
fix klunk scene glitches

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- logic.h	2 Dec 2003 16:49:56 -0000	1.75
+++ logic.h	3 Dec 2003 13:00:52 -0000	1.76
@@ -230,6 +230,7 @@
 
 	uint16 animCreate(uint16 curImage, const Person *person); // CREATE_ANIM
 	void animErase(uint16 bobNum);
+	void animReset(uint16 bobNum);
 	void animSetup(const GraphicData *gd, uint16 firstImage, uint16 bobNum, bool visible); // FIND_GRAPHIC_ANIMS
 
 	void joeSetupFromBanks(const char *animBank, const char *standBank);

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- logic.cpp	3 Dec 2003 10:32:12 -0000	1.116
+++ logic.cpp	3 Dec 2003 13:00:53 -0000	1.117
@@ -1505,6 +1505,14 @@
 }
 
 
+void Logic::animReset(uint16 bobNum) {
+
+	if (_newAnim[bobNum][0].frame != 0) {
+		_graphics->bob(bobNum)->animString(_newAnim[bobNum]);
+	}
+}
+
+
 void Logic::animSetup(const GraphicData *gd, uint16 firstImage, uint16 bobNum, bool visible) {
 	
 	int16 tempFrames[20];
@@ -1898,7 +1906,9 @@
 	}
 	_display->fullscreen(true);
 	Talk::talk(dlgFile, personInRoom, cutaway, _graphics, _input, this, _resource, _sound);
-	_display->fullscreen(false);
+	if (!cutaway[0]) {
+		_display->fullscreen(false);
+	}
 }
 
 

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- graphics.h	1 Dec 2003 22:36:39 -0000	1.44
+++ graphics.h	3 Dec 2003 13:00:54 -0000	1.45
@@ -89,7 +89,6 @@
 
 	void animString(const AnimFrame *animBuf);
 	void animNormal(uint16 firstFrame, uint16 lastFrame, uint16 speed, bool rebound, bool xflip);
-	void animReset();
 
 	void clear();
 };

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- graphics.cpp	3 Dec 2003 10:32:12 -0000	1.54
+++ graphics.cpp	3 Dec 2003 13:00:55 -0000	1.55
@@ -185,23 +185,6 @@
 }
 
 
-void BobSlot::animReset() {
-
-	if(active) {
-		const AnimFrame *af = anim.string.buffer;
-		if (af != NULL) {
-			animating = true;
-			anim.string.curPos = af;
-			frameNum = af->frame;
-			anim.speed = af->speed / 4;
-		}
-		else {
-			animating = false;
-		}
-	}
-}
-
-
 void BobSlot::clear() {
 
 	active = false;

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- cutaway.cpp	1 Dec 2003 20:48:39 -0000	1.77
+++ cutaway.cpp	3 Dec 2003 13:00:55 -0000	1.78
@@ -1444,8 +1444,7 @@
 			if (object->image == -3 || object->image == -4) {
 				k++;
 				if (object->name > 0) {
-					BobSlot *bs = _graphics->bob(k);
-					bs->animReset();
+					_logic->animReset(k);
 				}
 			}
 		}

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- talk.cpp	1 Dec 2003 20:48:40 -0000	1.50
+++ talk.cpp	3 Dec 2003 13:00:56 -0000	1.51
@@ -354,7 +354,7 @@
 		pbs->y = person.actor->y;
 		
 		// Better kick start the persons anim sequence
-		pbs->animReset();
+		_logic->animReset(person.actor->bobNum);
 	}
 
 	_talkHead = false;