aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-07-22 12:16:56 +0000
committerTravis Howell2003-07-22 12:16:56 +0000
commit0e499b9a8019bf76d451d44f89b9bb037202c378 (patch)
tree7cc65499f6b90dcadf49b1444b69595f6057d504 /simon
parent7d5214132910dceadf3de26f5dabc526c7b05056 (diff)
downloadscummvm-rg350-0e499b9a8019bf76d451d44f89b9bb037202c378.tar.gz
scummvm-rg350-0e499b9a8019bf76d451d44f89b9bb037202c378.tar.bz2
scummvm-rg350-0e499b9a8019bf76d451d44f89b9bb037202c378.zip
That last change wasn't quite right
svn-id: r9119
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index fd942771a5..7bc8ef60e2 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2058,7 +2058,7 @@ void SimonEngine::o_print_str() {
case GAME_SIMON1CD32:
if (speech_id != 0)
talk_with_speech(speech_id, num_1);
- if ((speech_id == 0) || (string_ptr != NULL && _subtitles))
+ if (string_ptr != NULL && (_subtitles || speech_id == 0))
talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
break;