[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.278,1.279
Travis Howell
kirben at users.sourceforge.net
Sat Aug 2 03:49:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv28234/simon
Modified Files:
simon.cpp
Log Message:
Always check for null string
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- simon.cpp 2 Aug 2003 10:42:54 -0000 1.278
+++ simon.cpp 2 Aug 2003 10:48:30 -0000 1.279
@@ -2065,7 +2065,7 @@
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 @@
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;
}
More information about the Scummvm-git-logs
mailing list