diff options
author | Johannes Schickel | 2014-01-18 03:27:23 +0100 |
---|---|---|
committer | Johannes Schickel | 2014-01-18 03:27:23 +0100 |
commit | 4349ee8b3bca1bf1d3185bcd3862c131d4d37637 (patch) | |
tree | c4668b649538e210ac949ad75e3b8829fb938e90 /engines/scumm/he | |
parent | 18ef3ed6b357bbe3ea35989b19ecac32fdf07892 (diff) | |
download | scummvm-rg350-4349ee8b3bca1bf1d3185bcd3862c131d4d37637.tar.gz scummvm-rg350-4349ee8b3bca1bf1d3185bcd3862c131d4d37637.tar.bz2 scummvm-rg350-4349ee8b3bca1bf1d3185bcd3862c131d4d37637.zip |
SCUMM: Fix some GCC warnings.
Diffstat (limited to 'engines/scumm/he')
-rw-r--r-- | engines/scumm/he/script_v60he.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 4901d47c51..409fb7edf7 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -91,7 +91,7 @@ void ScummEngine_v60he::setupOpcodes() { } Common::String ScummEngine_v60he::convertFilePath(const byte *src) { - debug(2, "convertFilePath in: '%s'", (char *)src); + debug(2, "convertFilePath in: '%s'", (const char *)src); int srcSize = resStrLen(src); int start = 0; @@ -140,7 +140,7 @@ Common::String ScummEngine_v60he::convertFilePath(const byte *src) { } Common::String ScummEngine_v60he::convertSavePath(const byte *src) { - debug(2, "convertSavePath in: '%s'", (char *)src); + debug(2, "convertSavePath in: '%s'", (const char *)src); Common::String filePath = convertFilePath(src); @@ -174,17 +174,17 @@ Common::String ScummEngine_v60he::convertSavePathOld(const byte *src) { if (src[0] == 'u' && src[1] == 's') { // Save Game Path (Moonbase Commander) // The default save path is 'user/' - return (char *)src + 5; + return (const char *)src + 5; } else if (src[0] == '*' && (src[1] == '\\' || src[1] == ':')) { // Save Game Path (HE72 - HE100) // The default save game path is set to '*\\' by ScummVM for Windows // and '*:' for Macintosh - return (char *)src + 2; + return (const char *)src + 2; } else if (src[0] == 'c' && src[1] == ':') { // The default save path is game path (DOS) or 'c:\\hegames\\' (Windows) for (int i = srcSize; i > 0; i--) if (src[i] == '\\') - return (char *)src + i + 1; + return (const char *)src + i + 1; } // Can't reach here @@ -256,7 +256,7 @@ Common::WriteStream *ScummEngine_v60he::openSaveFileForAppending(const byte *fil if (!output) { delete[] initialData; - return false; + return nullptr; } if (initialData) { |