diff options
author | Arnaud Boutonné | 2010-11-07 00:02:48 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2010-11-07 00:02:48 +0000 |
commit | a4cd83061eae135f17eefe15ee023817ec734250 (patch) | |
tree | 1d9b743baabf171c48e7b0fec46c1064c60f20bd /engines/hugo/display.h | |
parent | f5d2695800473fa44500dc3fdaa92f9fcff844b9 (diff) | |
download | scummvm-rg350-a4cd83061eae135f17eefe15ee023817ec734250.tar.gz scummvm-rg350-a4cd83061eae135f17eefe15ee023817ec734250.tar.bz2 scummvm-rg350-a4cd83061eae135f17eefe15ee023817ec734250.zip |
HUGO: Move fonts to display.cpp
Some cleanup
svn-id: r54103
Diffstat (limited to 'engines/hugo/display.h')
-rw-r--r-- | engines/hugo/display.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/hugo/display.h b/engines/hugo/display.h index 333f9a25df..ec9f29f016 100644 --- a/engines/hugo/display.h +++ b/engines/hugo/display.h @@ -50,6 +50,7 @@ public: virtual ~Screen(); virtual void loadFont(int16 fontId) = 0; + virtual void loadFontArr(Common::File &in) = 0; int16 fontHeight(); int16 stringLength(const char *s); @@ -61,6 +62,7 @@ public: void drawRectangle(bool filledFl, uint16 x1, uint16 y1, uint16 x2, uint16 y2, int color); void drawShape(int x, int y, int color1, int color2); void drawStatusText(); + void freeFonts(); void freePalette(); void initDisplay(); void initNewScreenDisplay(); @@ -98,14 +100,18 @@ public: protected: HugoEngine *_vm; + bool fontLoadedFl[NUM_FONTS]; + // Fonts used in dib (non-GDI) + byte *_arrayFont[NUM_FONTS]; byte _fnt; // Current font number byte _fontdata[NUM_FONTS][FONTSIZE]; // Font data byte *_font[NUM_FONTS][FONT_LEN]; // Ptrs to each char byte *_palette; - byte _paletteSize; + int16 _arrayFontSize[NUM_FONTS]; + private: viewdib_t _frontBuffer; viewdib_t _backBuffer; @@ -126,6 +132,7 @@ public: ~Screen_v1d(); void loadFont(int16 fontId); + void loadFontArr(Common::File &in); }; class Screen_v1w : public Screen { @@ -134,6 +141,7 @@ public: ~Screen_v1w(); void loadFont(int16 fontId); + void loadFontArr(Common::File &in); }; } // End of namespace Hugo |