diff options
| author | athrxx | 2019-03-20 22:03:04 +0100 |
|---|---|---|
| committer | athrxx | 2019-03-22 21:03:54 +0100 |
| commit | 864cdd85f483824e765a4b35d658ef4c2f4506df (patch) | |
| tree | 088e691b7b1bc3984770ded77f7d2b192709a9e8 | |
| parent | 1cfa6c087a88eb795dc0ae46cbeb5a578318a317 (diff) | |
| download | scummvm-rg350-864cdd85f483824e765a4b35d658ef4c2f4506df.tar.gz scummvm-rg350-864cdd85f483824e765a4b35d658ef4c2f4506df.tar.bz2 scummvm-rg350-864cdd85f483824e765a4b35d658ef4c2f4506df.zip | |
KYRA: silence some compiler warnings
| -rw-r--r-- | engines/kyra/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/gui/debugger.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/resource/staticres_eob.cpp | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index a26c52ac12..75d608d6f9 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -245,7 +245,7 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame if (Common::parseRenderMode(ConfMan.get("render_mode")) == Common::kRenderEGA) flags.useHiRes = true; if (platform == Common::kPlatformFMTowns && !flags.useHiColorMode) - error("EOB ĢI FM-TOWNS requires support of 16bit color modes which has not been activated in your ScummVM build (The 'USE_RGB_COLOR' define has not been set)."); + error("EOB II FM-TOWNS requires support of 16bit color modes which has not been activated in your ScummVM build (The 'USE_RGB_COLOR' define has not been set)."); *engine = new Kyra::DarkMoonEngine(syst, flags); break; #endif // ENABLE_EOB diff --git a/engines/kyra/gui/debugger.cpp b/engines/kyra/gui/debugger.cpp index f8fa7f8502..2003c2fbde 100644 --- a/engines/kyra/gui/debugger.cpp +++ b/engines/kyra/gui/debugger.cpp @@ -642,7 +642,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) { if (s == 3 || s == 4) c = '/'; else if (s == 2 || s == 8) - c = (uint8)'°'; + c = 176; else if (f & 8) c = 216; else if (f & 1) @@ -661,7 +661,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) { debugPrintf("%c", c); } - debugPrintf("\n\nParty Position: %c Door: %c Stairs Up/Down: %c/%c Plate: %c Hole: %c\nSwitch: %c Clickable Object: %c Illusion Wall: %c Teleporter: %c\n\n", 'X', 216, 'U', 'D', 'O', 164, '/', '°', 15, 1); + debugPrintf("\n\nParty Position: %c Door: %c Stairs Up/Down: %c/%c Plate: %c Hole: %c\nSwitch: %c Clickable Object: %c Illusion Wall: %c Teleporter: %c\n\n", 'X', 216, 'U', 'D', 'O', 164, '/', 176, 15, 1); return true; } diff --git a/engines/kyra/resource/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp index a9f9c33483..7ff439d202 100644 --- a/engines/kyra/resource/staticres_eob.cpp +++ b/engines/kyra/resource/staticres_eob.cpp @@ -511,11 +511,12 @@ void EoBCoreEngine::initStaticResource() { // EOB I doesn't have load and save menus, because there is only one single // save slot. Instead of emulating this we provide a menu similiar to EOB II. - static const char *const saveLoadStrings[4][4] = { + static const char *const saveLoadStrings[5][4] = { { "Cancel", "Empty Slot", "Save Game", "Load Game" }, { "Abbr.", "Leerer Slot", "Speichern", " Laden" }, { " < < ", "Posizione Vuota", "Salva", "Carica" }, - { 0, 0, 0, 0 } + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static const char *const errorSlotEmptyString[5] = { |