aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/hugo
diff options
context:
space:
mode:
authorPaul Gilbert2019-05-14 17:43:02 -1000
committerPaul Gilbert2019-05-15 10:43:32 -1000
commit546160c1c17f5ce29e263c3d35188320276ae76e (patch)
treeeaea58ef398601ca7074e6841daf3dd73394d9b1 /engines/glk/hugo
parent297ebb73e0e922c635397086cdca46cd8d00c74b (diff)
downloadscummvm-rg350-546160c1c17f5ce29e263c3d35188320276ae76e.tar.gz
scummvm-rg350-546160c1c17f5ce29e263c3d35188320276ae76e.tar.bz2
scummvm-rg350-546160c1c17f5ce29e263c3d35188320276ae76e.zip
GLK: HUGO: Comment out the DEBUGGER define
It's beter, since I don't know how to properly implement all the debugger methods that get called when it's turned on
Diffstat (limited to 'engines/glk/hugo')
-rw-r--r--engines/glk/hugo/hugo.h7
-rw-r--r--engines/glk/hugo/hugo_defines.h15
2 files changed, 13 insertions, 9 deletions
diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h
index 400bc652a3..74b885b982 100644
--- a/engines/glk/hugo/hugo.h
+++ b/engines/glk/hugo/hugo.h
@@ -1133,10 +1133,7 @@ private:
void hugo_blockfree(void *block) { free(block); }
#if defined (DEBUGGER)
- int CheckinRange(uint v1, uint v2, const char *v3) {
- // TODO: Where the heck is this actualy implemented in Gargoyle
- return 1;
- }
+ int CheckinRange(uint v1, uint v2, const char *v3) { return 1; }
/**
* Shorthand since many of these object functions may call CheckinRange() if the debugger
@@ -1144,7 +1141,7 @@ private:
*/
int CheckObjectRange(int obj);
- void DebugRunRoutine(long addr) {}
+ void DebugRunRoutine(long addr) { RunRoutine(addr); }
void RuntimeWarning(const char *msg) {}
diff --git a/engines/glk/hugo/hugo_defines.h b/engines/glk/hugo/hugo_defines.h
index 1fb6892fca..b9ed1379cf 100644
--- a/engines/glk/hugo/hugo_defines.h
+++ b/engines/glk/hugo/hugo_defines.h
@@ -33,11 +33,18 @@ namespace Hugo {
#define HEINTERIM ".0"
#define GLK
-#define DEBUGGER 1
#define GRAPHICS_SUPPORTED
#define SOUND_SUPPORTED
#define SETTITLE_SUPPORTED
+// There's a bunch of debugging code in the original Hugo sources behind DEBUGGER defines,
+// but doesn't actually have any implementation of them. I've put in some stub methods,
+// with the idea that debugger code could eventually be hooked up to the ScummVM debugger.
+// So for now the debugger defined is commented out, since with debugger enabled the games
+// don't work properly
+//#define DEBUGGER 1
+
+
#define MAXOBJLIST 32
#define MAX_CONTEXT_COMMANDS 32
#define MAX_EVAL_ELEMENTS 256
@@ -164,6 +171,9 @@ browsing.
#define PRINTFATALERROR(a) error("%s", a)
+#define PIC 0
+#define SND 1
+
#if defined (DEBUGGER)
#define VIEW_CALLS 0
#define VIEW_LOCALS 1
@@ -173,9 +183,6 @@ browsing.
#define FORCE_REDRAW 1
-#define PIC 0
-#define SND 1
-
#endif
} // End of namespace Hugo