diff options
| author | Filippos Karapetis | 2009-10-25 02:36:51 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-25 02:36:51 +0000 |
| commit | 452ae8a5769142a934676b7fdc721910e12aaf5e (patch) | |
| tree | f1fe820946807350c94bba4a9a061c380b0a7755 /engines/sci/gui32 | |
| parent | 9b6f2be526f8fee3c2451d2f180f70ee4e976f4e (diff) | |
| download | scummvm-rg350-452ae8a5769142a934676b7fdc721910e12aaf5e.tar.gz scummvm-rg350-452ae8a5769142a934676b7fdc721910e12aaf5e.tar.bz2 scummvm-rg350-452ae8a5769142a934676b7fdc721910e12aaf5e.zip | |
Cleanup
svn-id: r45366
Diffstat (limited to 'engines/sci/gui32')
| -rw-r--r-- | engines/sci/gui32/font.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/gui32/font.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/gui32/font.cpp b/engines/sci/gui32/font.cpp index 5fd30b92aa..6fe4b7508b 100644 --- a/engines/sci/gui32/font.cpp +++ b/engines/sci/gui32/font.cpp @@ -114,8 +114,7 @@ bool gfxr_font_calculate_size(Common::Array<TextFragment> &fragments, gfx_bitmap fragments.push_back(TextFragment(text)); localmaxwidth = localmaxwidth - last_breakpoint; - if (!(flags & kFontCountWhitespace)) - localmaxwidth -= last_break_width; + localmaxwidth -= last_break_width; last_breakpoint = localmaxwidth = 0; } else if (*text == ' ') { diff --git a/engines/sci/gui32/font.h b/engines/sci/gui32/font.h index b24d50fb05..d7b92db029 100644 --- a/engines/sci/gui32/font.h +++ b/engines/sci/gui32/font.h @@ -78,9 +78,8 @@ struct gfx_bitmap_font_t { * SCI0, SCI01 and SCI1 all use the same font format. */ 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 + kFontNoNewlines = 1 << 0, ///< Don't treat newline characters + kFontIgnoreLF = 1 << 1 ///< Interpret CR LF sequences as a single newline, rather than two }; /** |