diff options
| author | Strangerke | 2017-11-14 07:17:18 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:39 +0000 |
| commit | eed616a4aa43d4c128b2dd21371b50a942dad755 (patch) | |
| tree | f1c6c1f77e63d0f75b22e811afef5ef26cd981d4 /engines/supernova/rooms.h | |
| parent | 7eb5924f65debd86f4f336db5ea7bd56f2fc72f4 (diff) | |
| download | scummvm-rg350-eed616a4aa43d4c128b2dd21371b50a942dad755.tar.gz scummvm-rg350-eed616a4aa43d4c128b2dd21371b50a942dad755.tar.bz2 scummvm-rg350-eed616a4aa43d4c128b2dd21371b50a942dad755.zip | |
SUPERNOVA: Fix bug in GUARD room definition
Diffstat (limited to 'engines/supernova/rooms.h')
| -rw-r--r-- | engines/supernova/rooms.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index b9dbfd19fb..f4cb4a341c 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -1162,13 +1162,12 @@ public: _id = GUARD; _shown[0] = kShownTrue; - _objectState[0] = Object(_id, kStringExit,kStringDefaultDescription,NULLOBJECT,EXIT,255,255,0,CORRIDOR4,21); - _objectState[1] = Object(_id, kStringCorridor,kStringDefaultDescription,NULLOBJECT,EXIT,3,3,0,CORRIDOR7,5); - _objectState[2] = Object(_id, kStringDoor,kStringDefaultDescription,DOOR,EXIT|OPENABLE,1,1,6,CORRIDOR9,3); - // Originally GUARD was ObjectID.. - _objectState[3] = Object(_id, kStringAxacussan,kStringAxacussanDescription,INSTRUMENTS,TALK,0,0,0); - _objectState[4] = Object(_id, kStringImage,kStringImageDescription2,NULLOBJECT,NULLTYPE,2,2,0); - _objectState[5] = Object(_id, kStringMastercard,kStringMastercardDescription,MASTERKEYCARD,TAKE|COMBINABLE,255,255,1); + _objectState[0] = Object(_id, kStringExit, kStringDefaultDescription, NULLOBJECT, EXIT, 255, 255, 0, CORRIDOR4, 21); + _objectState[1] = Object(_id, kStringCorridor, kStringDefaultDescription, NULLOBJECT, EXIT, 3, 3, 0, CORRIDOR7, 5); + _objectState[2] = Object(_id, kStringDoor, kStringDefaultDescription, DOOR, EXIT | OPENABLE, 1, 1, 6, CORRIDOR9, 3); + _objectState[3] = Object(_id, kStringAxacussan, kStringAxacussanDescription, GUARDIAN, TALK, 0, 0, 0); + _objectState[4] = Object(_id, kStringImage, kStringImageDescription2, NULLOBJECT, NULLTYPE, 2, 2, 0); + _objectState[5] = Object(_id, kStringMastercard, kStringMastercardDescription, MASTERKEYCARD, TAKE | COMBINABLE, 255, 255, 1); } virtual bool interact(Action verb, Object &obj1, Object &obj2); |