aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2009-07-27 16:04:35 +0000
committerWillem Jan Palenstijn2009-07-27 16:04:35 +0000
commited763cccfe57774b803e0ae32606d7ec677b297b (patch)
treec773a4dca51265e5f7684b08a771c9ff53f84f07
parent6d18ada7ef3df70f59430a6b3466bb76672832f1 (diff)
downloadscummvm-rg350-ed763cccfe57774b803e0ae32606d7ec677b297b.tar.gz
scummvm-rg350-ed763cccfe57774b803e0ae32606d7ec677b297b.tar.bz2
scummvm-rg350-ed763cccfe57774b803e0ae32606d7ec677b297b.zip
Fix format string issues (and compiler warnings).
Patch by salty-horse. svn-id: r42842
-rw-r--r--engines/kyra/gui.cpp10
-rw-r--r--engines/scumm/resource.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 85d974f675..d9924d233b 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -538,18 +538,18 @@ int MainMenu::handle(int dim) {
int item = (mouse.y - menuRect.top) / fh;
if (item != selected) {
- printString(_static.strings[selected], textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5);
- printString(_static.strings[item], textPos, menuRect.top + item * fh, _static.menuTable[6], 0, 5);
+ printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
+ printString("%s", textPos, menuRect.top + item * fh, _static.menuTable[6], 0, 5, _static.strings[item]);
selected = item;
}
if (mousePressed) {
for (int i = 0; i < 3; i++) {
- printString(_static.strings[selected], textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5);
+ printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
_screen->updateScreen();
_system->delayMillis(50);
- printString(_static.strings[selected], textPos, menuRect.top + selected * fh, _static.menuTable[6], 0, 5);
+ printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[6], 0, 5, _static.strings[selected]);
_screen->updateScreen();
_system->delayMillis(50);
}
@@ -577,7 +577,7 @@ void MainMenu::draw(int select) {
for (int i = 0; i < _static.menuTable[3]; ++i) {
int curY = top + i * _screen->getFontHeight();
int color = (i == select) ? _static.menuTable[6] : _static.menuTable[5];
- printString(_static.strings[i], ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3, curY, color, 0, 5);
+ printString("%s", ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3, curY, color, 0, 5, _static.strings[i]);
}
}
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index d7ee0a74aa..67baff97b3 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -229,7 +229,7 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, _gameDataDir.getPath().c_str());
#endif
- result = displayMessage("Quit", buf);
+ result = displayMessage("Quit", "%s", buf);
if (!result) {
error("Cannot find file: '%s'", filename);
}