aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/font.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2014-11-09 12:54:41 +0100
committerMartin Kiewitz2014-11-09 12:54:41 +0100
commit72e6a9eeab1082892e5d77fabc4f0b50f839615a (patch)
tree4c638a64e8db06d494fe0ba72aa4ccafe3dc7f54 /engines/sci/graphics/font.cpp
parent3472d95f4546fd1c1212e0f9ef85deaefa23e689 (diff)
downloadscummvm-rg350-72e6a9eeab1082892e5d77fabc4f0b50f839615a.tar.gz
scummvm-rg350-72e6a9eeab1082892e5d77fabc4f0b50f839615a.tar.bz2
scummvm-rg350-72e6a9eeab1082892e5d77fabc4f0b50f839615a.zip
SCI: some more work on 480x300 mac support
Diffstat (limited to 'engines/sci/graphics/font.cpp')
-rw-r--r--engines/sci/graphics/font.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/font.cpp b/engines/sci/graphics/font.cpp
index e4684ff134..2268ec0459 100644
--- a/engines/sci/graphics/font.cpp
+++ b/engines/sci/graphics/font.cpp
@@ -48,8 +48,8 @@ GfxFontFromResource::GfxFontFromResource(ResourceManager *resMan, GfxScreen *scr
// filling info for every char
for (int16 i = 0; i < _numChars; i++) {
_chars[i].offset = READ_SCI32ENDIAN_UINT16(_resourceData + 6 + i * 2);
- _chars[i].w = _resourceData[_chars[i].offset];
- _chars[i].h = _resourceData[_chars[i].offset + 1];
+ _chars[i].width = _resourceData[_chars[i].offset];
+ _chars[i].height = _resourceData[_chars[i].offset + 1];
}
}
@@ -66,10 +66,10 @@ byte GfxFontFromResource::getHeight() {
return _fontHeight;
}
byte GfxFontFromResource::getCharWidth(uint16 chr) {
- return chr < _numChars ? _chars[chr].w : 0;
+ return chr < _numChars ? _chars[chr].width : 0;
}
byte GfxFontFromResource::getCharHeight(uint16 chr) {
- return chr < _numChars ? _chars[chr].h : 0;
+ return chr < _numChars ? _chars[chr].height : 0;
}
byte *GfxFontFromResource::getCharData(uint16 chr) {
return chr < _numChars ? _resourceData + _chars[chr].offset + 2 : 0;