diff options
| author | Torbjörn Andersson | 2003-09-27 11:02:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-27 11:02:58 +0000 |
| commit | 8ad28e3a7e3a4696f05e067ad51f504cda306502 (patch) | |
| tree | 93c3199f65732d5590b3cab9ae7c7215acef6992 /sword2/console.h | |
| parent | 5f2d799fd22aa95d3fe075c736574a1941f6a5e8 (diff) | |
| download | scummvm-rg350-8ad28e3a7e3a4696f05e067ad51f504cda306502.tar.gz scummvm-rg350-8ad28e3a7e3a4696f05e067ad51f504cda306502.tar.bz2 scummvm-rg350-8ad28e3a7e3a4696f05e067ad51f504cda306502.zip | |
More cleanup, and I've replaced most - not quite all - of BS2's debug
message functions with our own.
We still need to go through them and assign sensible debug levels to them.
svn-id: r10422
Diffstat (limited to 'sword2/console.h')
| -rw-r--r-- | sword2/console.h | 68 |
1 files changed, 26 insertions, 42 deletions
diff --git a/sword2/console.h b/sword2/console.h index ffec1d51d8..1b3a73eb2e 100644 --- a/sword2/console.h +++ b/sword2/console.h @@ -25,57 +25,41 @@ #ifdef _SWORD2_DEBUG -void Init_console(void); //Tony9Sept96 -uint32 One_console(void); //Tony12Aug96 -void StartConsole(void); //Tony12Aug96 -void EndConsole(void); //Tony9Oct96 - -void Con_fatal_error(const char *format,...); -void Print_to_console(const char *format,...); //Tony13Aug96 -void Temp_print_to_console(const char *format,...); //Tony13Aug96 -void Scroll_console(void); //Tony13Aug96 -void Clear_console_line(void); //Tony13Aug96 - -extern mem *console_sprite; -extern uint32 con_y; -extern uint32 con_depth; -extern uint32 con_width; +void Init_console(void); +uint32 One_console(void); +void StartConsole(void); +void EndConsole(void); + +void Con_fatal_error(const char *format, ...); +void Print_to_console(const char *format, ...); +void Temp_print_to_console(const char *format, ...); +void Scroll_console(void); +void Clear_console_line(void); + +extern mem *console_sprite; +extern uint32 con_y; +extern uint32 con_depth; +extern uint32 con_width; extern uint8 grabbingSequences; extern uint8 wantSfxDebug; // sfx debug file enabled/disabled from console +#else -#else // _SWORD2_DEBUG -/* -#define Init_console NULL -#define One_console NULL -#define StartConsole NULL -#define EndConsole NULL -*/ - -void Init_console(void); -uint32 One_console(void); -void StartConsole(void); -void EndConsole(void); +void Init_console(void); +uint32 One_console(void); +void StartConsole(void); +void EndConsole(void); -// 'Con_fatal_error' commands map to ExitWithReport -// so we show errors in a window rather than our development game console -#define Con_fatal_error ExitWithReport +#define Con_fatal_error error -//#define Print_to_console NULL -//#define Temp_print_to_console NULL -//#define Clear_console_line NULL -//#define Scroll_console NULL -void Print_to_console(const char *format,...); -void Temp_print_to_console(const char *format,...); -void Clear_console_line(void); -void Scroll_console(void); -//#define Var_check NULL -//#define Var_set NULL +void Print_to_console(const char *format, ...); +void Temp_print_to_console(const char *format, ...); +void Clear_console_line(void); +void Scroll_console(void); -#endif // _SWORD2_DEBUG +#endif extern uint32 console_status; - #endif |