[Scummvm-cvs-logs] SF.net SVN: scummvm:[48711] scummvm/trunk/engines/sci/graphics/text16.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Apr 19 11:46:27 CEST 2010


Revision: 48711
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48711&view=rev
Author:   fingolfin
Date:     2010-04-19 09:46:27 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
SCI: Fix yet another (new) const correctness violation.

I would suggest rewriting all of text16.cpp to use
byte* instead of char*, then all this casting around
(which introduces the const correctness violations)
would not be necessary in the first place.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/text16.cpp

Modified: scummvm/trunk/engines/sci/graphics/text16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-19 09:43:16 UTC (rev 48710)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-19 09:46:27 UTC (rev 48711)
@@ -180,7 +180,7 @@
 
 		case 0xD:
 			// Check, if 0xA is following, if so include it as well
-			if ((*(unsigned char *)text) == 0xA)
+			if ((*(const unsigned char *)text) == 0xA)
 				curCharCount++;
 		case 0xA:
 			curCharCount++;


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