From d2a55b42c938ef7a3ae19ff9fd8d6d2d5a727756 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 22 May 2011 12:46:57 +0100
Subject: ENGINES: Further unify engine names

---
 engines/sky/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sky')

diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 21921f2154..6844d2eacb 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 {
-- 
cgit v1.2.3


From e18401a07c7defe7a461d2a78150748ca7833474 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 10:45:38 -0400
Subject: ALL: armour -> armor

---
 engines/sky/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sky')

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
-- 
cgit v1.2.3


From 9539017ee35ce280758f22e589aa52c3baf9aaf3 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 11:17:11 -0400
Subject: ALL: initialise -> initialize

---
 engines/sky/logic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sky')

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++) {
-- 
cgit v1.2.3


From 477d6233c3672d9a60cceea3570bc775df3d9253 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 2 Jun 2011 14:11:38 +0200
Subject: ENGINES: Change 2nd param of Engine::saveGameState to Common::String

---
 engines/sky/detection.cpp | 2 +-
 engines/sky/sky.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sky')

diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 6844d2eacb..e974f5ae3e 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -282,7 +282,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/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();
 
-- 
cgit v1.2.3


From bd58c9459dc3509dcefbe1ee7462eb5ab3954f6f Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 2 Jun 2011 21:14:58 +0100
Subject: SKY: Replace snprintf() usage with Common::String::format()

Safer and less portability issues.
---
 engines/sky/detection.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/sky')

diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index e974f5ae3e..f3cce06ad6 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -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;
 			}
-- 
cgit v1.2.3