thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor midi change for Jamieson630

Browse source 
svn-id: r7737
This commit is contained in:
Travis Howell 2003-05-20 15:37:03 +00:00
parent 22320e8271
commit c20a5f8c06
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
simon/items.cpp
View file

@ -750,10 +750,10 @@ int SimonState::runScript() {
break; break;
case 134:{ case 134:{
_vc70_var2 = 0xFFFF; _vc70_var2 = -1;
midi.stop(); midi.stop();
_last_music_played = 0xFFFF; _last_music_played = -1;
_vc72_var1 = 0xFFFF; _vc72_var1 = -1;
} }
break; break;
@ -1447,9 +1447,9 @@ void SimonState::o_unk_127() {
//FIXME Changed if to allow midi jumping to work for now. //FIXME Changed if to allow midi jumping to work for now.
if (b != 1) { if (b != 1) {
_vc70_var2 = c; _vc70_var2 = c;
_vc70_var1 = 0xFFFF; _vc70_var1 = -1;
_vc72_var3 = 0xFFFF; _vc72_var3 = -1;
_next_music_to_play = 0xFFFF; _next_music_to_play = -1;
midi_play(b); midi_play(b);
_vc72_var1 = b; _vc72_var1 = b;
} else { } else {

6
simon/simon.cpp
View file

@ -5303,9 +5303,9 @@ void SimonState::playMusic(uint music) {
_last_music_played = music; _last_music_played = music;
_vc72_var1 = 999; _vc72_var1 = 999;
_vc70_var1 = 0xFFFF; _vc70_var1 = -1;
_vc72_var3 = 0xFFFF; _vc72_var3 = -1;
_next_music_to_play = 0xFFFF; _next_music_to_play = -1;
} else { // Simon 1 music } else { // Simon 1 music
if (_game & GF_AMIGAS) { if (_game & GF_AMIGAS) {
if (_game != GAME_SIMON1CD32) { if (_game != GAME_SIMON1CD32) {

4
simon/simon.h
View file

@ -257,8 +257,8 @@ public:
byte _video_var_9; byte _video_var_9;
uint _midi_sfx; uint _midi_sfx;
uint _last_music_played; uint16 _last_music_played;
uint _next_music_to_play; uint16 _next_music_to_play;
bool _show_preposition; bool _show_preposition;
bool _showmessage_flag; bool _showmessage_flag;

4
simon/vga.cpp
View file

@ -1692,7 +1692,7 @@ void SimonState::vc_62_palette_thing() {
if (!_video_var_3) { if (!_video_var_3) {
if (_game & GF_SIMON2) { if (_game & GF_SIMON2) {
if (_next_music_to_play != 0xFFFF) if (_next_music_to_play != -1)
playMusic(_next_music_to_play); playMusic(_next_music_to_play);
} }
} else } else
@ -1835,7 +1835,7 @@ void SimonState::vc_70() {
void SimonState::vc_71() { void SimonState::vc_71() {
// Simon2 // Simon2
if (_vc72_var3 == 0xFFFF && _vc70_var1 == 0xFFFF) if (_vc72_var3 == -1 && _vc70_var1 == -1)
vc_skip_next_instruction(); vc_skip_next_instruction();
} }