diff options
| author | Joseph-Eugene Winzer | 2017-07-11 05:33:46 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-22 23:54:26 +0000 |
| commit | 30308fbe8d45de40331b10bd7ed6e62c6bff0a4c (patch) | |
| tree | 129e66e105c49cfec87f261a3000198bd135868b /engines/supernova/rooms.h | |
| parent | 87a0dd970af238e6ec7033288c0a67640a717d6e (diff) | |
| download | scummvm-rg350-30308fbe8d45de40331b10bd7ed6e62c6bff0a4c.tar.gz scummvm-rg350-30308fbe8d45de40331b10bd7ed6e62c6bff0a4c.tar.bz2 scummvm-rg350-30308fbe8d45de40331b10bd7ed6e62c6bff0a4c.zip | |
SUPERNOVA: Implements GUI routines and refactors code
Of course the short description does not adequately describe the changes
made with this commit and I assume this won't be the last big
restructuring unfortunately.
Focus of this commit was to implement/fix the code so the main user
interface can be rendered. Bugs in the core routines for rendering
Messages and Images were fixed as well.
Diffstat (limited to 'engines/supernova/rooms.h')
| -rw-r--r-- | engines/supernova/rooms.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index e78f446987..d3d850a83d 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -36,6 +36,8 @@ class Room { public: Room() { _seen = false; + for (int i = 0; i < kMaxSection; ++i) + _shown[i] = false; } bool hasSeen() { @@ -101,6 +103,8 @@ public: Object("Discman", "Es ist eine \"Mad Monkeys\"-CD darin.", DISCMAN, TAKE | COMBINABLE, 255, 255, 0, NULLROOM, 0); } + + virtual void onEntrance(); }; // Spaceship @@ -415,7 +419,7 @@ public: _objectState[20] = Object("Schrank",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,1,1,0); _objectState[21] = Object("Fach",Object::defaultDescription,NULLOBJECT,OPEN | CLOSED,2,2,0); _objectState[22] = Object("Steckdose",Object::defaultDescription,SOCKET,COMBINABLE,4,4,0); - _objectState[23] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,2); + _objectState[23] = Object("Toilette",Object::defaultDescription,BATHROOM_DOOR,EXIT,255,255,0,BATHROOM,22); } virtual bool interact(Action verb, Object &obj1, Object &obj2); @@ -432,7 +436,7 @@ public: _objectState[0] = Object("Klo","Ein Klo mit Saugmechanismus.",TOILET,NULLTYPE,0,0,0); _objectState[1] = Object("Dusche",Object::defaultDescription,SHOWER,NULLTYPE,1,1,0); - _objectState[2] = Object("Ausgang",Object::defaultDescription,BATHROOM_EXIT,EXIT,255,255,0,NULLROOM,2); + _objectState[2] = Object("Ausgang",Object::defaultDescription,BATHROOM_EXIT,EXIT,255,255,0,CABIN_R3,2); } }; |