aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-01 10:36:26 +0200
committerEugene Sandulenko2017-08-01 10:42:22 +0200
commitb02d9a017477647de78b4ab682b870b6e93c9fe3 (patch)
tree53413f9374b90527a21d3592f8af13bd64e4cba8 /graphics
parent73c5c85210d47829d933dc8a10a7bda772569fa4 (diff)
downloadscummvm-rg350-b02d9a017477647de78b4ab682b870b6e93c9fe3.tar.gz
scummvm-rg350-b02d9a017477647de78b4ab682b870b6e93c9fe3.tar.bz2
scummvm-rg350-b02d9a017477647de78b4ab682b870b6e93c9fe3.zip
GRAPHICS: MACGUI: unk3f is not needed in MacText
Diffstat (limited to 'graphics')
-rw-r--r--graphics/macgui/mactext.cpp13
-rw-r--r--graphics/macgui/mactext.h10
2 files changed, 10 insertions, 13 deletions
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index b2ea78474a..ea02e9e8e3 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -38,9 +38,9 @@ const Font *MacFontRun::getFont() {
}
const Common::String MacFontRun::toString() {
- return Common::String::format("\001\015%c%c%c%c%c%c%c%c%c%c%c%c",
+ return Common::String::format("\001\015%c%c%c%c%c%c%c%c%c%c%c",
(fontId >> 8) & 0xff, fontId & 0xff,
- textSlant & 0xff, unk3f & 0xff,
+ textSlant & 0xff,
(fontSize >> 8) & 0xff, fontSize & 0xff,
(palinfo1 >> 8) & 0xff, palinfo1 & 0xff,
(palinfo2 >> 8) & 0xff, palinfo2 & 0xff,
@@ -119,17 +119,16 @@ void MacText::splitString(Common::String &str) {
uint16 fontId = *s++; fontId = (fontId << 8) | *s++;
byte textSlant = *s++;
- byte unk3f = *s++;
uint16 fontSize = *s++; fontSize = (fontSize << 8) | *s++;
uint16 palinfo1 = *s++; palinfo1 = (palinfo1 << 8) | *s++;
uint16 palinfo2 = *s++; palinfo2 = (palinfo2 << 8) | *s++;
uint16 palinfo3 = *s++; palinfo3 = (palinfo3 << 8) | *s++;
- debug(8, "******** splitString: fontId: %d, textSlant: %d, unk3: %d, fontSize: %d, p0: %x p1: %x p2: %x",
- fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3);
+ debug(8, "******** splitString: fontId: %d, textSlant: %d, fontSize: %d, p0: %x p1: %x p2: %x",
+ fontId, textSlant, fontSize, palinfo1, palinfo2, palinfo3);
previousFormatting = _currentFormatting;
- _currentFormatting.setValues(_wm, fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3);
+ _currentFormatting.setValues(_wm, fontId, textSlant, fontSize, palinfo1, palinfo2, palinfo3);
if (curLine == 0 && curChunk == 0 && tmp.empty())
previousFormatting = _currentFormatting;
@@ -377,7 +376,7 @@ void MacText::appendText(Common::String str, int fontId = kMacFontChicago, int f
uint oldLen = _textLines.size();
uint newLines = 1 + getNewlinesInString(str);
- MacFontRun fontRun = MacFontRun(_wm, fontId, fontSlant, 0, fontSize, 0, 0, 0);
+ MacFontRun fontRun = MacFontRun(_wm, fontId, fontSlant, fontSize, 0, 0, 0);
_str += fontRun.toString();
_str += str;
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index 1cdb0d3a12..fdb90d4ae8 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -36,7 +36,6 @@ struct MacFontRun {
uint16 fontId;
byte textSlant;
- byte unk3f;
uint16 fontSize;
uint16 palinfo1;
uint16 palinfo2;
@@ -47,22 +46,21 @@ struct MacFontRun {
MacFontRun() {
wm = nullptr;
- fontId = textSlant = unk3f = fontSize = 0;
+ fontId = textSlant = fontSize = 0;
palinfo1 = palinfo2 = palinfo3 = 0;
font = nullptr;
}
- MacFontRun(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, byte unk3f_, uint16 fontSize_,
+ MacFontRun(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, uint16 fontSize_,
uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_) {
- setValues(wm_, fontId_, textSlant_, unk3f_, fontSize_, palinfo1_, palinfo2_, palinfo3_);
+ setValues(wm_, fontId_, textSlant_, fontSize_, palinfo1_, palinfo2_, palinfo3_);
}
- void setValues(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, byte unk3f_, uint16 fontSize_,
+ void setValues(MacWindowManager *wm_, uint16 fontId_, byte textSlant_, uint16 fontSize_,
uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_) {
wm = wm_;
fontId = fontId_;
textSlant = textSlant_;
- unk3f = unk3f_;
fontSize = fontSize_;
palinfo1 = palinfo1_;
palinfo2 = palinfo2_;