[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.81,1.82 defs.h,1.33,1.34

[Gregory Montoir]

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

Modified Files:
	cutaway.cpp defs.h 
Log Message:
special moves 14, 25, 27, 29, 30, 33

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- cutaway.cpp	3 Dec 2003 20:53:59 -0000	1.81
+++ cutaway.cpp	4 Dec 2003 10:54:42 -0000	1.82
@@ -399,6 +399,16 @@
 			}
 			break;
 
+		// End game
+		case 14: {
+				int i;
+				for (i = 0; i < 40; ++i) {
+					_logic->update();
+				}
+				OSystem::instance()->quit();
+			}
+			break;
+
         // Dinocam
 		case 15:
 			_graphics->cameraBob(-1);
@@ -417,6 +427,8 @@
 			_graphics->cameraBob(0);
 			break;
 
+		// XXX sm17&18 : alternative intro
+
 		case 19:
 			_logic->gameState(VAR_AZURA_IN_LOVE, 1);
 			break;
@@ -477,6 +489,11 @@
 			}
 			break;
 
+		// Turn guard on
+		case 25:
+			_logic->gameState(85, 1);
+			break;
+
 		// c69g.CUT - Pan left 320 to 144
 		case 26:
 			_graphics->cameraBob(-1);
@@ -489,6 +506,26 @@
 			}
 			break;
 
+		// smooch
+		case 27: {
+				_graphics->cameraBob(-1);
+				BobSlot *bobAzura = _graphics->bob(5);
+				BobSlot *bobJoe = _graphics->bob(6);
+				while (_logic->display()->horizontalScroll() < 320) {
+					_logic->display()->horizontalScroll(_logic->display()->horizontalScroll() + 8);
+					if (bobJoe->x - bobAzura->x > 128) {
+						bobAzura->x += 10;
+						bobJoe->x += 6;
+					}
+					else {
+						bobAzura->x += 8;
+						bobJoe->x += 8;
+					}
+					_logic->update();
+				}
+			}
+			break;
+
 		// c75b.cut - Lightning hits plane
 		case 28:
 			{
@@ -575,6 +612,45 @@
 			}
 			break;
 			
+		// Scale blimp - end game!
+		case 29: {
+				int16 z = 256;
+				BobSlot *bob = _graphics->bob(7);
+				int16 x = bob->x;
+				int16 y = bob->y;
+				while (bob->x > 150) {
+					bob->x = x * 256 / z + 150;
+					bob->x = y * 256 / z + 112;
+					bob->scale = 100 * 256 / z;
+
+					++z;
+					if (z % 6 == 0) {
+						--x;
+					}
+
+					_logic->update();
+				}
+			}
+			break;
+
+		// scale ending
+		case 30: {
+				_graphics->bob(7)->active = false; // Turn off blimp
+				BobSlot *b = _graphics->bob(20);
+				b->x = 160;
+				b->y = 100;
+				int i;
+				for (i = 5; i <= 100; i += 5) {
+					b->scale = i;
+					_logic->update();
+				}
+				for (i = 0; i < 50; ++i) {
+					_logic->update();
+				}
+				_logic->display()->palFadeOut(0, 255, _logic->currentRoom());
+			}
+            break;
+
 		// c74a.cut - Wait for car to reach correct position before pouring oil
 		case 31:
 			while (_graphics->bamData()->index != 60) {
@@ -590,6 +666,16 @@
 			_logic->update();
 			break;
 
+		// Attempt puzzle
+		case 33: {
+				static short n = 0;
+				++n;
+				if (n & 4) {
+					_logic->joeSpeak(226, true);
+				}
+			}
+			break;
+
 		// cred.cut - scale title
 		case 34:
 			{
@@ -607,6 +693,8 @@
 				}
 			}
 			break;
+
+		// XXX sm35: demo
 
 		// cdint.cut - pan right fast
 		case 36:

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/defs.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- defs.h	3 Dec 2003 10:32:12 -0000	1.33
+++ defs.h	4 Dec 2003 10:54:43 -0000	1.34
@@ -249,8 +249,11 @@
 	ROOM_UNUSED_INTRO_4       =  93,
 	ROOM_UNUSED_INTRO_5       =  94,
 	FOTAQ_LOGO                =  95,
-	AZURA_1                   = 106,
-	WARNER_LOGO               = 126
+	WARNER_LOGO               = 126,
+
+	FAYE_HEAD                 =  37,
+	AZURA_HEAD                = 106,
+	FRANK_HEAD                = 107
 };