diff options
| author | dreammaster | 2018-11-10 18:25:20 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-08 19:05:59 -0800 |
| commit | 62315b969d851166c94c6fb73a3da7ac4ab44a73 (patch) | |
| tree | 47d0b2cea9d2e5fb187725a15d657bf92170c48d /engines/gargoyle/scott/scott.cpp | |
| parent | fbed3ed7a3ab37cedf05d551e9c904db44a35b88 (diff) | |
| download | scummvm-rg350-62315b969d851166c94c6fb73a3da7ac4ab44a73.tar.gz scummvm-rg350-62315b969d851166c94c6fb73a3da7ac4ab44a73.tar.bz2 scummvm-rg350-62315b969d851166c94c6fb73a3da7ac4ab44a73.zip | |
GLK: gcc compilation fixes
Diffstat (limited to 'engines/gargoyle/scott/scott.cpp')
| -rw-r--r-- | engines/gargoyle/scott/scott.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gargoyle/scott/scott.cpp b/engines/gargoyle/scott/scott.cpp index 9f3a87d604..3316995482 100644 --- a/engines/gargoyle/scott/scott.cpp +++ b/engines/gargoyle/scott/scott.cpp @@ -175,7 +175,7 @@ void Scott::delay(int seconds) { } void Scott::fatal(const char *x) { - error(x); + error("%s", x); } void Scott::clearScreen(void) { @@ -412,7 +412,7 @@ void Scott::outputNumber(int a) { } void Scott::look(void) { - static char *ExitNames[6] = { "North", "South", "East", "West", "Up", "Down" }; + const char *const ExitNames[6] = { "North", "South", "East", "West", "Up", "Down" }; Room *r; int ct, f; int pos; @@ -555,7 +555,7 @@ Common::Error Scott::saveGameState(int slot, const Common::String &desc) { glk_put_string_stream(file, msg.c_str()); } - msg = Common::String::format("%lu %d %hd %d %d %hd\n", + msg = Common::String::format("%u %d %hd %d %d %hd\n", BitFlags, (BitFlags & (1 << DARKBIT)) ? 1 : 0, MyLoc, CurrentCounter, SavedRoom, GameHeader.LightTime); glk_put_string_stream(file, msg.c_str()); @@ -602,7 +602,7 @@ Common::Error Scott::loadGameState(int slot) { } glk_get_line_stream(file, buf, sizeof buf); - sscanf(buf, "%ld %hd %d %d %d %d\n", + sscanf(buf, "%u %hd %d %d %d %d\n", &BitFlags, &darkFlag, &MyLoc, &CurrentCounter, &SavedRoom, &GameHeader.LightTime); |