[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.163,1.164 simon.h,1.53,1.54
Travis Howell
kirben at users.sourceforge.net
Fri Mar 7 05:41:01 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.162,1.163 simon.h,1.52,1.53 vga.cpp,1.36,1.37
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky grid.cpp,NONE,1.1 disk.cpp,1.10,1.11 intro.cpp,1.4,1.5 module.mk,1.1,1.2 screen.cpp,1.4,1.5 sky.cpp,1.4,1.5 sky.h,1.4,1.5 skydefs.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv29748/simon
Modified Files:
simon.cpp simon.h
Log Message:
Add two more debug defines as key options
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- simon.cpp 7 Mar 2003 12:52:27 -0000 1.163
+++ simon.cpp 7 Mar 2003 13:39:59 -0000 1.164
@@ -2563,9 +2563,8 @@
if (_video_var_9 == 2)
_video_var_9 = 1;
-#ifdef DRAW_THREE_STARS
- fprintf(_dump_file, "***\n");
-#endif
+ if (_continous_vgascript)
+ fprintf(_dump_file, "***\n");
if (_game & GF_SIMON2 && _vga_var3) {
timer_vga_sprites_helper();
@@ -2598,9 +2597,9 @@
vsp++;
}
-#ifdef DRAW_IMAGES_DEBUG
- memset(_sdl_buf_attached, 0, 320 * 200);
-#endif
+ if (_draw_images_debug)
+ memset(_sdl_buf_attached, 0, 320 * 200);
+
_video_var_8++;
_vc_ptr = vc_ptr_org;
}
@@ -2639,7 +2638,6 @@
_vga_var3 = 0;
}
-#ifdef DRAW_IMAGES_DEBUG
void SimonState::timer_vga_sprites_2() {
VgaSprite *vsp;
VgaPointersEntry *vpe;
@@ -2673,14 +2671,11 @@
vsp++;
}
-#ifdef DRAW_THREE_STARS
fprintf(_dump_file, "***\n");
-#endif
_video_var_8++;
_vc_ptr = vc_ptr_org;
}
-#endif
void SimonState::timer_proc1() {
_timer_4++;
@@ -2723,9 +2718,8 @@
/* XXX: more stuff here */
timer_vga_sprites();
-#ifdef DRAW_IMAGES_DEBUG
- timer_vga_sprites_2();
-#endif
+ if (_draw_images_debug)
+ timer_vga_sprites_2();
if (_copy_partial_mode == 1) {
dx_copy_from_2_to_attached(80, 46, 208 - 80, 94 - 46);
@@ -3142,6 +3136,10 @@
case 'v':
if (_debugMode)
_continous_vgascript ^= 1;
+ break;
+ case 'i':
+ if (_debugMode)
+ _draw_images_debug ^= 1;
}
_key_pressed = 0;
@@ -4614,6 +4612,7 @@
_start_mainscript = false;
_continous_mainscript = false;
_continous_vgascript = false;
+ _draw_images_debug=false;
if (_debugLevel == 2)
_continous_mainscript = true;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- simon.h 7 Mar 2003 12:52:28 -0000 1.53
+++ simon.h 7 Mar 2003 13:39:59 -0000 1.54
@@ -30,8 +30,6 @@
#include "simon/sound.h"
/* Various other settings */
-//#define DRAW_IMAGES_DEBUG
-//#define DRAW_THREE_STARS
//#define DUMP_FILE_NR 8
//#define DUMP_BITMAPS_FILE_NR 8
//#define DUMP_DRAWN_BITMAPS
@@ -184,6 +182,7 @@
bool _start_mainscript;
bool _continous_mainscript;
bool _continous_vgascript;
+ bool _draw_images_debug;
bool _subtitles;
byte _mouse_cursor;
bool _vga_var9;
@@ -398,9 +397,8 @@
Item *getNextItemPtr();
uint getNextItemID();
- uint getItem1ID() {
- return 1;
- } Item *getItem1Ptr();
+ uint getItem1ID() {return 1;}
+ Item *getItem1Ptr();
Item *getItemPtrB();
byte getByte();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.162,1.163 simon.h,1.52,1.53 vga.cpp,1.36,1.37
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky grid.cpp,NONE,1.1 disk.cpp,1.10,1.11 intro.cpp,1.4,1.5 module.mk,1.1,1.2 screen.cpp,1.4,1.5 sky.cpp,1.4,1.5 sky.h,1.4,1.5 skydefs.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list