4 files changed, 12 insertions, 18 deletions

diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 75b2ca9296..f9b1c1e8b5 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -227,9 +227,9 @@ void MainMenuDialog::save() {
 		Common::String result(_saveDialog->getResultString());
 		if (result.empty()) {
 			// If the user was lazy and entered no save name, come up with a default name.
-			char buf[20];
-			snprintf(buf, 20, "Save %d", slot + 1);
-			_engine->saveGameState(slot, buf);
+			Common::String buf;
+			buf = Common::String::format("Save %d", slot + 1);
+			_engine->saveGameState(slot, buf.c_str());
 		} else {
 			_engine->saveGameState(slot, result.c_str());
 		}
diff --git a/engines/engine.cpp b/engines/engine.cpp
index b3cb8bea06..6c153310b6 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -206,12 +206,8 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
 
 	// Error out on size switch failure
 	if (gfxError & OSystem::kTransactionSizeChangeFailed) {
-		char buffer[16];
-		snprintf(buffer, 16, "%dx%d", width, height);
-
-		Common::String message = "Could not switch to resolution: '";
-		message += buffer;
-		message += "'.";
+		Common::String message;
+		message = Common::String::format("Could not switch to resolution: '%dx%d'.", width, height);
 
 		GUIErrorMessage(message);
 		error("%s", message.c_str());
diff --git a/engines/savestate.cpp b/engines/savestate.cpp
index 9ed8356d3b..551c39b880 100644
--- a/engines/savestate.cpp
+++ b/engines/savestate.cpp
@@ -52,20 +52,20 @@ void SaveStateDescriptor::setWriteProtectedFlag(bool state) {
 }
 
 void SaveStateDescriptor::setSaveDate(int year, int month, int day) {
-	char buffer[32];
-	snprintf(buffer, 32, "%.2d.%.2d.%.4d", day, month, year);
+	Common::String buffer;
+	buffer = Common::String::format("%.2d.%.2d.%.4d", day, month, year);
 	setVal("save_date", buffer);
 }
 
 void SaveStateDescriptor::setSaveTime(int hour, int min) {
-	char buffer[32];
-	snprintf(buffer, 32, "%.2d:%.2d", hour, min);
+	Common::String buffer;
+	buffer = Common::String::format("%.2d:%.2d", hour, min);
 	setVal("save_time", buffer);
 }
 
 void SaveStateDescriptor::setPlayTime(int hours, int minutes) {
-	char buffer[32];
-	snprintf(buffer, 32, "%.2d:%.2d", hours, minutes);
+	Common::String buffer;
+	buffer = Common::String::format("%.2d:%.2d", hours, minutes);
 	setVal("play_time", buffer);
 }
 
diff --git a/engines/savestate.h b/engines/savestate.h
index ce78bc4ba3..df01732058 100644
--- a/engines/savestate.h
+++ b/engines/savestate.h
@@ -49,9 +49,7 @@ public:
 	}
 
 	SaveStateDescriptor(int s, const Common::String &d) : _thumbnail() {
-		char buf[16];
-		sprintf(buf, "%d", s);
-		setVal("save_slot", buf);
+		setVal("save_slot", Common::String::format("%d", s));
 		setVal("description", d);
 	}