[Scummvm-cvs-logs] scummvm master -> 9d693b9a793f1d14d9b80a0341ac55dfc2da0b0b
m-kiewitz
m_kiewitz at users.sourceforge.net
Sun Nov 2 02:31:27 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9d693b9a79 SCI: fix another bug in text16 / GetLongest()
Commit: 9d693b9a793f1d14d9b80a0341ac55dfc2da0b0b
https://github.com/scummvm/scummvm/commit/9d693b9a793f1d14d9b80a0341ac55dfc2da0b0b
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-11-02T02:31:32+01:00
Commit Message:
SCI: fix another bug in text16 / GetLongest()
Changed paths:
engines/sci/graphics/text16.cpp
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 37d786a..4f9b6c7 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -177,7 +177,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
while (1) {
curChar = (*(const byte *)textPtr);
if (_font->isDoubleByte(curChar)) {
- curChar |= (*(const byte *)textPtr + 1) << 8;
+ curChar |= (*(const byte *)(textPtr + 1)) << 8;
}
switch (curChar) {
case 0x7C:
@@ -196,7 +196,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
// Sierra did it the same way.
case 0xD:
// Check, if 0xA is following, if so include it as well
- if ((*(const byte *)textPtr + 1) == 0xA) {
+ if ((*(const byte *)(textPtr + 1)) == 0xA) {
curCharCount++; textPtr++;
}
// it's meant to pass through here
@@ -255,7 +255,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
curChar = (*(const byte *)textPtr);
if (!_font->isDoubleByte(curChar))
error("Non double byte while seeking back");
- curChar |= (*(const byte *)textPtr + 1) << 8;
+ curChar |= (*(const byte *)(textPtr + 1)) << 8;
}
// But it also checked, if the current character is not inside a punctuation table and it even
@@ -282,7 +282,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
curChar = (*(const byte *)textPtr);
if (!_font->isDoubleByte(curChar))
error("Non double byte while seeking back");
- curChar |= (*(const byte *)textPtr + 1) << 8;
+ curChar |= (*(const byte *)(textPtr + 1)) << 8;
}
// include the current character
curCharCount += 2; textPtr += 2;
More information about the Scummvm-git-logs
mailing list