aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/font.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2010-02-05 12:30:41 +0000
committerMartin Kiewitz2010-02-05 12:30:41 +0000
commit51b608d794e0ac53403a1f96f36dd642677bbf1d (patch)
tree9e7a4310a67f7d6f748beab152136bd1c53a8b46 /engines/sci/graphics/font.cpp
parent3ad4433adfd6c31b92d37d057ad677f9e971b836 (diff)
downloadscummvm-rg350-51b608d794e0ac53403a1f96f36dd642677bbf1d.tar.gz
scummvm-rg350-51b608d794e0ac53403a1f96f36dd642677bbf1d.tar.bz2
scummvm-rg350-51b608d794e0ac53403a1f96f36dd642677bbf1d.zip
SCI: renamed class Font to GfxFont
svn-id: r47900
Diffstat (limited to 'engines/sci/graphics/font.cpp')
-rw-r--r--engines/sci/graphics/font.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/font.cpp b/engines/sci/graphics/font.cpp
index c85ff9bd15..4bfe8f87dd 100644
--- a/engines/sci/graphics/font.cpp
+++ b/engines/sci/graphics/font.cpp
@@ -30,7 +30,7 @@
namespace Sci {
-Font::Font(ResourceManager *resMan, GfxScreen *screen, GuiResourceId resourceId)
+GfxFont::GfxFont(ResourceManager *resMan, GfxScreen *screen, GuiResourceId resourceId)
: _resourceId(resourceId), _screen(screen), _resMan(resMan) {
assert(resourceId != -1);
@@ -56,29 +56,29 @@ Font::Font(ResourceManager *resMan, GfxScreen *screen, GuiResourceId resourceId)
}
}
-Font::~Font() {
+GfxFont::~GfxFont() {
delete []_chars;
_resMan->unlockResource(_resource);
}
-GuiResourceId Font::getResourceId() {
+GuiResourceId GfxFont::getResourceId() {
return _resourceId;
}
-byte Font::getHeight() {
+byte GfxFont::getHeight() {
return _fontHeight;
}
-byte Font::getCharWidth(byte chr) {
+byte GfxFont::getCharWidth(byte chr) {
return chr < _numChars ? _chars[chr].w : 0;
}
-byte Font::getCharHeight(byte chr) {
+byte GfxFont::getCharHeight(byte chr) {
return chr < _numChars ? _chars[chr].h : 0;
}
-byte *Font::getCharData(byte chr) {
+byte *GfxFont::getCharData(byte chr) {
return chr < _numChars ? _resourceData + _chars[chr].offset + 2 : 0;
}
-void Font::draw(int16 chr, int16 top, int16 left, byte color, bool greyedOutput) {
+void GfxFont::draw(int16 chr, int16 top, int16 left, byte color, bool greyedOutput) {
int charWidth = MIN<int>(getCharWidth(chr), _screen->getWidth() - left);
int charHeight = MIN<int>(getCharHeight(chr), _screen->getHeight() - top);
byte b = 0, mask = 0xFF;