diff options
| -rw-r--r-- | base/commandLine.cpp | 11 | ||||
| -rw-r--r-- | base/engine.cpp | 6 | ||||
| -rw-r--r-- | engines/lure/strings.cpp | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 811723e35c..d6a920fec1 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -135,7 +135,7 @@ static const char HELP_STRING[] = ; #endif -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__)) static Common::String s_appName("scummvm"); #else static const char *s_appName = "scummvm"; @@ -151,7 +151,7 @@ static void usage(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__)) printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str()); #endif exit(1); @@ -584,7 +584,8 @@ static void runDetectorTest() { DetectedGameList candidates(PluginManager::instance().detectGames(files)); bool gameidDiffers = false; - for (DetectedGameList::iterator x = candidates.begin(); x != candidates.end(); ++x) { + DetectedGameList::iterator x; + for (x = candidates.begin(); x != candidates.end(); ++x) { gameidDiffers |= (scumm_stricmp(gameid.c_str(), x->gameid.c_str()) != 0); } @@ -606,7 +607,7 @@ static void runDetectorTest() { success++; } - for (DetectedGameList::iterator x = candidates.begin(); x != candidates.end(); ++x) { + for (x = candidates.begin(); x != candidates.end(); ++x) { printf(" gameid '%s', desc '%s', language '%s', platform '%s'\n", x->gameid.c_str(), x->description.c_str(), @@ -639,7 +640,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings) { printf("Features compiled in: %s\n", gScummVMFeatures); return false; } else if (command == "help") { -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined(__SYMBIAN32__)) printf(HELP_STRING, s_appName.c_str()); #else printf(HELP_STRING, s_appName); diff --git a/base/engine.cpp b/base/engine.cpp index fcf0e7f513..6db1c54a5d 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -20,7 +20,7 @@ */ #include "common/stdafx.h" -#if defined(WIN32) +#if defined(WIN32) && !defined (__SYMBIAN32__) #include <malloc.h> #endif #include "base/engine.h" @@ -101,7 +101,7 @@ void Engine::initCommonGFX(bool defaultTo1XScaler) { } void Engine::checkCD() { -#if defined (WIN32) && !defined(_WIN32_WCE) +#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) // It is a known bug under Windows that games that play CD audio cause // ScummVM to crash if the data files are read from the same CD. Check // if this appears to be the case and issue a warning. @@ -242,7 +242,7 @@ void CDECL warning(const char *s, ...) { } void checkHeap() { -#if defined(WIN32) +#if defined(WIN32) && !defined(__SYMBIAN32__) if (_heapchk() != _HEAPOK) { error("Heap is invalid!"); } diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp index 1ddc350774..9868b34e87 100644 --- a/engines/lure/strings.cpp +++ b/engines/lure/strings.cpp @@ -256,6 +256,8 @@ char StringData::readCharacter() { } error("Unknown bit sequence encountered when decoding string"); + + return 0; } void StringData::getString(uint16 stringId, char *dest, const char *hotspotName, |