[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.114,1.115 simon.h,1.36,1.37
Travis Howell
kirben at users.sourceforge.net
Sat Dec 7 18:02:02 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv21653/simon
Modified Files:
simon.cpp simon.h
Log Message:
Cut scenes can only be skipped by Esc key now
A right mouse click allows skips of speech, even in intro.
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- simon.cpp 7 Dec 2002 18:00:25 -0000 1.114
+++ simon.cpp 8 Dec 2002 02:01:27 -0000 1.115
@@ -2471,20 +2471,22 @@
_vga_wait_for = a;
_timer_1 = 0;
_exit_cutscene = false;
+ _skip_speech = false;
_system->show_mouse(false);
while (_vga_wait_for != 0) {
- if (_exit_cutscene) {
- if (vc_get_bit(9)) {
- _system->show_mouse(true);
- startSubroutine170();
- break;
- }
+ if (_skip_speech) {
if (_game & GAME_SIMON2) {
if (_vga_wait_for == 200 && !vc_get_bit(14)) {
skip_speech();
break;
}
}
+ } else if (_exit_cutscene) {
+ if (vc_get_bit(9)) {
+ _system->show_mouse(true);
+ startSubroutine170();
+ break;
+ }
} else {
processSpecialKeys();
}
@@ -4599,7 +4601,7 @@
break;
case OSystem::EVENT_RBUTTONDOWN:
- _exit_cutscene = true;
+ _skip_speech = true;
break;
}
}
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- simon.h 7 Dec 2002 17:36:38 -0000 1.36
+++ simon.h 8 Dec 2002 02:01:28 -0000 1.37
@@ -242,6 +242,7 @@
bool _video_var_3;
bool _unk_pal_flag;
bool _exit_cutscene;
+ bool _skip_speech;
byte _video_var_9;
uint _last_music_played;
More information about the Scummvm-git-logs
mailing list