[Scummvm-cvs-logs] CVS: scummvm/queen graphics.h,1.37,1.38 graphics.cpp,1.46,1.47 defs.h,1.30,1.31

[Gregory Montoir]

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

Modified Files:
	graphics.h graphics.cpp defs.h 
Log Message:
fix 'chasing car disappearing for a frame' issue

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- graphics.h	15 Nov 2003 15:44:50 -0000	1.37
+++ graphics.h	17 Nov 2003 09:19:36 -0000	1.38
@@ -235,7 +235,7 @@
 	Input *_input;
 	Resource *_resource;
 
-	static const CarBamData CARBAM_DATA[];
+	static const CarBamData _carBamData[];
 
 };
 

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- graphics.cpp	15 Nov 2003 15:44:50 -0000	1.46
+++ graphics.cpp	17 Nov 2003 09:19:36 -0000	1.47
@@ -767,9 +767,13 @@
 
 void Graphics::initCarBamScene() {
 
+	debug(0, "Graphics::initCarBamScene()");
 	bobClear(5);
+	_bobs[5].active = true;
 	bobClear(6);
+	_bobs[6].active = true;
 	bobClear(7);
+	_bobs[7].active = true;
 	_bam.enable = true;
 	_bam.index = 0;
 }
@@ -778,7 +782,7 @@
 void Graphics::updateCarBamScene() {
 
 	if (_bam.enable) {
-		const CarBamData *cb = &CARBAM_DATA[_bam.index];
+		const CarBamData *cb = &_carBamData[_bam.index];
 		BobSlot *pbob;
 
 		// Truck
@@ -803,7 +807,8 @@
 		else {
 			++_bam.index;
 		}
-		// XXX if(bamsfx==2) // Play BKG SFX if(SFXTOGGLE) sfxplay(NULLstr);
+		// Play BKG SFX
+		// XXX if(bamsfx==2 && SFXTOGGLE) sfxplay(NULLstr);
 	}
 }
 
@@ -951,7 +956,7 @@
 
 
 
-const CarBamData Graphics::CARBAM_DATA[] = {
+const CarBamData Graphics::_carBamData[] = {
 	{ { 310, 105, 1 }, { 314, 106, 17 }, { 366, 101,  1 },  0 },
 	{ { 303, 105, 1 }, { 307, 106, 17 }, { 214,   0, 10 },  0 },
 	{ { 297, 104, 1 }, { 301, 105, 17 }, { 214,   0, 10 },  0 },

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/defs.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- defs.h	15 Nov 2003 15:44:50 -0000	1.30
+++ defs.h	17 Nov 2003 09:19:36 -0000	1.31
@@ -240,10 +240,11 @@
 
 //! GameState vars
 enum {
-	VAR_DRESSING_MODE  =  19, // 0=normal clothes, 1=underwear, 2=dress
-	VAR_ROOM73_CUTAWAY =  93,
-	VAR_INTRO_PLAYED   = 117,
-	VAR_CAN_CHANGE_CLOTES = 202
+	VAR_DRESSING_MODE      =  19, // 0=normal clothes, 1=underwear, 2=dress
+	VAR_ROOM73_CUTAWAY     =  93,
+	VAR_INTRO_PLAYED       = 117,
+	VAR_CAN_CHANGE_CLOTHES = 202,
+	VAR_AZURA_IN_LOVE      = 167
 };