aboutsummaryrefslogtreecommitdiff
path: root/graphics/font.h
diff options
context:
space:
mode:
authorMax Horn2005-01-06 21:15:52 +0000
committerMax Horn2005-01-06 21:15:52 +0000
commitc6e0d31e76134fbdd3a1626aad9ed3e38f25afb3 (patch)
tree913925590e558d57670e21479d4853e6bb15447c /graphics/font.h
parentf3b7c27cbdeb7f1801fa5ed34d2aa0b65454b72f (diff)
downloadscummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.tar.gz
scummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.tar.bz2
scummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.zip
Added a font manager (work in progress)
svn-id: r16460
Diffstat (limited to 'graphics/font.h')
-rw-r--r--graphics/font.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/graphics/font.h b/graphics/font.h
index 73f3fd0420..4bacda5dde 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -52,9 +52,9 @@ public:
virtual int getMaxCharWidth() const = 0;
virtual int getCharWidth(byte chr) const = 0;
- virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale = false) const = 0;
+ virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, int scaleFactor = 1) const = 0;
- void drawString(const Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true, bool scale = false) const;
+ void drawString(const Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true, int scaleFactor = 1) const;
int getStringWidth(const Common::String &str) const;
};
@@ -65,11 +65,9 @@ public:
virtual int getMaxCharWidth() const { return 8; };
virtual int getCharWidth(byte chr) const;
- virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale) const;
+ virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, int scaleFactor) const;
};
-extern const ScummFont g_scummfont;
-
typedef unsigned short bitmap_t; /* bitmap image unit size*/
@@ -101,11 +99,9 @@ public:
virtual int getMaxCharWidth() const { return desc.maxwidth; };
virtual int getCharWidth(byte chr) const;
- virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale) const;
+ virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, int scaleFactor) const;
};
-extern const NewFont g_sysfont;
-
} // End of namespace Graphics
#endif