libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-01 15:55:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hopeyfully this fixes simon2dos

Browse Source 
svn-id: r5361
This commit is contained in:
Max Horn 2002-10-31 01:55:11 +00:00
parent b43410e6f6
commit d7123f4908
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simon/items.cpp
View File

@ -1322,7 +1322,7 @@ void SimonState::o_177()
talk_with_text(a, b, s, tv->a, tv->b, tv->c); talk_with_text(a, b, s, tv->a, tv->b, tv->c);
} }
} else if (_game == GAME_SIMON2WIN || _game == GAME_SIMON2DOS) { } else if (_game & GAME_SIMON2) {
uint a = getVarOrByte(); uint a = getVarOrByte();
uint b = getVarOrByte(); uint b = getVarOrByte();
Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2); Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2);

10
simon/simon.cpp
View File

@ -4941,10 +4941,13 @@ void SimonState::playMusic(uint music)
midi.initialize(); midi.initialize();
midi.play(); midi.play();
} else { } else if (!(_game & GAME_SIMON2)){
midi.shutdown(); midi.shutdown();
if (_game == GAME_SIMON1DOS) { if (_game & GAME_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs_old(_game_file);
} else {
char buf[50]; char buf[50];
File *f = new File(); File *f = new File();
sprintf(buf, "MOD%d.MUS", music); sprintf(buf, "MOD%d.MUS", music);
@ -4955,9 +4958,6 @@ void SimonState::playMusic(uint music)
} }
midi.read_all_songs_old(f); midi.read_all_songs_old(f);
delete f; delete f;
} else if (_game == GAME_SIMON1WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs_old(_game_file);
} }
midi.initialize(); midi.initialize();

6
simon/simon.h
View File

@ -116,9 +116,9 @@ public:
GAME_WIN = 2, GAME_WIN = 2,
GAME_SIMON1DOS = 0, GAME_SIMON1DOS = 0,
GAME_SIMON1WIN = 2, GAME_SIMON1WIN = GAME_WIN,
GAME_SIMON2DOS = 1, GAME_SIMON2DOS = GAME_SIMON2,
GAME_SIMON2WIN = 3, GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN,
GAME_SIMON1DEMO = 4, GAME_SIMON1DEMO = 4,
}; };