diff options
| author | Filippos Karapetis | 2009-02-20 20:11:12 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-02-20 20:11:12 +0000 |
| commit | ac716ad843e386e69a2c865556a4af6e693f9530 (patch) | |
| tree | 282c31b2ec3c602ddc2f5d59e2cdfada6e740af6 /engines/sci/include | |
| parent | 208016649999ae89a2bba1f382f4f9fdbdd519b2 (diff) | |
| download | scummvm-rg350-ac716ad843e386e69a2c865556a4af6e693f9530.tar.gz scummvm-rg350-ac716ad843e386e69a2c865556a4af6e693f9530.tar.bz2 scummvm-rg350-ac716ad843e386e69a2c865556a4af6e693f9530.zip | |
Started conversion of debug messages and debug levels to the ScummVM equivalents. Removed the "stubs" and "warnings" debug levels and replaced such kinds of messages with normal warnings
svn-id: r38617
Diffstat (limited to 'engines/sci/include')
| -rw-r--r-- | engines/sci/include/kdebug.h | 5 | ||||
| -rw-r--r-- | engines/sci/include/kernel.h | 7 | ||||
| -rw-r--r-- | engines/sci/include/resource.h | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/engines/sci/include/kdebug.h b/engines/sci/include/kdebug.h index fba5a1ee25..dbe890f8ff 100644 --- a/engines/sci/include/kdebug.h +++ b/engines/sci/include/kdebug.h @@ -29,11 +29,10 @@ #define _SCI_KDEBUG_H_ struct _state; -#define SCIk_DEBUG_MODES 18 +#define SCIk_DEBUG_MODES 17 #define SCIkERROR_NR -2 #define SCIkWARNING_NR -1 -#define SCIkSTUB_NR 0 #define SCIkFUNCCHK_NR 5 #define SCIkSOUNDCHK_NR 7 #define SCIkGFXDRIVER_NR 8 @@ -42,8 +41,6 @@ struct _state; #define SCIkAVOIDPATH_NR 17 #define SCIkERROR s, __FILE__, __LINE__, SCIkERROR_NR -#define SCIkWARNING s, __FILE__, __LINE__, SCIkWARNING_NR -#define SCIkSTUB s, __FILE__, __LINE__, SCIkSTUB_NR #define SCIkNODES s, __FILE__, __LINE__, 1 #define SCIkGRAPHICS s, __FILE__, __LINE__, 2 #define SCIkSTRINGS s, __FILE__, __LINE__, 3 diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h index 16e4c187d8..e9467e246e 100644 --- a/engines/sci/include/kernel.h +++ b/engines/sci/include/kernel.h @@ -27,6 +27,7 @@ #define _SCI_KERNEL_H_ #include "common/scummsys.h" +#include "common/debug.h" #include "sci/include/kdebug.h" #include "sci/include/uinput.h" @@ -113,12 +114,6 @@ kernel_lookup_text(struct _state *s, reg_t address, int index); /******************** Debug functionality ********************/ #define KERNEL_OOPS(reason) kernel_oops(s, __FILE__, __LINE__, reason) -/* Non-fatal assertion */ -#define SCIkASSERT(a) if (!(a)) { \ - SCIkwarn(SCIkERROR, "Assertion " #a " failed in " __FILE__ " line %d\n", __LINE__); \ - return; \ -} - #ifdef SCI_KERNEL_DEBUG #define CHECK_THIS_KERNEL_FUNCTION if (s->debug_mode & (1 << SCIkFUNCCHK_NR)) {\ diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index ed9e420933..278810490d 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -298,6 +298,4 @@ sci_sched_yield(void); # define BREAKPOINT() { fprintf(stderr, "Missed breakpoint in %s, line %d\n", __FILE__, __LINE__); *((int *) NULL) = 42; } #endif /* !BREAKPOINT() */ -#define WARNING(foo) {char i; i = 500;} - #endif |