aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2017-12-26 16:45:11 +0100
committerThierry Crozat2018-01-23 02:15:44 +0000
commit996d5c082e8bae3f14c7adf4c4ac94c5ca8ffd30 (patch)
tree2e2b2ed26e6850a8391d43b8869bf1522b5f7c80
parent8451f70c9758f991bb616479e77b12b984560ff2 (diff)
downloadscummvm-rg350-996d5c082e8bae3f14c7adf4c4ac94c5ca8ffd30.tar.gz
scummvm-rg350-996d5c082e8bae3f14c7adf4c4ac94c5ca8ffd30.tar.bz2
scummvm-rg350-996d5c082e8bae3f14c7adf4c4ac94c5ca8ffd30.zip
SUPERNOVA: Replaces TICKETS with MONEY
-rw-r--r--engines/supernova/msn_def.h4
-rw-r--r--engines/supernova/rooms.cpp4
-rw-r--r--engines/supernova/rooms.h4
3 files changed, 5 insertions, 7 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index e625bd91cd..8837f1ddcc 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -394,9 +394,7 @@ enum ObjectID {
PILLAR1,PILLAR2,DOOR1,DOOR2,DOOR3,DOOR4,
GUARDIAN,LAMP,
MASTERKEYCARD,PAINTING,MONEY,LOCKER,LETTER,
- JUNGLE,STATION_SLOT,STATION_SIGN,
-
- TICKETS
+ JUNGLE,STATION_SLOT,STATION_SIGN
};
enum StringID {
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp
index 24d9c83cc2..0c80d1106d 100644
--- a/engines/supernova/rooms.cpp
+++ b/engines/supernova/rooms.cpp
@@ -2921,7 +2921,7 @@ bool AxacussOffice1::interact(Action verb, Object &obj1, Object &obj2) {
setSectionVisible(8, false);
getObject(2)->_click = 255;
_vm->playSound(kAudioDoorClose);
- } else if ((verb == ACTION_TAKE) && (obj1._id == TICKETS)) {
+ } else if ((verb == ACTION_TAKE) && (obj1._id == MONEY)) {
_vm->renderImage(6);
setSectionVisible(8, false);
getObject(2)->_click = 255;
@@ -3042,7 +3042,7 @@ bool AxacussOffice5::interact(Action verb, Object &obj1, Object &obj2) {
if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
_vm->playSound(kAudioSmash);
- } else if ((verb == ACTION_TAKE) && (obj1._id == TICKETS)) {
+ } else if ((verb == ACTION_TAKE) && (obj1._id == MONEY)) {
_vm->renderImage(_gm->invertSection(5));
obj1._click = 255;
_gm->takeMoney(350);
diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h
index ad28afb991..3795842b49 100644
--- a/engines/supernova/rooms.h
+++ b/engines/supernova/rooms.h
@@ -1223,7 +1223,7 @@ public:
_objectState[0] = Object(_id, kStringDoor,kStringDefaultDescription,DOOR,EXIT|OPENABLE|OPENED,6,6,9,BCORRIDOR,9);
_objectState[1] = Object(_id, kStringComputer,kStringDefaultDescription,COMPUTER,COMBINABLE,4,4,0);
- _objectState[2] = Object(_id, kStringMoney,kStringMoneyDescription1,TICKETS,TAKE,255,255,0);
+ _objectState[2] = Object(_id, kStringMoney,kStringMoneyDescription1,MONEY,TAKE,255,255,0);
_objectState[3] = Object(_id, kStringLocker,kStringLockerDescription,LOCKER,OPENABLE|CLOSED,5,5,0);
_objectState[4] = Object(_id, kStringLetter,kStringDefaultDescription,LETTER,UNNECESSARY,3,3,0);
}
@@ -1310,7 +1310,7 @@ public:
_objectState[0] = Object(_id, kStringDoor,kStringDefaultDescription,DOOR,EXIT|OPENABLE|OPENED,6,6,17,GUARD3,9);
_objectState[1] = Object(_id, kStringComputer,kStringComputerDescription,COMPUTER,COMBINABLE,4,4,0);
_objectState[2] = Object(_id, kStringGraffiti,kStringGraffitiDescription,NULLOBJECT,NULLTYPE,7,7,0);
- _objectState[3] = Object(_id, kStringMoney,kStringMoneyDescription2,TICKETS,TAKE,8,8,0);
+ _objectState[3] = Object(_id, kStringMoney,kStringMoneyDescription2,MONEY,TAKE,8,8,0);
}
virtual void onEntrance();