aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2002-11-05 14:28:19 +0000
committerTravis Howell2002-11-05 14:28:19 +0000
commit3801be6bceb5cb8b9fa9d5680551c9ae2285e079 (patch)
tree98f0d3d280f46bb073f77aab514abfa53ba41fff
parentd6adddb7927f9f8be370393450210672500a420c (diff)
downloadscummvm-rg350-3801be6bceb5cb8b9fa9d5680551c9ae2285e079.tar.gz
scummvm-rg350-3801be6bceb5cb8b9fa9d5680551c9ae2285e079.tar.bz2
scummvm-rg350-3801be6bceb5cb8b9fa9d5680551c9ae2285e079.zip
Remove two pointless game checks
svn-id: r5421
-rw-r--r--simon/items.cpp2
-rw-r--r--simon/simon.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 4f4a9f13db..c5122f5e1e 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -386,7 +386,7 @@ int SimonState::runScript()
break;
case 67:{ /* set array 3 and 4 */
- if (_game & GAME_TALKIE || _game & GAME_WIN) {
+ if (_game & GAME_TALKIE) {
uint var = getVarOrByte();
uint string_id = getNextStringID();
uint value = getNextWord();
diff --git a/simon/simon.cpp b/simon/simon.cpp
index beeca376e0..14d1c0cedc 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4679,7 +4679,7 @@ bool SimonState::load_game(uint slot)
void SimonState::initSound()
{
/* only read voice file in windows game */
- if (_game & GAME_TALKIE || _game & GAME_WIN) {
+ if (_game & GAME_TALKIE) {
const char *m = gss->mp3_filename;
const char *s = gss->wav_filename;
const char *s2 = gss->voc_filename;