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

Auto detect effect file type in Simon the Sorcerer 1.

Browse source 
svn-id: r17951
This commit is contained in:
Travis Howell 2005-05-08 05:23:31 +00:00
parent 0bcd57e87f
commit 169c85a19b
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
simon/simon.cpp
View file

@ -64,7 +64,7 @@ static const SimonGameSettings simon_settings[] = {
{"simon1amiga", "Simon the Sorcerer 1 (Amiga)", GAME_SIMON1AMIGA, "gameamiga"},
{"simon2dos", "Simon the Sorcerer 2 (DOS)", GAME_SIMON2DOS, "GAME32"},
{"simon1talkie", "Simon the Sorcerer 1 Talkie", GAME_SIMON1TALKIE, "GAMEPC"},
{"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", GAME_SIMON1WIN, 0},
{"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", GAME_SIMON1TALKIE, 0},
{"simon2talkie", "Simon the Sorcerer 2 Talkie", GAME_SIMON2TALKIE, "GSPTR30"},
{"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", GAME_SIMON2WIN, 0},
{"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GAME_SIMON2WIN, 0},
@ -1343,7 +1343,7 @@ void SimonEngine::loadTablesIntoMem(uint subr_id) {
if (_game & GF_SIMON2) {
_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
} else if (_game & GF_WIN) {
} else {
memcpy(filename, "SFXXXX", 6);
_sound->readSfxFile(filename);
}