diff options
| author | Joseph-Eugene Winzer | 2017-08-31 20:43:13 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:07:37 +0000 |
| commit | 7cae6fde30ed39240cb3711440edcc86158ae77a (patch) | |
| tree | 965a162a9c38bfdab3aa56d064fa712d04b36215 | |
| parent | 5f19833803c364586d5053ad81bdf9fbaebeb750 (diff) | |
| download | scummvm-rg350-7cae6fde30ed39240cb3711440edcc86158ae77a.tar.gz scummvm-rg350-7cae6fde30ed39240cb3711440edcc86158ae77a.tar.bz2 scummvm-rg350-7cae6fde30ed39240cb3711440edcc86158ae77a.zip | |
SUPERNOVA: Fixes number of rooms
| -rw-r--r-- | engines/supernova/msn_def.h | 14 | ||||
| -rw-r--r-- | engines/supernova/state.cpp | 4 | ||||
| -rw-r--r-- | engines/supernova/state.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index 5e90ceca0c..a532a2baed 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -38,11 +38,11 @@ const int kMaxClickfieldZus = 80; const int kMaxObject = 25; const int kMaxCarry = 30; -const int kRoomsChap0 = 1; -const int kRoomsChap1 = 16; -const int kRoomsChap2 = 9; -const int kRoomsChap3 = 21; -const int kRoomsNum = kRoomsChap0 + kRoomsChap1 + kRoomsChap2 + kRoomsChap3; +//const int kRoomsChap0 = 1; +//const int kRoomsChap1 = 16; +//const int kRoomsChap2 = 9; +//const int kRoomsChap3 = 21; +//const int kRoomsNum = kRoomsChap0 + kRoomsChap1 + kRoomsChap2 + kRoomsChap3; enum MessagePosition { kMessageNormal, @@ -345,13 +345,13 @@ enum Action { enum RoomID { INTRO,CORRIDOR,HALL,SLEEP,COCKPIT,AIRLOCK, HOLD,LANDINGMODULE,GENERATOR,OUTSIDE, - CABIN_R1,CABIN_R2,CABIN_R3,CABIN_L1,CABIN_L3,CABIN_L2,BATHROOM, + CABIN_R1,CABIN_R2,CABIN_R3,CABIN_L1,CABIN_L2,CABIN_L3,BATHROOM, ROCKS,CAVE,MEETUP,ENTRANCE,REST,ROGER,GLIDER,MEETUP2,MEETUP3, CELL,CORRIDOR1,CORRIDOR2,CORRIDOR3,CORRIDOR4,CORRIDOR5,CORRIDOR6,CORRIDOR7,CORRIDOR8,CORRIDOR9, BCORRIDOR,GUARD,GUARD3,OFFICE_L1,OFFICE_L2,OFFICE_R1,OFFICE_R2,OFFICE_L, - ELEVATOR,STATION,SIGN,OUTRO,NULLROOM + ELEVATOR,STATION,SIGN,OUTRO,NUMROOMS,NULLROOM }; enum ObjectID { diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index 5909e5a68f..94a2ef44da 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -66,7 +66,7 @@ bool GameManager::serialize(Common::WriteStream *out) { } // Rooms - for (int i = 0; i < kRoomsNum; ++i) { + for (int i = 0; i < NUMROOMS; ++i) { _rooms[i]->serialize(out); } @@ -113,7 +113,7 @@ bool GameManager::deserialize(Common::ReadStream *in) { } // Rooms - for (int i = 0; i < kRoomsNum; ++i) { + for (int i = 0; i < NUMROOMS; ++i) { _rooms[i]->deserialize(in); } diff --git a/engines/supernova/state.h b/engines/supernova/state.h index 72aad4cb53..1ffa2d09c6 100644 --- a/engines/supernova/state.h +++ b/engines/supernova/state.h @@ -110,7 +110,7 @@ public: int _mouseY; int _mouseField; Room *_currentRoom; - Room *_rooms[kRoomsNum]; + Room *_rooms[NUMROOMS]; Inventory _inventory; GameState _state; int _status; |