[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.59,1.60 logic.cpp,1.139,1.140 logic.h,1.92,1.93

[Gregory Montoir]

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

Modified Files:
	graphics.cpp logic.cpp logic.h 
Log Message:
enable alternative introduction

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- graphics.cpp	26 Dec 2003 15:36:28 -0000	1.59
+++ graphics.cpp	27 Dec 2003 12:58:26 -0000	1.60
@@ -598,11 +598,9 @@
 		break;
 	case ROOM_CAR_CHASE:
 		_vm->bam()->updateCarAnimation();
-//		updateCarBamScene();
 		break;
 	case ROOM_FINAL_FIGHT:
 		_vm->bam()->updateFightAnimation();
-//		updateFightBamScene();
 		break;
 	case ROOM_INTRO_RITA_JOE_HEADS: // CR 2 - CD-Rom pan right while Rita talks...
 		_cameraBob = -1;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- logic.cpp	26 Dec 2003 14:49:49 -0000	1.139
+++ logic.cpp	27 Dec 2003 12:58:26 -0000	1.140
@@ -2481,13 +2481,17 @@
 			playCutaway("copy.cut");
 			playCutaway("clogo.cut");
 
-			// TODO enable talking for talkie version
+			// XXX enable talking for talkie version
 
-			playCutaway("cdint.cut");
+			if (ConfMan.getBool("alt_intro")) {
+				_vm->graphics()->loadPanel();
+				playCutaway("cintr.cut");
+			}
+			else {
+				playCutaway("cdint.cut");
+				_vm->graphics()->loadPanel();
+			}
 
-			// restore palette colors ranging from 144 to 256
-			_vm->graphics()->loadPanel();
-			
 			playCutaway("cred.cut");
 		}
 
@@ -2630,8 +2634,8 @@
 		&Logic::asmPutCameraOnDino,
 		/* 16 */
 		&Logic::asmPutCameraOnJoe,
-		NULL, // XXX alternative introduction
-		NULL, // XXX alternative introduction
+		&Logic::asmAltIntroPanRight, // cintr.cut
+		&Logic::asmAltIntroPanLeft,  // cintr.cut
 		&Logic::asmSetAzuraInLove,
 		/* 20 */
 		&Logic::asmPanRightFromJoe,
@@ -2824,6 +2828,41 @@
 void Logic::asmPutCameraOnJoe() {
 
 	_vm->graphics()->cameraBob(0);
+}
+
+
+void Logic::asmAltIntroPanRight() {
+
+	_vm->graphics()->cameraBob(-1);
+	_vm->input()->fastMode(true);
+	update();
+	int16 scrollx = _vm->display()->horizontalScroll();
+	while (scrollx < 285 && !_vm->input()->cutawayQuit()) {
+		++scrollx;
+		if (scrollx > 285) {
+			scrollx = 285;
+		}
+		_vm->display()->horizontalScroll(scrollx);
+		update();
+	}
+	_vm->input()->fastMode(false);
+}
+
+
+void Logic::asmAltIntroPanLeft() {
+
+	_vm->graphics()->cameraBob(-1);
+	_vm->input()->fastMode(true);
+	int16 scrollx = _vm->display()->horizontalScroll();
+	while (scrollx > 0 && !_vm->input()->cutawayQuit()) {
+		scrollx -= 4;
+		if (scrollx < 0) {
+			scrollx = 0;
+		}
+		_vm->display()->horizontalScroll(scrollx);
+		update();
+	}
+	_vm->input()->fastMode(false);
 }
 
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- logic.h	26 Dec 2003 12:58:27 -0000	1.92
+++ logic.h	27 Dec 2003 12:58:26 -0000	1.93
@@ -264,6 +264,8 @@
 	void asmEndGame();
 	void asmPutCameraOnDino();
 	void asmPutCameraOnJoe();
+	void asmAltIntroPanRight();
+	void asmAltIntroPanLeft();
 	void asmSetAzuraInLove();
 	void asmPanRightFromJoe();
 	void asmSetLightsOff();