Add partial roomname enum

svn-id: r11085

3 files changed, 49 insertions, 3 deletions

diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 33a9a0fe3f..f72551ac6b 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -859,7 +859,7 @@ byte *Cutaway::handleAnimation(byte *ptr, CutawayObject &object) {
 	}
 
 	// Boat room hard coded
-	if (_logic->currentRoom() == 43) {
+	if (_logic->currentRoom() == ROOM_TEMPLE_OUTSIDE) {
 		BobSlot *bob = _graphics->bob(0);
 		if (bob->x < 320)
 			_graphics->bobMove(
diff --git a/queen/defs.h b/queen/defs.h
index b78c3385e2..8c11b7d136 100644
--- a/queen/defs.h
+++ b/queen/defs.h
@@ -74,6 +74,52 @@ enum {
 };
 
 
+enum {
+	ROOM_JUNGLE_BUD_SKIP     =  9,
+	ROOM_JUNGLE_MISSIONARY   =  13,
+	
+	ROOM_AMAZON_ENTRANCE     =  16,
+	ROOM_AMAZON_HIDEOUT      =  17,
+	ROOM_AMAZON_THRONE       =  18,
+	ROOM_AMAZON_JAIL         =  19,
+	
+	ROOM_VILLAGE             =  20,
+	ROOM_TRADER_BOBS         =  21,
+	
+	ROOM_FLODA_OUTSIDE       =  22,
+	ROOM_FLODA_KITCHEN       =  26,
+	ROOM_FLODA_LOCKERROOM    =  27,
+	ROOM_FLODA_OFFICE        =  35,
+	ROOM_FLODA_FRONTDESK     = 103,
+
+	ROOM_TEMPLE_OUTSIDE      =  43,
+	ROOM_TEMPLE_MUMMIES      =  46,
+	ROOM_TEMPLE_ZOMBIES      =  50,
+	ROOM_TEMPLE_SNAKE        =  53,
+	ROOM_TEMPLE_LIZARD_LASER =  55,
+	
+	ROOM_HOTEL_UPSTAIRS      =  70,
+	ROOM_HOTEL_DOWNSTAIRS    =  71,
+	ROOM_HOTEL_LOLA          =  72,
+	ROOM_HOTEL_LOBBY         =  73,
+
+	//special
+	SPARKY_OUTSIDE_HOTEL     =  77,
+	DEATH_MASK               =  79,
+	IBI_LOGO                 =  82,
+	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,
+	FOTAQ_LOGO               =  95,
+	AZURA_1                  = 106,
+	WARNER_LOGO              = 126
+};
+
+
 //! GameState vars
 enum {
 	VAR_DRESSING_MODE  =  19, // 0=normal clothes, 1=underwear, 2=dress
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 64fbc80a4b..f81c11021c 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -128,7 +128,7 @@ void QueenEngine::roomChanged() {
 		// XXX R_MAP();
 		// XXX fadeout(0,223);
 	}
-	else if (_logic->currentRoom() == 95 && _logic->gameState(VAR_INTRO_PLAYED) == 0) {
+	else if (_logic->currentRoom() == FOTAQ_LOGO && _logic->gameState(VAR_INTRO_PLAYED) == 0) {
 		_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_NOJOE, 100, 2, true);
 
 		if (_resource->isDemo()) {
@@ -151,7 +151,7 @@ void QueenEngine::roomChanged() {
 			_logic->playCutaway("cred.cut");
 		}
 
-		_logic->currentRoom(73);
+		_logic->currentRoom(ROOM_HOTEL_UPSTAIRS);
 		_logic->entryObj(584);
 
 		_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_JOE, 100, 2, true);