aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-06-10 11:52:02 +0200
committerThierry Crozat2019-07-28 15:09:14 +0100
commitf5afd19df763c8380855d1175c53408ad085286e (patch)
treecbf8577f122ab7d5bc040f16e3433bd61419fa48
parentfe48f0b6991bca7f40f8d072649099160d905aef (diff)
downloadscummvm-rg350-f5afd19df763c8380855d1175c53408ad085286e.tar.gz
scummvm-rg350-f5afd19df763c8380855d1175c53408ad085286e.tar.bz2
scummvm-rg350-f5afd19df763c8380855d1175c53408ad085286e.zip
SUPERNOVA2: Add hall room
-rw-r--r--engines/supernova2/ms2_def.h2
-rw-r--r--engines/supernova2/rooms.cpp11
2 files changed, 10 insertions, 3 deletions
diff --git a/engines/supernova2/ms2_def.h b/engines/supernova2/ms2_def.h
index a16b50ef68..0a60205aae 100644
--- a/engines/supernova2/ms2_def.h
+++ b/engines/supernova2/ms2_def.h
@@ -159,7 +159,7 @@ kStringRight, kStringLeft, kStringButton, kStringInscription, kStringTomato,
kStringFunnyDescription, kStringKnife1, kStringKnife1Description, kStringMonster, kStringRopeDescription,
kStringEyes, kStringMouth, kStringMonster1Description, kStringNote, kStringNoteDescription,
kStringOpeningDescription1, kStringOpeningDescription2, kStringNoteDescription1, kStringSlot, kStringSlotDescription3,
-kStringOpeningDescription3, kStringStones, kStringPlate, kString168, kStringExit,
+kStringOpeningDescription3, kStringStones, kStringPlate, kStringCoffin, kStringExit,
kString170, kStringToothbrush, kString172, kString173, kString174,
kString175, kString176, kString177, kStringDefaultDescription, kStringLooksMetal,
kStringTaxiArrives, kStringNothingHappens, kStringEmpty, kStringWalletOpen, kStringAttachMagnet,
diff --git a/engines/supernova2/rooms.cpp b/engines/supernova2/rooms.cpp
index 0d1a93dec7..6d4e0e5e19 100644
--- a/engines/supernova2/rooms.cpp
+++ b/engines/supernova2/rooms.cpp
@@ -3634,9 +3634,12 @@ Hall::Hall(Supernova2Engine *vm, GameManager *gm) {
_vm = vm;
_gm = gm;
- _fileNumber = 6;
+ _fileNumber = 16;
_id = HALL;
_shown[0] = kShownTrue;
+
+ _objectState[0] = Object(_id, kStringCoffin, kStringDefaultDescription, NULLOBJECT, EXIT, 0, 0, 0, COFFIN_ROOM, 2);
+ _objectState[1] = Object(_id, kStringExit, kStringDefaultDescription, CORRIDOR, EXIT, 255, 255, 0, PYR_ENTRANCE, 22);
}
void Hall::onEntrance() {
@@ -3647,7 +3650,11 @@ void Hall::animation() {
}
bool Hall::interact(Action verb, Object &obj1, Object &obj2) {
- return true;
+ if (verb == ACTION_WALK && obj1._id == CORRIDOR) {
+ _gm->_state._pyraDirection = 2;
+ _gm->passageConstruction();
+ }
+ return false;
}
CoffinRoom::CoffinRoom(Supernova2Engine *vm, GameManager *gm) {