diff options
| author | Max Horn | 2009-04-28 12:32:59 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-28 12:32:59 +0000 |
| commit | e6a7b8ef343f7e4fd2637500afe800794fe03a78 (patch) | |
| tree | dbecdd69cdd7c5a391f9027f83c27bb978f01d44 /engines/sci/gfx/font.h | |
| parent | 9108871833313f88b2f10aa5c5998fa3fb23e008 (diff) | |
| download | scummvm-rg350-e6a7b8ef343f7e4fd2637500afe800794fe03a78.tar.gz scummvm-rg350-e6a7b8ef343f7e4fd2637500afe800794fe03a78.tar.bz2 scummvm-rg350-e6a7b8ef343f7e4fd2637500afe800794fe03a78.zip | |
SCI: Renamed text_fragment_t -> TextFragment and changed TextHandle to store the text fragments and pixmaps in Common::Arrays
svn-id: r40178
Diffstat (limited to 'engines/sci/gfx/font.h')
| -rw-r--r-- | engines/sci/gfx/font.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/sci/gfx/font.h b/engines/sci/gfx/font.h index 8bd5f6b33a..935414f550 100644 --- a/engines/sci/gfx/font.h +++ b/engines/sci/gfx/font.h @@ -31,9 +31,12 @@ namespace Sci { -struct text_fragment_t { +struct TextFragment { const char *offset; int length; + + TextFragment() : offset(0), length(0) {} + TextFragment(const char *o) : offset(o), length(0) {} }; @@ -86,8 +89,9 @@ void gfxr_free_font(gfx_bitmap_font_t *font); ** Returns : (void) */ -text_fragment_t *gfxr_font_calculate_size(gfx_bitmap_font_t *font, int max_width, const char *text, - int *width, int *height, int *lines, int *line_height, int *last_offset, int flags); +bool gfxr_font_calculate_size(Common::Array<TextFragment> &fragments, + gfx_bitmap_font_t *font, int max_width, const char *text, + int *width, int *height, int *line_height, int *last_offset, int flags); /* Calculates the size that would be occupied by drawing a specified text ** Parameters: (gfx_bitmap_font_t *) font: The font to calculate with ** (int) max_width: Maximum pixel width allowed for the output @@ -98,7 +102,6 @@ text_fragment_t *gfxr_font_calculate_size(gfx_bitmap_font_t *font, int max_width ** segment ** (int) *width: The resulting width ** (int) *height: The resulting height -** (int) *lines: Number of lines used ** (int) *line_height: Pixel height of a single line of text ** (int) *last_offset: Pixel offset after the last drawn line ** This function assumes 320x200 mode. |