[Scummvm-cvs-logs] SF.net SVN: scummvm: [29839] scummvm/trunk/engines/cine/various.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Wed Dec 12 22:56:22 CET 2007


Revision: 29839
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29839&view=rev
Author:   eriktorbjorn
Date:     2007-12-12 13:56:22 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
Fixed warning about casting away constness.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/various.cpp

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2007-12-12 21:39:00 UTC (rev 29838)
+++ scummvm/trunk/engines/cine/various.cpp	2007-12-12 21:56:22 UTC (rev 29839)
@@ -1961,7 +1961,7 @@
 	}
 }
 
-void drawMessage(char *messagePtr, int16 x, int16 y, int16 width, int16 color) {
+void drawMessage(const char *messagePtr, int16 x, int16 y, int16 width, int16 color) {
 	byte color2 = 2;
 	byte endOfMessageReached = 0;
 	int16 localX;
@@ -2052,7 +2052,7 @@
 }
 
 void drawDialogueMessage(byte msgIdx, int16 x, int16 y, int16 width, int16 color) {
-	char *messagePtr = (char *)messageTable[msgIdx].ptr;
+	const char *messagePtr = (const char *)messageTable[msgIdx].ptr;
 
 	if (!messagePtr) {
 		freeOverlay(msgIdx, 2);
@@ -2069,7 +2069,7 @@
 void drawFailureMessage(byte cmd) {
 	byte msgIdx = cmd * 4 + g_cine->_rnd.getRandomNumber(3);
 
-	char *messagePtr = (char *)failureMessages[msgIdx];
+	const char *messagePtr = failureMessages[msgIdx];
 	int len = strlen(messagePtr);
 
 	var20 += len;


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




More information about the Scummvm-git-logs mailing list