[Scummvm-cvs-logs] SF.net SVN: scummvm:[53093] scummvm/trunk/engines/toon

[sylvaintv at users.sourceforge.net]

Revision: 53093
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53093&view=rev
Author:   sylvaintv
Date:     2010-10-09 00:29:10 +0000 (Sat, 09 Oct 2010)

Log Message:
-----------
TOON: String fixes for motoezx build

Modified Paths:
--------------
    scummvm/trunk/engines/toon/font.cpp
    scummvm/trunk/engines/toon/toon.cpp

Modified: scummvm/trunk/engines/toon/font.cpp
===================================================================
--- scummvm/trunk/engines/toon/font.cpp	2010-10-09 00:26:58 UTC (rev 53092)
+++ scummvm/trunk/engines/toon/font.cpp	2010-10-09 00:29:10 UTC (rev 53093)
@@ -67,7 +67,7 @@
 	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 @@
 	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) {

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-10-09 00:26:58 UTC (rev 53092)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-10-09 00:29:10 UTC (rev 53093)
@@ -183,13 +183,13 @@
 						// 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 @@
 						// 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();
 					}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.