aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMax Horn2010-04-17 23:54:06 +0000
committerMax Horn2010-04-17 23:54:06 +0000
commitb29b379894ac09f637218a6bb3f2ecea56a20379 (patch)
tree1f7dcb11b1d122b11790cc3abff3b6a2b09c4e12 /engines/sci
parentbb26c040530f4ea212e17716702963a88165a3b0 (diff)
downloadscummvm-rg350-b29b379894ac09f637218a6bb3f2ecea56a20379.tar.gz
scummvm-rg350-b29b379894ac09f637218a6bb3f2ecea56a20379.tar.bz2
scummvm-rg350-b29b379894ac09f637218a6bb3f2ecea56a20379.zip
More const correctness fixes
svn-id: r48695
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/text16.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index efbfbde666..cce34ae6b2 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -164,9 +164,9 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF
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 @@ void GfxText16::Width(const char *text, int16 from, int16 len, GuiResourceId org
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 @@ void GfxText16::Draw(const char *text, int16 from, int16 len, GuiResourceId orgF
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) {