diff options
| author | Paul Gilbert | 2016-10-30 00:00:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-30 00:00:03 -0400 |
| commit | 4fbaa41b147cbfaf3b7370a53b4c8c2ba099f791 (patch) | |
| tree | efe3def4fa2355f014e876bd0bf0dcc66509f855 | |
| parent | 525c9100e83e4eb695ce5db0c163121ef95befce (diff) | |
| download | scummvm-rg350-4fbaa41b147cbfaf3b7370a53b4c8c2ba099f791.tar.gz scummvm-rg350-4fbaa41b147cbfaf3b7370a53b4c8c2ba099f791.tar.bz2 scummvm-rg350-4fbaa41b147cbfaf3b7370a53b4c8c2ba099f791.zip | |
TITANIC: Fix floor change message to go to both background & indicator
| -rw-r--r-- | engines/titanic/game/service_elevator_window.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/game/service_elevator_window.h | 2 | ||||
| -rw-r--r-- | engines/titanic/game/transport/service_elevator.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/game/service_elevator_window.cpp b/engines/titanic/game/service_elevator_window.cpp index f49f2fa308..84f2a8dfdf 100644 --- a/engines/titanic/game/service_elevator_window.cpp +++ b/engines/titanic/game/service_elevator_window.cpp @@ -35,13 +35,13 @@ END_MESSAGE_MAP() static const int FACTORS[4] = { 0, 20, 100, 0 }; CServiceElevatorWindow::CServiceElevatorWindow() : CBackground(), - _fieldE0(0), _fieldE4(0), _fieldE8(0), _fieldEC(0) { + _fieldE0(0), _notifyFlag(false), _fieldE8(0), _fieldEC(0) { } void CServiceElevatorWindow::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_fieldE0, indent); - file->writeNumberLine(_fieldE4, indent); + file->writeNumberLine(_notifyFlag, indent); file->writeNumberLine(_fieldE8, indent); file->writeNumberLine(_fieldEC, indent); @@ -51,7 +51,7 @@ void CServiceElevatorWindow::save(SimpleFile *file, int indent) { void CServiceElevatorWindow::load(SimpleFile *file) { file->readNumber(); _fieldE0 = file->readNumber(); - _fieldE4 = file->readNumber(); + _notifyFlag = file->readNumber(); _fieldE8 = file->readNumber(); _fieldEC = file->readNumber(); @@ -73,7 +73,7 @@ bool CServiceElevatorWindow::ServiceElevatorFloorChangeMsg(CServiceElevatorFloor int startFrame = clip->_startFrame + count * FACTORS[msg->_value1] / 100; int endFrame = clip->_startFrame + count * FACTORS[msg->_value2] / 100; - if (_fieldE4) { + if (_notifyFlag) { playMovie(startFrame, endFrame, MOVIE_NOTIFY_OBJECT); } else { playMovie(startFrame, endFrame, 0); diff --git a/engines/titanic/game/service_elevator_window.h b/engines/titanic/game/service_elevator_window.h index 88e1663aba..ee94f0c39f 100644 --- a/engines/titanic/game/service_elevator_window.h +++ b/engines/titanic/game/service_elevator_window.h @@ -34,7 +34,7 @@ class CServiceElevatorWindow : public CBackground { bool EnterViewMsg(CEnterViewMsg *msg); public: int _fieldE0; - int _fieldE4; + bool _notifyFlag; int _fieldE8; int _fieldEC; public: diff --git a/engines/titanic/game/transport/service_elevator.cpp b/engines/titanic/game/transport/service_elevator.cpp index 9b109f5fa8..dbd4e5d74f 100644 --- a/engines/titanic/game/transport/service_elevator.cpp +++ b/engines/titanic/game/transport/service_elevator.cpp @@ -168,7 +168,7 @@ bool CServiceElevator::TimerMsg(CTimerMsg *msg) { // Elevator in motion after pressing button _fieldF8 = true; CServiceElevatorFloorChangeMsg changeMsg(_fieldDC, _v3); - changeMsg.execute(getRoom()); + changeMsg.execute(getRoom(), nullptr, MSGFLAG_SCAN); _soundHandle2 = playSound("z#424.wav"); if (doorbot) { |