thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KYRA: silence some compiler warnings

Browse source
This commit is contained in:
athrxx 2019-03-20 22:03:04 +01:00
parent 1cfa6c087a
commit 864cdd85f4
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/kyra/detection.cpp
View file

@ -245,7 +245,7 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
if (Common::parseRenderMode(ConfMan.get("render_mode")) == Common::kRenderEGA) if (Common::parseRenderMode(ConfMan.get("render_mode")) == Common::kRenderEGA)
flags.useHiRes = true; flags.useHiRes = true;
if (platform == Common::kPlatformFMTowns && !flags.useHiColorMode) 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); *engine = new Kyra::DarkMoonEngine(syst, flags);
break; break;
#endif // ENABLE_EOB #endif // ENABLE_EOB

4
engines/kyra/gui/debugger.cpp
View file

@ -642,7 +642,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) {
if (s == 3 || s == 4) if (s == 3 || s == 4)
c = '/'; c = '/';
else if (s == 2 || s == 8) else if (s == 2 || s == 8)
c = (uint8)'°'; c = 176;
else if (f & 8) else if (f & 8)
c = 216; c = 216;
else if (f & 1) else if (f & 1)
@ -661,7 +661,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) {
debugPrintf("%c", c); 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; return true;
} }

3
engines/kyra/resource/staticres_eob.cpp
View file

@ -511,10 +511,11 @@ void EoBCoreEngine::initStaticResource() {
// EOB I doesn't have load and save menus, because there is only one single // 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. // 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" }, { "Cancel", "Empty Slot", "Save Game", "Load Game" },
{ "Abbr.", "Leerer Slot", "Speichern", " Laden" }, { "Abbr.", "Leerer Slot", "Speichern", " Laden" },
{ " < < ", "Posizione Vuota", "Salva", "Carica" }, { " < < ", "Posizione Vuota", "Salva", "Carica" },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };