[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.8,1.9 simon.h,1.19,1.20

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv7069/simon

Modified Files:
	debug.cpp simon.h 
Log Message:

Include simon debug options by default


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.cpp	20 Nov 2002 13:19:50 -0000	1.8
+++ debug.cpp	20 Nov 2002 14:44:59 -0000	1.9
@@ -30,8 +30,6 @@
 #include <sys/stat.h>
 #endif
 
-#ifdef SIMONDEBUG
-
 byte *SimonState::dumpOpcode(byte *p)
 {
 	byte opcode;
@@ -477,5 +475,3 @@
 	dump_vga_script_always(ptr, res, sprite_id);
 }
 
-
-#endif

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- simon.h	20 Nov 2002 06:33:12 -0000	1.19
+++ simon.h	20 Nov 2002 14:45:00 -0000	1.20
@@ -462,8 +462,7 @@
 	void set_hitarea_x_y(uint hitarea, int x, int y);
 	bool is_hitarea_0x40_clear(uint hitarea);
 	void delete_hitarea(uint hitarea);
-	void addNewHitArea(int id, int x, int y, int width, int height,
-										 int flags, int unk3, Item *item_ptr);
+	void addNewHitArea(int id, int x, int y, int width, int height, int flags, int unk3, Item *item_ptr);
 	HitArea *findEmptyHitArea();
 	void hitarea_proc_1();
 	void handle_verb_hitarea(HitArea * ha);
@@ -587,8 +586,7 @@
 	void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h);
 	void talk_with_speech(uint speech_id, uint num_1);
 	void talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint a, int b, uint c);
-	FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color,
-															uint unk4);
+	FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4);
 
 	void render_string(uint num_1, uint color, uint width, uint height, const char *txt);
 
@@ -744,14 +742,12 @@
 	void dx_clear_surfaces(uint num_lines);
 	void dx_update_screen_and_palette();
 
-#ifdef SIMONDEBUG
 	void dump_video_script(byte *src, bool one_opcode_only);
 	void dump_vga_file(byte *vga);
 	void dump_vga_script(byte *ptr, uint res, uint sprite_id);
 	void dump_vga_script_always(byte *ptr, uint res, uint sprite_id);
 	void dump_vga_bitmaps(byte *vga, byte *vga1, int res);
 	void dump_single_bitmap(int file, int image, byte *offs, int w, int h, byte base);
-#endif
 
 	void dx_clear_attached_from_top(uint lines);
 	void dx_copy_from_attached_to_2(uint x, uint y, uint w, uint h);