libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 23:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STARTREK: Rename SINS5 variable

Browse Source
This commit is contained in:
Matthew Stewart 2018-07-29 02:00:49 -04:00 committed by Eugene Sandulenko
parent f33f548884
commit 91c8320bd9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/startrek/awaymission.h
View File

@ -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;

6
engines/startrek/rooms/sins5.cpp
View File

@ -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);