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

more enum stuff

Browse Source 
svn-id: r11163
This commit is contained in:
Joost Peters 2003-11-06 15:47:37 +00:00
parent d3936b616c
commit d03ff2a119
3 changed files with 161 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
queen/cutaway.cpp
View File

@ -1227,12 +1227,12 @@ void Cutaway::run(char *nextFilename) {
// function CUTAWAY_SPECIAL(), lines 885-896 in cutaway.c
if (_logic->currentRoom() == 1 && _logic->gameState(3) == 0) {
// XXX hard-coded room and inventory items
_logic->inventoryDeleteItem(54, false);
_logic->inventoryDeleteItem(56, false);
_logic->inventoryDeleteItem(58, false);
_logic->inventoryDeleteItem(59, false);
_logic->inventoryDeleteItem(60, false);
_logic->inventoryDeleteItem(61, false);
_logic->inventoryDeleteItem(ITEM_CROWBAR, false);
_logic->inventoryDeleteItem(ITEM_DRESS, false);
_logic->inventoryDeleteItem(ITEM_CLOTHES, false);
_logic->inventoryDeleteItem(ITEM_HAY, false);
_logic->inventoryDeleteItem(ITEM_OIL, false);
_logic->inventoryDeleteItem(ITEM_CHICKEN, false);
_logic->gameState(3, 1);
_logic->inventoryRefresh();
}

185
queen/defs.h
View File

@ -74,51 +74,164 @@ enum {
ZONE_PANEL = 1
};
enum {
ITEM_BAT = 1,
ITEM_JOURNAL,
ITEM_JOURNAL_DEMO = 7,
ITEM_KNIFE = 3,
ITEM_COCONUT_HALVES,
ITEM_BEEF_JERKY,
ITEM_PROPELLER,
ITEM_BANANA,
ITEM_VINE,
ITEM_SLOTH_HAIR,
ITEM_COMIC_BOOK,
ITEM_FLOWER,
ITEM_BEETLE,
ITEM_ORCHID,
ITEM_DICTIONARY,
ITEM_DEATH_MASH,
ITEM_PERFUME,
ITEM_TYRANNO_HORN,
ITEM_LOTION,
ITEM_RECORD,
ITEM_VACUUM_CLEANER,
ITEM_NET,
ITEM_ALCOHOL,
ITEM_ROCKET_PACK,
ITEM_SOME_MONEY,
ITEM_CHEESE_BITZ,
ITEM_DOG_FOOD,
ITEM_CAN_OPENER,
ITEM_LETTER,
ITEM_SQUEAKY_TOY,
ITEM_KEY,
ITEM_BOOK,
ITEM_PIECE_OF_PAPER,
ITEM_ROCKET_PLAN,
ITEM_PADLOCK_KEY,
ITEM_RIB_CAGE,
ITEM_SKULL,
ITEM_LEG_BONE,
ITEM_BAT2,
ITEM_MAKESHIFT_TOCH,
ITEM_LIGHTER,
ITEM_GREEN_JEWEL,
ITEM_PICK,
ITEM_STONE_KEY,
ITEM_BLUE_JEWEL,
ITEM_CRYSTAL_SKULL,
ITEM_TREE_SAP,
ITEM_DINO_RAY_GUN,
ITEM_BRANCHES,
ITEM_WIG,
ITEM_TOWEL,
ITEM_OTHER_SHEET,
ITEM_SHEET,
ITEM_SHEET_ROPE,
ITEM_CROWBAR,
ITEM_COMEDY_BREASTS,
ITEM_DRESS,
ITEM_KEY2,
ITEM_CLOTHES,
ITEM_HAY,
ITEM_OIL,
ITEM_CHICKEN,
ITEM_LIT_TORCH,
ITEM_OPENED_DOG_FOOD,
ITEM_SOME_MONEY2,
ITEM_SOME_MORE_MONEY,
ITEM_PEELED_BANANA,
ITEM_STONE_DISC,
ITEM_GNARLED_VINE,
ITEM_FLINT,
ITEM_LIGHTER2,
ITEM_REST_OF_BEEF_JERKY,
ITEM_LOTS_OF_MONEY,
ITEM_HEAPS_OF_MONEY,
ITEM_OPEN_BOOK,
ITEM_REST_OF_THE_CHEESE_BITZ,
ITEM_SCISSORS,
ITEM_PENCIL,
ITEM_SUPER_WEENIE_SERUM,
ITEM_MUMMY_WRAPPINGS,
ITEM_COCONUT,
ITEM_ID_CARD,
ITEM_BIT_OF_STONE,
ITEM_CHUNK_OF_ROCK,
ITEM_BIG_STICK,
ITEM_STICKY_BIT_OF_STONE,
ITEM_STICKY_CHUNK_OF_ROCK,
ITEM_DEATH_MASK2,
ITEM_CHEFS_SURPRISE,
ITEM_STICKY_BAT,
ITEM_REST_OF_WRAPPINGS,
ITEM_BANANA2,
ITEM_MUG,
ITEM_FILE,
ITEM_POCKET_ROCKET_BLUEPRINTS,
ITEM_HAND_PUPPET,
ITEM_ARM_BONE,
ITEM_CROWN,
ITEM_COMIC_COUPON,
ITEM_TORN_PAGE
};
enum {
ROOM_JUNGLE_PINNACLE = 7,
ROOM_JUNGLE_BUD_SKIP = 9,
ROOM_JUNGLE_MISSIONARY = 13,
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,
ROOM_AMAZON_ENTRANCE = 16,
ROOM_AMAZON_HIDEOUT = 17,
ROOM_AMAZON_THRONE = 18,
ROOM_AMAZON_JAIL = 19,
ROOM_AMAZON_ENTRANCE = 16,
ROOM_AMAZON_HIDEOUT = 17,
ROOM_AMAZON_THRONE = 18,
ROOM_AMAZON_JAIL = 19,
ROOM_VILLAGE = 20,
ROOM_TRADER_BOBS = 21,
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_FLODA_OUTSIDE = 22,
ROOM_FLODA_KITCHEN = 26,
ROOM_FLODA_LOCKERROOM = 27,
ROOM_FLODA_KLUNK = 30,
ROOM_FLODA_HENRY = 32,
ROOM_FLODA_OFFICE = 35,
ROOM_FLODA_JAIL = 41,
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_TEMPLE_OUTSIDE = 43,
ROOM_TEMPLE_MUMMIES = 46,
ROOM_TEMPLE_ZOMBIES = 50,
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_HOTEL_UPSTAIRS = 70,
ROOM_HOTEL_DOWNSTAIRS = 71,
ROOM_HOTEL_LOLA = 72,
ROOM_HOTEL_LOBBY = 73,
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
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
};

12
queen/logic.cpp
View File

@ -1768,7 +1768,7 @@ void Logic::joeUseDress(bool showCut) {
joeFace();
if (gameState(VAR_DRESSING_MODE) == 0) {
playCutaway("cdres.CUT");
inventoryInsertItem(58);
inventoryInsertItem(ITEM_CLOTHES);
}
else {
playCutaway("cudrs.CUT");
@ -1776,7 +1776,7 @@ void Logic::joeUseDress(bool showCut) {
}
_display->palSetJoe(JP_DRESS);
joeSetupFromBanks("JoeD_A.BBK", "JoeD_B.BBK");
inventoryDeleteItem(56);
inventoryDeleteItem(ITEM_DRESS);
gameState(VAR_DRESSING_MODE, 2);
}
@ -1787,11 +1787,11 @@ void Logic::joeUseClothes(bool showCut) {
joeFacing(DIR_FRONT);
joeFace();
playCutaway("cdclo.CUT");
inventoryInsertItem(56);
inventoryInsertItem(ITEM_DRESS);
}
_display->palSetJoe(JP_CLOTHES);
joeSetupFromBanks("Joe_A.BBK", "Joe_B.BBK");
inventoryDeleteItem(58);
inventoryDeleteItem(ITEM_CLOTHES);
gameState(VAR_DRESSING_MODE, 0);
}
@ -1904,8 +1904,8 @@ uint16 Logic::findInventoryItem(int invSlot) const {
void Logic::inventorySetup() {
_graphics->bankLoad("objects.BBK", 14);
_inventoryItem[0] = 1; // Bat
_inventoryItem[1] = _resource->isDemo() ? 7 : 2; // Journal
_inventoryItem[0] = ITEM_BAT;
_inventoryItem[1] = _resource->isDemo() ? ITEM_JOURNAL_DEMO : ITEM_JOURNAL;
_inventoryItem[2] = 0;
_inventoryItem[3] = 0;
}