[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.449,1.450 simon.h,1.125,1.126
Travis Howell
kirben at users.sourceforge.net
Mon Aug 2 04:54:02 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.448,1.449 simon.h,1.124,1.125
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga module.mk,1.14,1.15 render.cpp,1.20,1.21 saga.cpp,1.31,1.32 saga.h,1.22,1.23 timer.cpp,1.4,NONE timer.h,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22933/simon
Modified Files:
simon.cpp simon.h
Log Message:
Remove pointless delays
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- simon.cpp 2 Aug 2004 11:37:06 -0000 1.449
+++ simon.cpp 2 Aug 2004 11:53:33 -0000 1.450
@@ -2459,12 +2459,10 @@
if (mode == 4)
vc_29_stop_all_sounds();
- if (_lock_word & 0x10) {
+ if (_lock_word & 0x10)
error("o_set_video_mode_ex: _lock_word & 0x10");
-// _unk21_word_array[a] = b;
- } else {
- set_video_mode(mode, vga_res);
- }
+
+ set_video_mode_internal(mode, vga_res);
}
void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
@@ -2568,28 +2566,6 @@
}
}
-void SimonEngine::set_video_mode(uint mode, uint vga_res_id) {
- if (_lock_counter == 0) {
- lock();
- if (_lock_word == 0) {
- _sync_flag_1 = true;
- while (_sync_flag_1) {
- delay(10);
- }
- }
- }
-
- _lock_word |= 0x20;
-
- while (_lock_word & 2) {
- delay(10);
- }
-
- unlock();
-
- set_video_mode_internal(mode, vga_res_id);
-}
-
void SimonEngine::o_fade_to_black() {
uint i;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- simon.h 2 Aug 2004 11:37:07 -0000 1.125
+++ simon.h 2 Aug 2004 11:53:33 -0000 1.126
@@ -585,7 +585,6 @@
void handle_verb_clicked(uint verb);
void o_set_video_mode(uint mode, uint vga_res);
- void set_video_mode(uint mode, uint vga_res_id);
void set_video_mode_internal(uint mode, uint vga_res_id);
void ensureVgaResLoadedC(uint vga_res);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.448,1.449 simon.h,1.124,1.125
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga module.mk,1.14,1.15 render.cpp,1.20,1.21 saga.cpp,1.31,1.32 saga.h,1.22,1.23 timer.cpp,1.4,NONE timer.h,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list