[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.81,1.82 simon.cpp,1.232,1.233
Travis Howell
kirben at users.sourceforge.net
Thu Jun 5 06:22:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv31796/simon
Modified Files:
items.cpp simon.cpp
Log Message:
Last commit should have been made simon1 only
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- items.cpp 5 Jun 2003 12:20:03 -0000 1.81
+++ items.cpp 5 Jun 2003 13:21:03 -0000 1.82
@@ -995,10 +995,17 @@
if (_game & GF_TALKIE)
d = _array_4[a];
- if (d != 0)
- talk_with_speech(d, b);
- if (s != NULL && (d == 0 || _subtitles))
- talk_with_text(b, c, s, tv->a, tv->b, tv->c);
+ if (_game & GF_SIMON2) {
+ if (d != 0 && !_subtitles)
+ talk_with_speech(d, b);
+ else if (s != NULL)
+ talk_with_text(b, c, s, tv->a, tv->b, tv->c);
+ } else {
+ if (d != 0)
+ talk_with_speech(d, b);
+ if (s != NULL && _subtitles)
+ talk_with_text(b, c, s, tv->a, tv->b, tv->c);
+ }
}
break;
@@ -1286,7 +1293,8 @@
}
}
- talk_with_speech(var200, a);
+ if (!_subtitles)
+ talk_with_speech(var200, a);
}
}
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- simon.cpp 5 Jun 2003 12:20:05 -0000 1.232
+++ simon.cpp 5 Jun 2003 13:21:03 -0000 1.233
@@ -2054,7 +2054,7 @@
case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN:
case GAME_SIMON2MAC:
- if (speech_id != 0 && num_1 == 1)
+ if (speech_id != 0 && num_1 == 1 && !_subtitles)
talk_with_speech(speech_id, num_1);
if (speech_id != 0 && !_subtitles)
More information about the Scummvm-git-logs
mailing list