[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.90,1.91 graphics.cpp,1.43,1.44 talk.cpp,1.35,1.36

Gregory Montoir cyx at users.sourceforge.net
Mon Nov 10 06:07:07 CET 2003


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

Modified Files:
	logic.cpp graphics.cpp talk.cpp 
Log Message:
fix some bugs :
- bettle not disappearing when caught
- wrong Joe position when switching rooms
- bellboy dispappearing after spoken to him (partially fixed)


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- logic.cpp	10 Nov 2003 12:21:10 -0000	1.90
+++ logic.cpp	10 Nov 2003 14:06:55 -0000	1.91
@@ -1098,7 +1098,7 @@
 
 	if (pod->image == -3 || pod->image == -4) {
 		// a person object
-		if (pod->name < 0) {
+		if (pod->name <= 0) {
 			_graphics->bobClear(curBob);
 		}
 		else {
@@ -1626,6 +1626,14 @@
 
 	// check to see which way Joe entered room
 	_joe.facing = State::findDirection(pod->state);
+	switch (_joe.facing) {
+	case DIR_BACK:
+		_joe.facing = DIR_FRONT;
+		break;
+	case DIR_FRONT:
+		_joe.facing = DIR_BACK;
+		break;
+	}
 	_joe.prevFacing = _joe.facing;
 
 	BobSlot *pbs = _graphics->bob(0);

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- graphics.cpp	8 Nov 2003 23:45:45 -0000	1.43
+++ graphics.cpp	10 Nov 2003 14:06:55 -0000	1.44
@@ -325,6 +325,7 @@
 
 	if(active && animating) {
 		const AnimFrame *af = anim.string.buffer;
+		printf("animReset() - %X %X", af->frame, af->speed);
 		if (af != NULL) {
 			anim.string.curPos = af;
 			frameNum = af->frame;
@@ -467,7 +468,7 @@
 
 	BobSlot *pbs = &_bobs[bobnum];
 
-	pbs->active = 0;
+	pbs->active = false;
 	pbs->xflip  = false;
 	pbs->animating = false;
 	pbs->anim.string.buffer = NULL;

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- talk.cpp	9 Nov 2003 14:16:46 -0000	1.35
+++ talk.cpp	10 Nov 2003 14:06:55 -0000	1.36
@@ -354,10 +354,9 @@
 		pbs->y = person.actor->y;
 		
 		_logic->display()->fullscreen(_wasFullscren);
-
-		// XXX if (P_ANIMstr[0] != '\0')
-			// Better kick start the persons anim sequence
-		// XXX 	stringanim(BNUM,NEW_ANIM[BNUM]);
+		// Better kick start the persons anim sequence
+		pbs->animating = true;
+		pbs->animReset();
 	}
 
 	_talkHead = false;





More information about the Scummvm-git-logs mailing list