thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include simon debug options by default

Browse source 
svn-id: r5642
This commit is contained in:
Travis Howell 2002-11-20 14:45:00 +00:00
parent 80f13e1973
commit 85fe6a1ac5
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -47,9 +47,6 @@ LIBS += -lmad
# DEFINES += -DUSE_ALSA # DEFINES += -DUSE_ALSA
# LIBS += -lasound # LIBS += -lasound
# Uncomment this to activate extended debugging support in Simon
DEFINES += -DSIMONDEBUG
# Uncomment this for stricter compile time code verification # Uncomment this for stricter compile time code verification
# CFLAGS += -Wshadow -Werror # CFLAGS += -Wshadow -Werror

16
Makefile.mingw
View file

@ -19,6 +19,10 @@ RM_REC = $(RM) -r
ZIP = zip -q ZIP = zip -q
CP = cp CP = cp
#######################################################################
# Default compilation parameters. Normally don't edit these #
#######################################################################
CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
DEFINES = DEFINES =
LDFLAGS := LDFLAGS :=
@ -27,6 +31,10 @@ LIBS = $(SDL_LIBS) -lmingw32 -lwinmm
OBJS = scummvmico.o backends/sdl/sdl-common.o backends/sdl/sdl.o OBJS = scummvmico.o backends/sdl/sdl-common.o backends/sdl/sdl.o
EXEEXT :=.exe EXEEXT :=.exe
#######################################################################
# Compile options - you can modify these to tweak ScummVM compilation #
#######################################################################
# Enable this if you want ScummVM to dump all scripts it runs. # Enable this if you want ScummVM to dump all scripts it runs.
# This is mainly interesting for developers. # This is mainly interesting for developers.
# DEFINES += -DDUMP_SCRIPTS # DEFINES += -DDUMP_SCRIPTS
@ -39,8 +47,12 @@ LIBS += -lmad
DEFINES += -DUSE_VORBIS DEFINES += -DUSE_VORBIS
LIBS += -lvorbisfile -lvorbis -logg LIBS += -lvorbisfile -lvorbis -logg
# Uncomment this to activate extended debugging support in Simon # Uncomment this for stricter compile time code verification
DEFINES += -DSIMONDEBUG # CFLAGS += -Wshadow -Werror
#######################################################################
# Misc stuff - you should normally never have to edit this #
#######################################################################
# Concat DEFINES and INCLUDES to for the CPPFLAGS # Concat DEFINES and INCLUDES to for the CPPFLAGS
CPPFLAGS= $(DEFINES) $(INCLUDES) CPPFLAGS= $(DEFINES) $(INCLUDES)

4
simon/debug.cpp
View file

@ -30,8 +30,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef SIMONDEBUG
byte *SimonState::dumpOpcode(byte *p) byte *SimonState::dumpOpcode(byte *p)
{ {
byte opcode; byte opcode;
@ -477,5 +475,3 @@ void SimonState::dump_vga_script(byte *ptr, uint res, uint sprite_id)
dump_vga_script_always(ptr, res, sprite_id); dump_vga_script_always(ptr, res, sprite_id);
} }
#endif

8
simon/simon.h
View file

@ -462,8 +462,7 @@ public:
void set_hitarea_x_y(uint hitarea, int x, int y); void set_hitarea_x_y(uint hitarea, int x, int y);
bool is_hitarea_0x40_clear(uint hitarea); bool is_hitarea_0x40_clear(uint hitarea);
void delete_hitarea(uint hitarea); void delete_hitarea(uint hitarea);
void addNewHitArea(int id, int x, int y, int width, int height, void addNewHitArea(int id, int x, int y, int width, int height, int flags, int unk3, Item *item_ptr);
int flags, int unk3, Item *item_ptr);
HitArea *findEmptyHitArea(); HitArea *findEmptyHitArea();
void hitarea_proc_1(); void hitarea_proc_1();
void handle_verb_hitarea(HitArea * ha); void handle_verb_hitarea(HitArea * ha);
@ -587,8 +586,7 @@ public:
void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h); 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_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); 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, FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4);
uint unk4);
void render_string(uint num_1, uint color, uint width, uint height, const char *txt); void render_string(uint num_1, uint color, uint width, uint height, const char *txt);
@ -744,14 +742,12 @@ public:
void dx_clear_surfaces(uint num_lines); void dx_clear_surfaces(uint num_lines);
void dx_update_screen_and_palette(); void dx_update_screen_and_palette();
#ifdef SIMONDEBUG
void dump_video_script(byte *src, bool one_opcode_only); void dump_video_script(byte *src, bool one_opcode_only);
void dump_vga_file(byte *vga); void dump_vga_file(byte *vga);
void dump_vga_script(byte *ptr, uint res, uint sprite_id); 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_script_always(byte *ptr, uint res, uint sprite_id);
void dump_vga_bitmaps(byte *vga, byte *vga1, int res); 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); 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_clear_attached_from_top(uint lines);
void dx_copy_from_attached_to_2(uint x, uint y, uint w, uint h); void dx_copy_from_attached_to_2(uint x, uint y, uint w, uint h);