[Scummvm-git-logs] scummvm master -> fc8b1851974253bfc8bd5327bcc37d7ebebe696e

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fc8b185197 STARTREK: Slight cleanup


Commit: fc8b1851974253bfc8bd5327bcc37d7ebebe696e
    https://github.com/scummvm/scummvm/commit/fc8b1851974253bfc8bd5327bcc37d7ebebe696e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-12-19T01:56:08+02:00

Commit Message:
STARTREK: Slight cleanup

Changed paths:
    engines/startrek/bridge.cpp


diff --git a/engines/startrek/bridge.cpp b/engines/startrek/bridge.cpp
index f509a81320..3cc387df06 100644
--- a/engines/startrek/bridge.cpp
+++ b/engines/startrek/bridge.cpp
@@ -283,19 +283,19 @@ void StarTrekEngine::playBridgeSequence(int sequenceId) {
 }
 
 Common::String StarTrekEngine::getSpeechSampleForNumber(int number) {
-	Common::String speechTemplate = ",BRID\\B_%03d";
+	const char *speechTemplate = ",BRID\\B_%03d";
 	Common::String result;
 
 	if (number <= 19) {
 		// Speech samples 228 ("zero") - 247 ("nineteen")
-		result = Common::String::format(speechTemplate.c_str(), number + 228);
+		result = Common::String::format(speechTemplate, number + 228);
 	} else if (number >= 20 && number <= 99) {
 		// Speech samples 248 ("twenty") - 255 ("ninety")
-		result = Common::String::format(speechTemplate.c_str(), number / 10 - 2 + 248);
+		result = Common::String::format(speechTemplate, number / 10 - 2 + 248);
 		if (number % 10 > 0)
-			result += Common::String::format(speechTemplate.c_str(), number % 10 + 228);
+			result += Common::String::format(speechTemplate, number % 10 + 228);
 	} else if (number == 100) {
-		result = Common::String::format(speechTemplate.c_str(), 256);
+		result = Common::String::format(speechTemplate, 256);
 	}
 
 	return result;
@@ -329,7 +329,8 @@ void StarTrekEngine::showMissionPerformance(int score, int missionScoreTextId) {
 	Common::String speechIdPerformance = getSpeechSampleForNumber(score);
 	Common::String speechIdCommendationPoints = getSpeechSampleForNumber(commendationPoints);
 
-	Common::String missionPerformanceText = Common::String::format(_resource->getLoadedText(missionScoreTextId).c_str(),
+	Common::String missionPerformanceText = Common::String::format(
+		_resource->getLoadedText(missionScoreTextId).c_str(),
 		speechIdPerformance.c_str(),
 		speechIdCommendationPoints.c_str(),
 		score,