[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.47,1.48 defs.h,1.31,1.32

[Gregory Montoir]

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

Modified Files:
	graphics.cpp defs.h 
Log Message:
use constants instead of plain integers for room numbers

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- graphics.cpp	17 Nov 2003 09:19:36 -0000	1.47
+++ graphics.cpp	20 Nov 2003 09:39:29 -0000	1.48
@@ -588,23 +588,23 @@
 	int i;
 	uint16 screenScroll = _display->horizontalScroll();
 	switch (roomNum) {
-	case 17:
-		_bobs[8].x = 250 - screenScroll + screenScroll / 2;
+	case ROOM_AMAZON_HIDEOUT:
+		_bobs[8].x = 250 - screenScroll / 2;
 		break;
-	case 100:
-		_bobs[5].x = 410 - screenScroll + screenScroll / 2;
-		_bobs[6].x = 790 - screenScroll + screenScroll / 2;
+	case ROOM_TEMPLE_MAZE5:
+		_bobs[5].x = 410 - screenScroll / 2;
+		_bobs[6].x = 790 - screenScroll / 2;
 		break;
-	case 43:
-		_bobs[5].x = 320 - screenScroll + screenScroll / 2;
+	case ROOM_TEMPLE_OUTSIDE:
+		_bobs[5].x = 320 - screenScroll / 2;
 		break;
-	case 51:
-		_bobs[5].x = 280 - screenScroll + screenScroll / 2;
+	case ROOM_TEMPLE_TREE:
+		_bobs[5].x = 280 - screenScroll / 2;
 		break;
-	case 67:
-		_bobs[5].x = 600 - screenScroll + screenScroll / 2;
+	case ROOM_VALLEY_CARCASS:
+		_bobs[5].x = 600 - screenScroll / 2;
 		break;
-	case 73 :
+	case ROOM_HOTEL_LOBBY:
 		if(_display->fullscreen()) {
 			for(i = 1; i <= 3; ++i) {
 				_bobs[i].box.y2 = 199;
@@ -612,27 +612,27 @@
 			_bobs[24].box.y2 = 199;
 		}
 		break;
-	case 90 :
-		_bobs[5].x = 340 - screenScroll + screenScroll / 2;
-		_bobs[6].x = 50 - screenScroll + screenScroll / 2;
-		_bobs[7].x = 79 - screenScroll + screenScroll / 2;
+	case ROOM_UNUSED_INTRO_1:
+		_bobs[5].x = 340 - screenScroll / 2;
+		_bobs[6].x = 50 - screenScroll / 2;
+		_bobs[7].x = 79 - screenScroll / 2;
 		for(i = 1; i <= 8; ++i) {
 			_bobs[i].box.y2 = 199;
 		}
 		_bobs[20].box.y2 = 199;
 		break;
-	case 94 :
+	case ROOM_UNUSED_INTRO_5:
 		for(i = 0; i < 3; ++i) {
 			_bobs[i].box.y2 = 199;
 		}
 		break;
-	case 74 : // Carbam
+	case ROOM_CAR_CHASE:
 		updateCarBamScene();
 		break;
-	case 69 : // Fight1
-		warning("Graphics::bobCustomParallax() - room 69 not handled");
+	case ROOM_FINAL_FIGHT:
+		warning("Graphics::bobCustomParallax() - ROOM_FINAL_FIGHT not handled");
 		break;
-	case 116: // CR 2 - CD-Rom pan right while Rita talks...
+	case ROOM_INTRO_RITA_JOE_HEADS: // CR 2 - CD-Rom pan right while Rita talks...
 		_cameraBob = -1;
 		debug(9, "Graphics::bobCustomParallax() - %d", screenScroll);
 		if (screenScroll < 80) {
@@ -645,7 +645,7 @@
 			_bobs[21].x -= 2;
 		}
 		break;
-	case 123: // CR 2 - CD-Rom the guys move off screen
+	case ROOM_INTRO_EXPLOSION: // CR 2 - CD-Rom the guys move off screen
 		_bobs[21].x += 2;
 		_bobs[21].y += 2;
 		break;

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/defs.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- defs.h	17 Nov 2003 09:19:36 -0000	1.31
+++ defs.h	20 Nov 2003 09:39:29 -0000	1.32
@@ -181,11 +181,11 @@
 };
 
 enum {
-	ROOM_JUNGLE_INSIDE_PLANE  =  1,
-	ROOM_JUNGLE_OUTSIDE_PLANE =  2,
-	ROOM_JUNGLE_PINNACLE      =  7,
-	ROOM_JUNGLE_SLOTH         =  8,
-	ROOM_JUNGLE_BUD_SKIP      =  9,
+	ROOM_JUNGLE_INSIDE_PLANE  =   1,
+	ROOM_JUNGLE_OUTSIDE_PLANE =   2,
+	ROOM_JUNGLE_PINNACLE      =   7,
+	ROOM_JUNGLE_SLOTH         =   8,
+	ROOM_JUNGLE_BUD_SKIP      =   9,
 	ROOM_JUNGLE_BEETLE        =  11,
 	ROOM_JUNGLE_MISSIONARY    =  13,
 	
@@ -209,18 +209,29 @@
 	ROOM_TEMPLE_OUTSIDE       =  43,
 	ROOM_TEMPLE_MUMMIES       =  46,
 	ROOM_TEMPLE_ZOMBIES       =  50,
+	ROOM_TEMPLE_TREE          =  51,
 	ROOM_TEMPLE_SNAKE         =  53,
 	ROOM_TEMPLE_LIZARD_LASER  =  55,
 	ROOM_TEMPLE_MAZE          =  58,
 	ROOM_TEMPLE_MAZE2         =  59,
 	ROOM_TEMPLE_MAZE3         =  60,
 	ROOM_TEMPLE_MAZE4         =  61,
+	ROOM_TEMPLE_MAZE5         = 100,
+
+	ROOM_VALLEY_CARCASS       =  67,
 	
 	ROOM_HOTEL_UPSTAIRS       =  70,
 	ROOM_HOTEL_DOWNSTAIRS     =  71,
 	ROOM_HOTEL_LOLA           =  72,
 	ROOM_HOTEL_LOBBY          =  73,
 
+	ROOM_CAR_CHASE            =  74,
+
+	ROOM_FINAL_FIGHT          =  69,
+
+	ROOM_INTRO_RITA_JOE_HEADS = 116,
+	ROOM_INTRO_EXPLOSION      = 123,
+
 	//special
 	SPARKY_OUTSIDE_HOTEL      =  77,
 	DEATH_MASK                =  79,
@@ -228,10 +239,11 @@
 	COMIC_1                   =  87,
 	COMIC_2                   =  88,
 	COMIC_3                   =  89,
-	UNUSED_INTRO_1            =  91,
-	UNUSED_INTRO_2            =  92,
-	UNUSED_INTRO_3            =  93,
-	UNUSED_INTRO_4            =  94,
+	ROOM_UNUSED_INTRO_1       =  90,
+	ROOM_UNUSED_INTRO_2       =  91,
+	ROOM_UNUSED_INTRO_3       =  92,
+	ROOM_UNUSED_INTRO_4       =  93,
+	ROOM_UNUSED_INTRO_5       =  94,
 	FOTAQ_LOGO                =  95,
 	AZURA_1                   = 106,
 	WARNER_LOGO               = 126