aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush/smush_font.h
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/smush/smush_font.h')
-rw-r--r--scumm/smush/smush_font.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/scumm/smush/smush_font.h b/scumm/smush/smush_font.h
index d30d8c525c..c410b0405e 100644
--- a/scumm/smush/smush_font.h
+++ b/scumm/smush/smush_font.h
@@ -25,26 +25,18 @@
#include "common/scummsys.h"
class SmushFont {
-private:
-
+protected:
int _nbChars;
int16 _color;
bool _new_colors;
bool _original;
- byte *_dataSrc;
struct {
int width;
int height;
- byte *chr;
+ byte *src;
} _chars[256];
-public:
-
- SmushFont(bool use_original_colors, bool new_colors);
- ~SmushFont();
-
-protected:
int getCharWidth(byte c);
int getStringWidth(const char *str);
@@ -53,9 +45,11 @@ protected:
int draw2byte(byte *buffer, int dst_width, int x, int y, int idx);
int drawChar(byte *buffer, int dst_width, int x, int y, byte chr);
void drawSubstring(const char *str, byte *buffer, int dst_width, int x, int y);
- void decodeCodec(byte *dst, const byte *src, int length);
+ void decodeCodec44(byte *dst, const byte *src, int length);
public:
+ SmushFont(bool use_original_colors, bool new_colors);
+ ~SmushFont();
bool loadFont(const char *filename, const char *directory);
void setColor(byte c) { _color = c; }