diff options
| author | Paul Gilbert | 2017-06-21 19:48:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-06-21 19:48:03 -0400 |
| commit | 69c74685c3fedc24e0e4428b40782a0629fc2d5a (patch) | |
| tree | d5943998a387d6be99045b5853e0e7e8c9981962 /engines/titanic/game | |
| parent | 44f0a1906286a8864422516fc7f64457062465ca (diff) | |
| download | scummvm-rg350-69c74685c3fedc24e0e4428b40782a0629fc2d5a.tar.gz scummvm-rg350-69c74685c3fedc24e0e4428b40782a0629fc2d5a.tar.bz2 scummvm-rg350-69c74685c3fedc24e0e4428b40782a0629fc2d5a.zip | |
TITANIC: Renamings for room flags sublevel methods
Diffstat (limited to 'engines/titanic/game')
| -rw-r--r-- | engines/titanic/game/pet/pet_position.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/sgt/sgt_doors.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/game/sgt/sgt_navigation.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp index 1dbedc4404..8ed16aef3c 100644 --- a/engines/titanic/game/pet/pet_position.cpp +++ b/engines/titanic/game/pet/pet_position.cpp @@ -153,7 +153,7 @@ bool CPETPosition::EnterViewMsg(CEnterViewMsg *msg) { roomNum = 6; if (pet) { - pet->setRooms1CC(1); + pet->setRoomsSublevel(1); pet->setRoomsRoomNum(roomNum); pet->resetRoomsHighlight(); diff --git a/engines/titanic/game/sgt/sgt_doors.cpp b/engines/titanic/game/sgt/sgt_doors.cpp index 2dabd21077..31d1c472ea 100644 --- a/engines/titanic/game/sgt/sgt_doors.cpp +++ b/engines/titanic/game/sgt/sgt_doors.cpp @@ -58,7 +58,7 @@ bool CSGTDoors::EnterViewMsg(CEnterViewMsg *msg) { static const int START_FRAMES[7] = { 0, 26, 30, 34, 38, 42, 46 }; static const int END_FRAMES[7] = { 12, 29, 33, 37, 41, 45, 49 }; - if (pet->getRooms1CC() == 1) + if (pet->getRoomsSublevel() == 1) playMovie(START_FRAMES[roomNum], END_FRAMES[roomNum], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else @@ -87,7 +87,7 @@ bool CSGTDoors::LeaveRoomMsg(CLeaveRoomMsg *msg) { static const int START_FRAMES[7] = { 12, 69, 65, 61, 57, 53, 49 }; static const int END_FRAMES[7] = { 25, 72, 68, 64, 60, 56, 52 }; - if (pet->getRooms1CC() == 1) + if (pet->getRoomsSublevel() == 1) playMovie(START_FRAMES[roomNum], END_FRAMES[roomNum], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else diff --git a/engines/titanic/game/sgt/sgt_navigation.cpp b/engines/titanic/game/sgt/sgt_navigation.cpp index d0b57ba1ec..605649b82a 100644 --- a/engines/titanic/game/sgt/sgt_navigation.cpp +++ b/engines/titanic/game/sgt/sgt_navigation.cpp @@ -65,11 +65,11 @@ bool CSGTNavigation::StatusChangeMsg(CStatusChangeMsg *msg) { if (isEquals("SGTLL")) { static const int FRAMES[7] = { 0, 149, 112, 74, 0, 36, 74 }; _statics->_changeViewNum = msg->_newStatus; - if (pet->getRooms1CC() != _statics->_changeViewNum) { + if (pet->getRoomsSublevel() != _statics->_changeViewNum) { changeView("SGTLittleLift.Node 1.N"); } - int startVal = pet->getRooms1CC(); + int startVal = pet->getRoomsSublevel(); if (startVal > _statics->_changeViewNum) playMovie(FRAMES[startVal], FRAMES[_statics->_changeViewNum], MOVIE_WAIT_FOR_FINISH); else @@ -77,7 +77,7 @@ bool CSGTNavigation::StatusChangeMsg(CStatusChangeMsg *msg) { _cursorId = _statics->_changeViewNum != 1 ? CURSOR_MOVE_FORWARD : CURSOR_INVALID; - pet->setRooms1CC(_statics->_changeViewNum); + pet->setRoomsSublevel(_statics->_changeViewNum); pet->resetRoomsHighlight(); } @@ -121,7 +121,7 @@ bool CSGTNavigation::EnterViewMsg(CEnterViewMsg *msg) { if (isEquals("SGTLL")) { static const int FRAMES[3] = { 0, 36, 74 }; CPetControl *pet = getPetControl(); - loadFrame(FRAMES[pet->getRooms1CC() - 1]); + loadFrame(FRAMES[pet->getRoomsSublevel() - 1]); } return true; |