diff options
| author | Travis Howell | 2003-08-02 10:48:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-02 10:48:30 +0000 |
| commit | 03f6ec8a8a3f26167c52819f8f7a2089071734da (patch) | |
| tree | 39dcaa5a5b53cc92fd7bbf5301f3486a1bdf8a82 | |
| parent | a4ac513247d1df859037ee7d3709e231186cf6b3 (diff) | |
| download | scummvm-rg350-03f6ec8a8a3f26167c52819f8f7a2089071734da.tar.gz scummvm-rg350-03f6ec8a8a3f26167c52819f8f7a2089071734da.tar.bz2 scummvm-rg350-03f6ec8a8a3f26167c52819f8f7a2089071734da.zip | |
Always check for null string
svn-id: r9404
| -rw-r--r-- | simon/simon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 7574455d2a..4a0c613a59 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2065,7 +2065,7 @@ void SimonEngine::o_print_str() { case GAME_SIMON1CD32: if (speech_id != 0) talk_with_speech(speech_id, num_1); - if (string_ptr != NULL && (_subtitles || speech_id == 0)) + if (string_ptr != NULL && (speech_id == 0 || _subtitles)) talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c); break; @@ -2085,7 +2085,7 @@ void SimonEngine::o_print_str() { if ((_game & GF_TALKIE) && (speech_id == 0)) o_kill_sprite_simon2(2, num_1 + 2); - if (_subtitles || speech_id == 0) + if (string_ptr != NULL && (speech_id == 0 || _subtitles)) talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c); break; } |