diff options
| author | Joseph-Eugene Winzer | 2017-08-24 10:28:00 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 01:47:01 +0000 |
| commit | 026bd79a6d434ac07fe006b58d3dcf27b97beafb (patch) | |
| tree | 47a498ef03623c3146df858a7017f27a7901d24c | |
| parent | 604d421660bb7e580c864689c6f65d24bf8b4a9e (diff) | |
| download | scummvm-rg350-026bd79a6d434ac07fe006b58d3dcf27b97beafb.tar.gz scummvm-rg350-026bd79a6d434ac07fe006b58d3dcf27b97beafb.tar.bz2 scummvm-rg350-026bd79a6d434ac07fe006b58d3dcf27b97beafb.zip | |
SUPERNOVA: Removes redundant code
| -rw-r--r-- | engines/supernova/rooms.cpp | 3 | ||||
| -rw-r--r-- | engines/supernova/rooms.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 743a80b888..a301d20735 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -893,9 +893,6 @@ bool ShipGenerator::interact(Action verb, Object &obj1, Object &obj2) { obj1._exitRoom = ROCKS; return false; } - } else if ((verb == ACTION_TAKE) && (obj1._id == KEYCARD2)) { - obj1._name = "Keycard des Commanders"; - return false; } else if ((verb == ACTION_TAKE) && (obj1._id == GENERATOR_WIRE)) _vm->renderMessage("Das Kabel ist schon ganz|richtig an dieser Stelle."); else if ((verb == ACTION_PULL) && (obj1._id == SHORT_WIRE) && diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index dae6bacb5c..b66e8165f2 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -538,7 +538,7 @@ public: _objectState[0] = Object("langes Kabel mit Stecker",Object::defaultDescription,GENERATOR_WIRE,COMBINABLE,255,255,0); _objectState[1] = Object("leere Kabelrolle",Object::defaultDescription,NULLOBJECT,UNNECESSARY,255,255,0); - _objectState[2] = Object("Keycard","Hey, das ist die Keycard des Commanders!|Er mu\341 sie bei dem \201berst\201rzten|Aufbruch verloren haben.",KEYCARD2,COMBINABLE | TAKE,12,12,5 | 128); + _objectState[2] = Object("Keycard des Commanders","Hey, das ist die Keycard des Commanders!|Er mu\341 sie bei dem \201berst\201rzten|Aufbruch verloren haben.",KEYCARD2,COMBINABLE | TAKE,12,12,5 | 128); _objectState[3] = Object("Seil",Object::defaultDescription,GENERATOR_ROPE,COMBINABLE,255,255,0); _objectState[4] = Object("Luke","Sie f\201hrt nach drau\341en.",OUTERHATCH,EXIT | OPENABLE,1,2,1,OUTSIDE,22); _objectState[5] = Object("Luke",Object::defaultDescription,NULLOBJECT,OPENABLE | CLOSED,3,3,0); |