aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2016-03-09 22:42:45 +0100
committerJohannes Schickel2016-03-09 22:42:45 +0100
commit14c8bdafe5ce73df57662221316345ed443a6323 (patch)
treebba14dd7566a5cc724d9ca316f5e3d563ef65219
parent66a74cf3f3767604ccdbf4c18c87cbe22cf4f6be (diff)
parent305e34a718a0e433e859d1a35e654747deb3fad7 (diff)
downloadscummvm-rg350-14c8bdafe5ce73df57662221316345ed443a6323.tar.gz
scummvm-rg350-14c8bdafe5ce73df57662221316345ed443a6323.tar.bz2
scummvm-rg350-14c8bdafe5ce73df57662221316345ed443a6323.zip
Merge pull request #702 from ckorn/ftbfs2
SHERLOCK: Add format to fix compile error
-rw-r--r--engines/sherlock/tattoo/tattoo_darts.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp
index fe707a8c13..0a815af39e 100644
--- a/engines/sherlock/tattoo/tattoo_darts.cpp
+++ b/engines/sherlock/tattoo/tattoo_darts.cpp
@@ -178,7 +178,7 @@ void Darts::playDarts(GameType gameType) {
scoredPoints = Common::String::format(FIXED(DartsScoredPoints), lastDart);
}
- screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, scoredPoints.c_str());
+ screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, "%s", scoredPoints.c_str());
} else {
Common::String hitText;
@@ -213,7 +213,7 @@ void Darts::playDarts(GameType gameType) {
break;
}
}
- screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, hitText.c_str());
+ screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, "%s", hitText.c_str());
}
if (score != 0 && playerNum == 0 && !gameOver)
@@ -417,12 +417,12 @@ void Darts::showStatus(int playerNum) {
// "Round: x"
Common::String dartsRoundStatus = Common::String::format(FIXED(DartsCurrentRound), _roundNum);
- screen.print(Common::Point(STATUS_INFO_X, temp), 0, dartsRoundStatus.c_str());
+ screen.print(Common::Point(STATUS_INFO_X, temp), 0, "%s", dartsRoundStatus.c_str());
if (_gameType == GAME_301) {
// "Turn Total: x"
Common::String dartsTotalPoints = Common::String::format(FIXED(DartsCurrentTotalPoints), _roundScore);
- screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 75), 0, dartsTotalPoints.c_str());
+ screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 75), 0, "%s", dartsTotalPoints.c_str());
} else {
// Show cricket scores
for (int x = 0; x < 7; ++x) {
@@ -935,7 +935,7 @@ int Darts::throwDart(int dartNum, int computer) {
// "Dart # x"
Common::String currentDart = Common::String::format(FIXED(DartsCurrentDart), dartNum);
- screen.print(Common::Point(_dartInfo.left, _dartInfo.top), 0, currentDart.c_str());
+ screen.print(Common::Point(_dartInfo.left, _dartInfo.top), 0, "%s", currentDart.c_str());
drawDartsLeft(dartNum, computer);