[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.47,1.48 defs.h,1.23,1.24 queen.cpp,1.28,1.29
Joost Peters
joostp at users.sourceforge.net
Sun Nov 2 19:43:07 CET 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv4613/queen
Modified Files:
cutaway.cpp defs.h queen.cpp
Log Message:
Add partial roomname enum
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- cutaway.cpp 31 Oct 2003 13:47:27 -0000 1.47
+++ cutaway.cpp 3 Nov 2003 03:42:20 -0000 1.48
@@ -859,7 +859,7 @@
}
// 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(
Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/defs.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- defs.h 2 Nov 2003 20:42:36 -0000 1.23
+++ defs.h 3 Nov 2003 03:42:20 -0000 1.24
@@ -74,6 +74,52 @@
};
+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
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- queen.cpp 2 Nov 2003 20:42:36 -0000 1.28
+++ queen.cpp 3 Nov 2003 03:42:20 -0000 1.29
@@ -128,7 +128,7 @@
// 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 @@
_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);
More information about the Scummvm-git-logs
mailing list