aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/agi.h
diff options
context:
space:
mode:
authorMartin Kiewitz2016-01-29 16:18:31 +0100
committerMartin Kiewitz2016-01-29 16:18:31 +0100
commit0c2de081553c3d4a2c0ac83c1bda6c8177ad4718 (patch)
treefa560802000f30cfdb73d6460f447202fbec097d /engines/agi/agi.h
parent0f15ec2ce827d157f4459b966088ec0792ff5be8 (diff)
downloadscummvm-rg350-0c2de081553c3d4a2c0ac83c1bda6c8177ad4718.tar.gz
scummvm-rg350-0c2de081553c3d4a2c0ac83c1bda6c8177ad4718.tar.bz2
scummvm-rg350-0c2de081553c3d4a2c0ac83c1bda6c8177ad4718.zip
AGI: new font class created
moved font stuff into GfxFont class removed Mickey Mouse font data (is loaded from mickey.exe)
Diffstat (limited to 'engines/agi/agi.h')
-rw-r--r--engines/agi/agi.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index a070d5eafd..f82e6ae53a 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -592,7 +592,7 @@ public:
virtual int loadWords(const char *);
};
-
+class GfxFont;
class GfxMgr;
class SpritesMgr;
class InventoryMgr;
@@ -642,19 +642,12 @@ protected:
virtual void initialize() = 0;
void initRenderMode();
- void initFont();
-
- void loadFontMickey();
- void loadFontAmigaPseudoTopaz();
- void loadFontAppleIIgs();
-
- const uint8 *_fontData; // pointer to the currently used font
- uint8 *_fontDataAllocated;
public:
Words *_words;
- GfxMgr *_gfx;
+ GfxFont *_font;
+ GfxMgr *_gfx;
Common::RenderMode _renderMode;
volatile uint32 _clockCount;
@@ -715,7 +708,7 @@ public:
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
- const uint8 *getFontData() { return _fontData; };
+ const byte *getFontData();
void cycleInnerLoopActive(int16 loopType) {
_game.cycleInnerLoopActive = true;