aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Dupont2010-10-09 00:29:10 +0000
committerSylvain Dupont2010-10-09 00:29:10 +0000
commit3a0ad4c41c29b745ac3099a8a2df6a682041b4d7 (patch)
tree672f38769772150d24b604e4df9c5c4e6c4fdfba
parent2a984d1d3f2a3df03dea4a269b3b88b85b017e30 (diff)
downloadscummvm-rg350-3a0ad4c41c29b745ac3099a8a2df6a682041b4d7.tar.gz
scummvm-rg350-3a0ad4c41c29b745ac3099a8a2df6a682041b4d7.tar.bz2
scummvm-rg350-3a0ad4c41c29b745ac3099a8a2df6a682041b4d7.zip
TOON: String fixes for motoezx build
svn-id: r53093
-rw-r--r--engines/toon/font.cpp4
-rw-r--r--engines/toon/toon.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index 4cc8c2569a..e70acab706 100644
--- a/engines/toon/font.cpp
+++ b/engines/toon/font.cpp
@@ -67,7 +67,7 @@ void FontRenderer::renderText(int32 x, int32 y, Common::String origText, int32 m
int32 curY = y;
int32 height = 0;
- const byte *text = (byte *)origText.c_str();
+ const byte *text = (const byte *)origText.c_str();
while (*text) {
byte curChar = *text;
if (curChar == 13) {
@@ -93,7 +93,7 @@ void FontRenderer::computeSize(Common::String origText, int32 *retX, int32 *retY
int32 totalHeight = 0;
int32 totalWidth = 0;
- const byte *text = (byte *)origText.c_str();
+ const byte *text = (const byte *)origText.c_str();
while (*text) {
byte curChar = *text;
if (curChar < 32) {
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ca1e9e845d..747c508bd1 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -183,13 +183,13 @@ void ToonEngine::parseInput() {
// ok
char buf[256];
snprintf(buf, 256, "Saved game in slot #%d ",slotNum);
- GUI::TimedMessageDialog dialog(Common::String(buf), 1000);
+ GUI::TimedMessageDialog dialog(buf, 1000);
dialog.runModal();
}
else {
char buf[256];
snprintf(buf, 256, "Could not quick save into slot #%d", slotNum);
- GUI::MessageDialog dialog2(Common::String(buf), "OK", 0);
+ GUI::MessageDialog dialog2(buf, "OK", 0);
//warning("%s", buf);
dialog2.runModal();
@@ -204,13 +204,13 @@ void ToonEngine::parseInput() {
// ok
char buf[256];
snprintf(buf, 256, "Savegame #%d quick loaded", slotNum);
- GUI::TimedMessageDialog dialog(Common::String(buf), 1000);
+ GUI::TimedMessageDialog dialog(buf, 1000);
dialog.runModal();
}
else {
char buf[256];
snprintf(buf, 256, "Could not quick load the savegame #%d", slotNum);
- GUI::MessageDialog dialog(Common::String(buf), "OK", 0);
+ GUI::MessageDialog dialog(buf, "OK", 0);
warning("%s", buf);
dialog.runModal();
}