aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
Diffstat (limited to 'simon')
-rw-r--r--simon/intern.h1
-rw-r--r--simon/simon.cpp2
-rw-r--r--simon/sound.cpp6
3 files changed, 3 insertions, 6 deletions
diff --git a/simon/intern.h b/simon/intern.h
index 1d919eb188..3b871892b4 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -164,7 +164,6 @@ enum {
GAME_SIMON2DOS = GF_SIMON2,
GAME_SIMON1TALKIE = GF_SIMON1 | GF_TALKIE,
GAME_SIMON2TALKIE = GF_SIMON2 | GF_TALKIE,
- GAME_SIMON1WIN = GF_SIMON1 | GF_WIN | GF_TALKIE,
GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
GAME_SIMON1DEMO = GF_SIMON1 | GF_DEMO | GF_OLD_BUNDLE,
GAME_SIMON1AMIGA = GF_SIMON1 | GF_AMIGA | GF_OLD_BUNDLE,
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 1c568f2142..1eeae88131 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -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 {
+ } else if (_game & GF_TALKIE) {
memcpy(filename, "SFXXXX", 6);
_sound->readSfxFile(filename);
}
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 5c02510700..344ff7e472 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -245,13 +245,11 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer
_voice_file = false;
_ambient_playing = 0;
- if (_game == GAME_SIMON1CD32) {
- // Uses separate voice files
+ // simon1cd32 uses separate speech files
+ if (!(_game & GF_TALKIE) || (_game == GAME_SIMON1CD32))
return;
- }
File *file = new File();
- const char *s;
#ifdef USE_FLAC
if (!_voice && gss->flac_filename && gss->flac_filename[0]) {