diff options
| author | Paul Gilbert | 2019-10-26 14:02:13 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-10-26 14:02:25 -0700 |
| commit | d55dfd9786bf7112e96a83f23af6b05e75fb044c (patch) | |
| tree | b85e531460bafdfc5c400e76c18372860a64d04e | |
| parent | ed5901c36ddc770e6d651bdd5df21b73d36fe188 (diff) | |
| download | scummvm-rg350-d55dfd9786bf7112e96a83f23af6b05e75fb044c.tar.gz scummvm-rg350-d55dfd9786bf7112e96a83f23af6b05e75fb044c.tar.bz2 scummvm-rg350-d55dfd9786bf7112e96a83f23af6b05e75fb044c.zip | |
GLK: LEVEL9: Further compilation fixes
| -rw-r--r-- | engines/glk/level9/detection_tables.h | 10 | ||||
| -rw-r--r-- | engines/glk/level9/os_glk.cpp | 4 | ||||
| -rw-r--r-- | engines/glk/module.mk | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/engines/glk/level9/detection_tables.h b/engines/glk/level9/detection_tables.h index b43deff1ad..3cc8f86469 100644 --- a/engines/glk/level9/detection_tables.h +++ b/engines/glk/level9/detection_tables.h @@ -770,11 +770,11 @@ static const gln_patch_table_t GLN_PATCH_TABLE[] = { }; const L9V1GameInfo L9_V1_GAMES[] = { - 0x1a, 0x24, 301, 0x0000, -0x004b, 0x0080, -0x002b, 0x00d0, 0x03b0, 0x0f80, 0x4857, /* Colossal Adventure */ - 0x20, 0x3b, 283, -0x0583, 0x0000, -0x0508, -0x04e0, 0x0000, 0x0800, 0x1000, 0x39d1, /* Adventure Quest */ - 0x14, 0xff, 153, -0x00d6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0a20, 0x16bf, 0x420d, /* Dungeon Adventure */ - 0x15, 0x5d, 252, -0x3e70, 0x0000, -0x3d30, -0x3ca0, 0x0100, 0x4120, -0x3b9d, 0x3988, /* Lords of Time */ - 0x15, 0x6c, 284, -0x00f0, 0x0000, -0x0050, -0x0050, -0x0050, 0x0300, 0x1930, 0x3c17, /* Snowball */ + 0x1a, 0x24, 301, { 0x0000, -0x004b, 0x0080, -0x002b, 0x00d0 }, 0x03b0, 0x0f80, 0x4857, /* Colossal Adventure */ + 0x20, 0x3b, 283, { -0x0583, 0x0000, -0x0508, -0x04e0, 0x0000 }, 0x0800, 0x1000, 0x39d1, /* Adventure Quest */ + 0x14, 0xff, 153, { -0x00d6, 0x0000, 0x0000, 0x0000, 0x0000 }, 0x0a20, 0x16bf, 0x420d, /* Dungeon Adventure */ + 0x15, 0x5d, 252, { -0x3e70, 0x0000, -0x3d30, -0x3ca0, 0x0100 }, 0x4120, -0x3b9d, 0x3988, /* Lords of Time */ + 0x15, 0x6c, 284, { -0x00f0, 0x0000, -0x0050, -0x0050, -0x0050 }, 0x0300, 0x1930, 0x3c17, /* Snowball */ }; const GlkDetectionEntry LEVEL9_GAMES[] = { diff --git a/engines/glk/level9/os_glk.cpp b/engines/glk/level9/os_glk.cpp index ac9a4eee9d..3ba8a3d868 100644 --- a/engines/glk/level9/os_glk.cpp +++ b/engines/glk/level9/os_glk.cpp @@ -2150,7 +2150,7 @@ static const glui32 GLN_WATCHDOG_FIXUP = 50; * remains silent for long enough, set by the timeout, we'll offer the * option to end the game. A timeout of zero disables the watchdog. */ -static time_t gln_watchdog_monitor = 0; +static uint32 gln_watchdog_monitor = 0; static double gln_watchdog_timeout_secs = 0.0; /* @@ -2208,7 +2208,7 @@ static void gln_watchdog_tick() { static int gln_watchdog_has_timed_out() { /* If loop detection is off or the timeout is set to zero, do nothing. */ if (gln_loopcheck_enabled && gln_watchdog_timeout_secs > 0) { - time_t now; + uint32 now; double delta_time; /* diff --git a/engines/glk/module.mk b/engines/glk/module.mk index 8462118fd1..840a1d89af 100644 --- a/engines/glk/module.mk +++ b/engines/glk/module.mk @@ -228,8 +228,6 @@ endif ifdef ENABLE_GLK_LEVEL9 MODULE_OBJS += \ - level9/detection.o \ - level9/level9.o \ level9/bitmap.o \ level9/detection.o \ level9/level9.o \ |