diff options
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 25 | ||||
| -rw-r--r-- | simon/simon.h | 8 |
2 files changed, 15 insertions, 18 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index ed9dfb643e..0b654232cf 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2563,9 +2563,8 @@ void SimonState::timer_vga_sprites() { 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 @@ void SimonState::timer_vga_sprites() { 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 @@ void SimonState::timer_vga_sprites_helper() { _vga_var3 = 0; } -#ifdef DRAW_IMAGES_DEBUG void SimonState::timer_vga_sprites_2() { VgaSprite *vsp; VgaPointersEntry *vpe; @@ -2673,14 +2671,11 @@ void SimonState::timer_vga_sprites_2() { 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 @@ void SimonState::timer_proc1() { /* 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 @@ void SimonState::processSpecialKeys() { case 'v': if (_debugMode) _continous_vgascript ^= 1; + break; + case 'i': + if (_debugMode) + _draw_images_debug ^= 1; } _key_pressed = 0; @@ -4614,6 +4612,7 @@ void SimonState::go() { _start_mainscript = false; _continous_mainscript = false; _continous_vgascript = false; + _draw_images_debug=false; if (_debugLevel == 2) _continous_mainscript = true; diff --git a/simon/simon.h b/simon/simon.h index f61ad9d561..305831eb91 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -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 @@ public: 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 @@ public: Item *getNextItemPtr(); uint getNextItemID(); - uint getItem1ID() { - return 1; - } Item *getItem1Ptr(); + uint getItem1ID() {return 1;} + Item *getItem1Ptr(); Item *getItemPtrB(); byte getByte(); |