aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-06-10 07:43:44 +0200
committerThierry Crozat2019-07-28 15:09:14 +0100
commitd7d6ef785d0bb4a6fbac34c82f2e0614f8692f34 (patch)
treef363703b37fa8165a326e34d0355bfa196109cd0
parent3524c4fc1f822e241d52c92c6e54a7e652bdfd85 (diff)
downloadscummvm-rg350-d7d6ef785d0bb4a6fbac34c82f2e0614f8692f34.tar.gz
scummvm-rg350-d7d6ef785d0bb4a6fbac34c82f2e0614f8692f34.tar.bz2
scummvm-rg350-d7d6ef785d0bb4a6fbac34c82f2e0614f8692f34.zip
SUPERNOVA2: Add Formula1N room
-rw-r--r--engines/supernova2/rooms.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/supernova2/rooms.cpp b/engines/supernova2/rooms.cpp
index 57ec3b8e19..52c0887abd 100644
--- a/engines/supernova2/rooms.cpp
+++ b/engines/supernova2/rooms.cpp
@@ -2878,7 +2878,6 @@ bool Formula1F::interact(Action verb, Object &obj1, Object &obj2) {
return false;
if (obj1._id == CORRIDOR)
_gm->changeRoom(FORMULA1_N);
- _gm->passageConstruction();
_gm->_newRoom = true;
return true;
}
@@ -2887,9 +2886,14 @@ Formula1N::Formula1N(Supernova2Engine *vm, GameManager *gm) {
_vm = vm;
_gm = gm;
- _fileNumber = 6;
+ _fileNumber = 13;
_id = FORMULA1_N;
_shown[0] = kShownTrue;
+ _shown[5] = kShownTrue;
+
+ _objectState[0] = Object(_id, kStringRight, kStringDefaultDescription, G_RIGHT, EXIT, 8, 8, 0, PYR_ENTRANCE, 14);
+ _objectState[1] = Object(_id, kStringLeft, kStringDefaultDescription, G_LEFT, EXIT, 7, 7, 0, PYR_ENTRANCE, 10);
+ _objectState[2] = Object(_id, kStringInscription, kStringInscriptionDescription, NULLOBJECT, NULLTYPE, 2, 2, 0);
}
void Formula1N::onEntrance() {
@@ -2900,6 +2904,10 @@ void Formula1N::animation() {
}
bool Formula1N::interact(Action verb, Object &obj1, Object &obj2) {
+ if (!_gm->move(verb, obj1))
+ return false;
+ _gm->passageConstruction();
+ _gm->_newRoom = true;
return true;
}