diff options
| author | Joseph-Eugene Winzer | 2017-08-22 23:22:30 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 01:46:53 +0000 |
| commit | cec70a4cb4ce1f5883dfb21f5a61508552b71f82 (patch) | |
| tree | 0bc058a8db6c2168f3cdc8dfb9648b7b5f9daeaf | |
| parent | cd01ca0ad3b32624e98cd40b218028ad366f4a83 (diff) | |
| download | scummvm-rg350-cec70a4cb4ce1f5883dfb21f5a61508552b71f82.tar.gz scummvm-rg350-cec70a4cb4ce1f5883dfb21f5a61508552b71f82.tar.bz2 scummvm-rg350-cec70a4cb4ce1f5883dfb21f5a61508552b71f82.zip | |
SUPERNOVA: Renames ObjectID 'SLOT'
| -rw-r--r-- | engines/supernova/msn_def.h | 2 | ||||
| -rw-r--r-- | engines/supernova/rooms.cpp | 2 | ||||
| -rw-r--r-- | engines/supernova/rooms.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index d609fe5bd7..a8c76a49df 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -419,7 +419,7 @@ enum ObjectID { PILLAR1,PILLAR2,DOOR1,DOOR2,DOOR3,DOOR4, GUARDIAN,LAMP, MASTERKEYCARD,PAINTING,MONEY,LOCKER,LETTER, - JUNGLE,SLOT,STATION_SIGN, + JUNGLE,STATION_SLOT,STATION_SIGN, TICKETS }; diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 5434b8e2c3..dc30d40fb0 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -2676,7 +2676,7 @@ bool AxacussStation::interact(Action verb, Object &obj1, Object &obj2) { } bool AxacussSign::interact(Action verb, Object &obj1, Object &obj2) { - if ((verb == ACTION_USE) && Object::combine(obj1, obj2, SLOT, MONEY) && + if ((verb == ACTION_USE) && Object::combine(obj1, obj2, STATION_SLOT, MONEY) && isSectionVisible(1)) { _gm->takeMoney(-180); _gm->drawImage(2); diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index e8cbf3829a..dae6bacb5c 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -1535,7 +1535,7 @@ public: _shown[1] = true; _objectState[0] = Object("Ausgang",Object::defaultDescription,NULLOBJECT,EXIT,255,255,0,STATION,22); - _objectState[1] = Object("Schlitz",Object::defaultDescription,SLOT,COMBINABLE,0,0,0); + _objectState[1] = Object("Schlitz",Object::defaultDescription,STATION_SLOT,COMBINABLE,0,0,0); } virtual bool interact(Action verb, Object &obj1, Object &obj2); |