diff options
| author | Matthew Stewart | 2018-07-29 02:00:49 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 91c8320bd96642fc7afe2671c66da285fa996c9c (patch) | |
| tree | 2bdee99623ba98a7c0af693a11a2f060e8604a76 /engines | |
| parent | f33f548884db84bfebea1a4edc049959607b000b (diff) | |
| download | scummvm-rg350-91c8320bd96642fc7afe2671c66da285fa996c9c.tar.gz scummvm-rg350-91c8320bd96642fc7afe2671c66da285fa996c9c.tar.bz2 scummvm-rg350-91c8320bd96642fc7afe2671c66da285fa996c9c.zip | |
STARTREK: Rename SINS5 variable
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/startrek/awaymission.h | 4 | ||||
| -rw-r--r-- | engines/startrek/rooms/sins5.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/startrek/awaymission.h b/engines/startrek/awaymission.h index 5771b31886..69c055b622 100644 --- a/engines/startrek/awaymission.h +++ b/engines/startrek/awaymission.h @@ -578,7 +578,7 @@ struct AwayMission { bool gotPointsForUsingLeftComputer; // 0x4e bool discoveredComputersOutOfSync; // 0x4f bool enteredRoom1FirstTime; // 0x50 - bool gotPointsForEnteringRoom5; // 0x51 + bool playedMusicUponEnteringRoom5FirstTime; // 0x51 int16 missionScore; // 0x52 void saveLoadWithSerializer(Common::Serializer &ser) { @@ -614,7 +614,7 @@ struct AwayMission { ser.syncAsByte(gotPointsForUsingLeftComputer); ser.syncAsByte(discoveredComputersOutOfSync); ser.syncAsByte(enteredRoom1FirstTime); - ser.syncAsByte(gotPointsForEnteringRoom5); + ser.syncAsByte(playedMusicUponEnteringRoom5FirstTime); ser.syncAsSint16LE(missionScore); } } sins; diff --git a/engines/startrek/rooms/sins5.cpp b/engines/startrek/rooms/sins5.cpp index f725fa6135..525e6c1aeb 100644 --- a/engines/startrek/rooms/sins5.cpp +++ b/engines/startrek/rooms/sins5.cpp @@ -141,9 +141,11 @@ void Room::sins5Tick1() { if (_awayMission->sins.wireConnected1 && _awayMission->sins.wireConnected2) loadActorAnim2(OBJECT_CABLE, "s5cabl", 0, 0); - if (!_awayMission->sins.gotPointsForEnteringRoom5) { + if (!_awayMission->sins.playedMusicUponEnteringRoom5FirstTime) { + // NOTE: The music gets drowned out due to a different track being played + // immediately after. playMidiMusicTracks(MIDITRACK_0, -1); - _awayMission->sins.gotPointsForEnteringRoom5 = true; + _awayMission->sins.playedMusicUponEnteringRoom5FirstTime = true; } playMidiMusicTracks(MIDITRACK_27, -3); |