libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use constants instead of plain integers for room numbers

Browse Source 
svn-id: r11353
This commit is contained in:
Gregory Montoir 2003-11-20 09:39:29 +00:00
parent 5c04293c93
commit 484edca7a5
2 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
queen/defs.h
View File

@ -181,11 +181,11 @@ enum {
};
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 @@ enum {
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 @@ enum {
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

44
queen/graphics.cpp
View File

@ -588,23 +588,23 @@ void Graphics::bobCustomParallax(uint16 roomNum) {
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 @@ void Graphics::bobCustomParallax(uint16 roomNum) {
_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 @@ void Graphics::bobCustomParallax(uint16 roomNum) {
_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;