[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.38,1.39 graphics.h,1.29,1.30 graphics.cpp,1.31,1.32

[Gregory Montoir]

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

Modified Files:
	cutaway.cpp graphics.h graphics.cpp 
Log Message:
fix missing thugs & Hugh during intro + smoother scrolling + flashspecial (sm37)

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cutaway.cpp	19 Oct 2003 11:41:24 -0000	1.38
+++ cutaway.cpp	20 Oct 2003 12:30:34 -0000	1.39
@@ -305,7 +305,7 @@
 				_graphics->cameraBob(-1);
 				// XXX fastmode = 1;
 
-				_graphics->update();
+				_graphics->update(true);
 				
 				int i = 4, k = 160;
 
@@ -340,18 +340,18 @@
 
 					display->horizontalScroll(horizontalScroll);
 
-					bob_thugA1->x += i * 2; 
-					bob_thugA2->x += i * 2; 
-					bob_thugA3->x += i * 2;
+					bob_thugA1->x -= i * 2; 
+					bob_thugA2->x -= i * 2; 
+					bob_thugA3->x -= i * 2;
 
-					bob_hugh1->x += i * 3;
-					bob_hugh2->x += i * 3;
-					bob_hugh3->x += i * 3;
+					bob_hugh1->x -= i * 3;
+					bob_hugh2->x -= i * 3;
+					bob_hugh3->x -= i * 3;
 
-					bob_thugB1->x += i * 4;
-					bob_thugB2->x += i * 4;
+					bob_thugB1->x -= i * 4;
+					bob_thugB2->x -= i * 4;
 
-					_graphics->update();
+					_graphics->update(true);
 
 					if (_quit)
 						return;
@@ -364,7 +364,7 @@
 		
 		// cdint.cut - flash white
 		case 37:
-			// XXX flashspecial();
+			_logic->display()->palCustomFlash();
 			break;
 
 		// cdint.cut - pan right
@@ -381,7 +381,7 @@
 				_graphics->cameraBob(-1);
 				// XXX fastmode = 1;
 					
-				_graphics->update();
+				_graphics->update(true);
 
 				bob_box  ->x += 280 * 2;
 				bob_beam ->x += 30;
@@ -389,7 +389,7 @@
 
 				int horizontalScroll = display->horizontalScroll();
 
-				int i = 4;	// XXX 1 in original source code
+				int i = 1;
 				while (horizontalScroll < 290) {
 
 					horizontalScroll = horizontalScroll + i;
@@ -406,7 +406,7 @@
 					bob_clock->x -= i * 2;
 					bob_hands->x -= i * 2;
 
-					_graphics->update();
+					_graphics->update(true);
 
 					if (_quit)
 						return;
@@ -445,7 +445,7 @@
 
 					bob22->x += i;
 
-					_graphics->update();
+					_graphics->update(true);
 
 					if (_quit)
 						return;

Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- graphics.h	20 Oct 2003 08:34:47 -0000	1.29
+++ graphics.h	20 Oct 2003 12:30:34 -0000	1.30
@@ -131,7 +131,7 @@
 	void bobDrawAll(); // drawbobs()
 	void bobClearAll(); // clearallbobs()
 	BobSlot *bob(int index);
-	void bobCustomParallax(uint16 roomNum);
+	void bobCustomParallax(uint16 roomNum); // CHECK_PARALLAX()
 
 	void bobSetText(
 		BobSlot *bob, 
@@ -161,7 +161,7 @@
 	void cameraBob(int bobNum);
 	int cameraBob() { return _cameraBob; }
 
-	void update();
+	void update(bool fastmode = false);
 
 
 private:

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- graphics.cpp	20 Oct 2003 08:34:48 -0000	1.31
+++ graphics.cpp	20 Oct 2003 12:30:34 -0000	1.32
@@ -806,7 +806,7 @@
 }
 
 
-void Graphics::update() {
+void Graphics::update(bool fastmode) {
 	// FIXME: temporary code, move to Logic::update()
 	bobSortAll();
 	if (_cameraBob >= 0) {
@@ -821,8 +821,10 @@
 	_display->prepareUpdate();
 	bobDrawAll();
 	textDrawAll();
-	g_queen->delay(100);
-	_display->palCustomScroll(0); //_currentRoom
+	if (!fastmode) {
+		g_queen->delay(100);
+	}
+	_display->palCustomScroll(_lastRoom);
 	_display->update(_bobs[0].active, _bobs[0].x, _bobs[0].y);
 }