diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/supernova2/ms2_def.h | 12 | ||||
-rw-r--r-- | engines/supernova2/rooms.cpp | 15 |
2 files changed, 21 insertions, 6 deletions
diff --git a/engines/supernova2/ms2_def.h b/engines/supernova2/ms2_def.h index 26a847dce7..7a6e75b700 100644 --- a/engines/supernova2/ms2_def.h +++ b/engines/supernova2/ms2_def.h @@ -118,7 +118,7 @@ enum ObjectId { SELLER,POSTER,AXACUSSER,KP_ENTRANCE,CHIP,CARD, DOODLE,DOODLE2,BELL,GROPE,DOOR_L,DOOR_R,ID_CARD, MAGNET,UNDER_BED,KEY,VALVE,WARDROBE,DISCMAN, - SMALL_DOOR,BACK_MONEY,WALL,MAMMAL,IMITATION,SP_KEYCARD,ALARM_CRACKER, + SMALL_DOOR,BACK_MONEY,WALL,SUCTION_CUP,IMITATION,SP_KEYCARD,ALARM_CRACKER, ENCRYPTED_DOOR,ALARM_ANLAGE,MUS_STREET,BIG_DOOR,INVESTMENT, HANDLE,COUNTER,DOOR_SWITCH,SUIT,MANAGEMENT,RMANAGEMENT, MUSCARD,SKOPF @@ -146,8 +146,8 @@ kString80, kString81, kString82, kString83, kString84, kString85, kString86, kString87, kString88, kString89, kString90, kString91, kString92, kString93, kString94, kString95, kString96, kString97, kString98, kString99, -kString100, kString101, kString102, kString103, kString104, -kString105, kString106, kString107, kString108, kString109, +kString100, kString101, kString102, kStringDinosaurHead, kString104, +kString105, kStringSuctionCup, kString107, kString108, kString109, kString110, kString111, kString112, kString113, kString114, kString115, kString116, kString117, kString118, kString119, kString120, kString121, kString122, kString123, kString124, @@ -179,9 +179,9 @@ kString245, kString246, kString247, kString248, kString249, kString250, kString251, kString252, kString253, kString254, kString255, kString256, kString257, kString258, kString259, kString260, kString261, kString262, kString263, kString264, -kString265, kString266, kString267, kString268, kString269, -kString270, kString271, kString272, kString273, kString274, -kString275, kString276, kString277, kString278, kString279, +kString265, kString266, kString267, kString268, kStringKnife, +kStringKnifeDescription, kStringMoney, kStringDiscman, kStringDiscmanDescription, kStringSuctionCupDescription, +kStringSpecialCard, kStringSpecialCardDescription, kStringAlarmCracker, kStringAlarmCrackerDescription, kStringKeycard, kStringSpaceship, kStringSpaceshipDescription, kStringVehicles, kStringVehiclesDescription, kString284, kString285, kString286, kString287, kString288, kString289, kString290, kString291, kString292, kString293, kString294, diff --git a/engines/supernova2/rooms.cpp b/engines/supernova2/rooms.cpp index 83268aa1bf..4aa196dc49 100644 --- a/engines/supernova2/rooms.cpp +++ b/engines/supernova2/rooms.cpp @@ -187,6 +187,17 @@ Intro::Intro(Supernova2Engine *vm, GameManager *gm) { _fileNumber = -1; _id = INTRO; + + _objectState[0] = Object(_id, kStringKnife, kStringKnifeDescription, KNIFE, TAKE | CARRIED | COMBINABLE, 255, 255, 0); + _objectState[1] = Object(_id, kStringMoney, kStringDefaultDescription, MONEY, TAKE | CARRIED | COMBINABLE, 255, 255, 0); + _objectState[2] = Object(_id, kStringDiscman, kStringDiscmanDescription, DISCMAN, TAKE | CARRIED | COMBINABLE, 255, 255, 0); + _objectState[3] = Object(_id, kStringSuctionCup, kStringSuctionCupDescription, SUCTION_CUP, TAKE | COMBINABLE, 255, 255, 0); + _objectState[4] = Object(_id, kStringDefaultDescription, kStringDefaultDescription, NULLOBJECT, NULLTYPE, 0, 0, 0); + _objectState[5] = Object(_id, kStringSpecialCard, kStringSpecialCardDescription, SP_KEYCARD, TAKE | COMBINABLE, 255, 255, 0); + _objectState[6] = Object(_id, kStringAlarmCracker, kStringAlarmCrackerDescription, ALARM_CRACKER, TAKE | COMBINABLE, 255, 255, 0); + _objectState[7] = Object(_id, kStringDinosaurHead, kStringDefaultDescription, NULLOBJECT, TAKE, 255, 255, 0); + _objectState[8] = Object(_id, kStringKeycard, kStringDefaultDescription, MUSCARD, TAKE, 255, 255, 0); + _introText = _vm->getGameString(kStringIntro1) + '\0' + _vm->getGameString(kStringIntro2) + '\0' + @@ -495,6 +506,10 @@ Airport::Airport(Supernova2Engine *vm, GameManager *gm) { } void Airport::onEntrance() { + for (int i = 0; i < 3; ++i) + _gm->_inventory.add(*_gm->_rooms[INTRO]->getObject(i)); + + setRoomSeen(true); if (hasSeen() == false) { _vm->renderMessage(kStringAirportEntrance); } |