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

[fingolfin at users.sourceforge.net]

Revision: 48695
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48695&view=rev
Author:   fingolfin
Date:     2010-04-17 23:54:06 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
More const correctness fixes

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-17 23:19:52 UTC (rev 48694)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-17 23:54:06 UTC (rev 48695)
@@ -164,9 +164,9 @@
 		return 0;
 
 	while (width <= maxWidth) {
-		curChar = (*(unsigned char *)text++);
+		curChar = (*(const byte *)text++);
 		if (_font->isDoubleByte(curChar)) {
-			curChar |= (*(unsigned char *)text++) << 8;
+			curChar |= (*(const byte *)text++) << 8;
 			curCharCount++;
 		}
 		switch (curChar) {
@@ -217,9 +217,9 @@
 	if (_font) {
 		text += from;
 		while (len--) {
-			curChar = (*(unsigned char *)text++);
+			curChar = (*(const byte *)text++);
 			if (_font->isDoubleByte(curChar)) {
-				curChar |= (*(unsigned char *)text++) << 8;
+				curChar |= (*(const byte *)text++) << 8;
 				len--;
 			}
 			switch (curChar) {
@@ -304,9 +304,9 @@
 	rect.bottom = rect.top + _ports->_curPort->fontHeight;
 	text += from;
 	while (len--) {
-		curChar = (*(unsigned char *)text++);
+		curChar = (*(const byte *)text++);
 		if (_font->isDoubleByte(curChar)) {
-			curChar |= (*(unsigned char *)text++) << 8;
+			curChar |= (*(const byte *)text++) << 8;
 			len--;
 		}
 		switch (curChar) {


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