diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /engines/sky | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/detection.cpp | 8 | ||||
| -rw-r--r-- | engines/sky/logic.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/sky.h | 2 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 21921f2154..f3cce06ad6 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -79,7 +79,7 @@ public: }; const char *SkyMetaEngine::getName() const { - return "Beneath a Steel Sky"; + return "Sky"; } const char *SkyMetaEngine::getOriginalCopyright() const { @@ -151,9 +151,7 @@ GameList SkyMetaEngine::detectGames(const Common::FSList &fslist) const { while (sv->dinnerTableEntries) { if (dinnerTableEntries == sv->dinnerTableEntries && (sv->dataDiskSize == dataDiskSize || sv->dataDiskSize == -1)) { - char buf[32]; - snprintf(buf, sizeof(buf), "v0.0%d %s", sv->version, sv->extraDesc); - dg.updateDesc(buf); + dg.updateDesc(Common::String::format("v0.0%d %s", sv->version, sv->extraDesc).c_str()); dg.setGUIOptions(sv->guioptions); break; } @@ -282,7 +280,7 @@ Common::Error SkyEngine::loadGameState(int slot) { return (result == GAME_RESTORED) ? Common::kNoError : Common::kUnknownError; } -Common::Error SkyEngine::saveGameState(int slot, const char *desc) { +Common::Error SkyEngine::saveGameState(int slot, const Common::String &desc) { if (slot == 0) return Common::kWritePermissionDenied; // we can't overwrite the auto save diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index de081bb631..616670b0fd 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -1890,7 +1890,7 @@ bool Logic::fnCheckRequest(uint32 a, uint32 b, uint32 c) { } bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) { - /// initialise the top menu bar + /// initialize the top menu bar // firstObject is o0 for game menu, k0 for linc uint i; @@ -1939,7 +1939,7 @@ bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) { else if (menuLength < _scriptVariables[SCROLL_OFFSET] + 11) _scriptVariables[SCROLL_OFFSET] = menuLength - 11; - // (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN + // (6) AND FINALLY, INITIALIZE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN uint16 rollingX = TOP_LEFT_X + 28; for (i = 0; i < 11; i++) { diff --git a/engines/sky/sky.h b/engines/sky/sky.h index 0b5f4c5c1c..cd8a650d60 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -87,7 +87,7 @@ public: static bool isCDVersion(); Common::Error loadGameState(int slot); - Common::Error saveGameState(int slot, const char *desc); + Common::Error saveGameState(int slot, const Common::String &desc); bool canLoadGameStateCurrently(); bool canSaveGameStateCurrently(); diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index c6bcb2a4c4..e94a2a61d9 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -313,7 +313,7 @@ static const Sfx fx_hello_helga = { } }; -static const Sfx fx_statue_on_armour = { +static const Sfx fx_statue_on_armor = { 8, 0, { @@ -985,7 +985,7 @@ static const Sfx *musicList[] = { &fx_null, // 365 &fx_break_crystals, // 366 &fx_disintegrate, // 367 - &fx_statue_on_armour, // 368 + &fx_statue_on_armor, // 368 &fx_null, // 369 &fx_null, // 360 &fx_ping, // 371 |