aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/font.h
diff options
context:
space:
mode:
authorFilippos Karapetis2009-03-25 17:51:22 +0000
committerFilippos Karapetis2009-03-25 17:51:22 +0000
commita3a7893f163bdff7845a23c5a4f29709eaffb4a0 (patch)
treef10c2ef028a141c3c4f691c4ab2e391b02fbb264 /engines/sci/gfx/font.h
parent4723f80fe26ba0d6f4b21a9583af35fbf24aff25 (diff)
downloadscummvm-rg350-a3a7893f163bdff7845a23c5a4f29709eaffb4a0.tar.gz
scummvm-rg350-a3a7893f163bdff7845a23c5a4f29709eaffb4a0.tar.bz2
scummvm-rg350-a3a7893f163bdff7845a23c5a4f29709eaffb4a0.zip
Changed the font flag defines to an enumeration
svn-id: r39690
Diffstat (limited to 'engines/sci/gfx/font.h')
-rw-r--r--engines/sci/gfx/font.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/sci/gfx/font.h b/engines/sci/gfx/font.h
index 5e97e5bfa3..8bd5f6b33a 100644
--- a/engines/sci/gfx/font.h
+++ b/engines/sci/gfx/font.h
@@ -65,18 +65,14 @@ struct gfx_bitmap_font_t { /* gfx_bitmap_font_t: Bitmap font information */
/*******************/
/* SCI0, SCI01 and SCI1 all use the same font format. */
-
-/* SQ3 uses a somewhat different scheme for calculating text sizes: it counts
-** whitespace while calculating the text size. */
-#define GFXR_FONT_FLAG_COUNT_WHITESPACE (1<<0)
-/* Don't give newline characters special semantics */
-#define GFXR_FONT_FLAG_NO_NEWLINES (1<<1)
-/* Interpret CR LF sequences as a single newline, rather than two of them */
-#define GFXR_FONT_FLAG_EAT_TRAILING_LF (1<<2)
-
+enum fontFlags {
+ kFontCountWhitespace = 1 << 0, // In SQ3, whitespace is included in text size
+ kFontNoNewlines = 1 << 1, // Don't treat newline characters
+ kFontIgnoreLF = 1 << 2 // Interpret CR LF sequences as a single newline, rather than two
+};
gfx_bitmap_font_t *gfxr_read_font(int id, byte *resource, int size);
-/* Geneartes a bitmap font data structure from a resource
+/* Generates a bitmap font data structure from a resource
** Parameters: (int) id: Resource ID of the resulting font
** (byte *) resource: Pointer to the resource data
** (int) size: Size of the resource block