diff options
author | Colin Snover | 2016-06-18 21:20:52 -0500 |
---|---|---|
committer | Colin Snover | 2016-06-21 08:17:28 -0500 |
commit | 820e6b8bd3783f78605f477a6f3f1548ffd8db98 (patch) | |
tree | 14bba9cf843b7c71c91b84babf2ccf7b088123be /engines/sci/graphics/text32.h | |
parent | 52505dc57f7cf244e7bc318746add0ce002b6e60 (diff) | |
download | scummvm-rg350-820e6b8bd3783f78605f477a6f3f1548ffd8db98.tar.gz scummvm-rg350-820e6b8bd3783f78605f477a6f3f1548ffd8db98.tar.bz2 scummvm-rg350-820e6b8bd3783f78605f477a6f3f1548ffd8db98.zip |
SCI32: Fixes to GfxText32
1. Inline borderSize constant in createFontBitmap for consistency
2. Fix "DrawTextBox GetLongest=0" warning to only appear in games
that actually had this check (SQ6 and MGDX)
3. "Fix" implementation of getTextSize for SCI2.1early, which
gave lines with word wrap disabled a height of 0
4. Add inlining hints to some methods in BitmapResource that were
missing them for some reason
Diffstat (limited to 'engines/sci/graphics/text32.h')
-rw-r--r-- | engines/sci/graphics/text32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h index 88cf149da7..9892740c42 100644 --- a/engines/sci/graphics/text32.h +++ b/engines/sci/graphics/text32.h @@ -133,7 +133,7 @@ public: setScaledHeight(scaledHeight); } - reg_t getObject() const { + inline reg_t getObject() const { return _object; } @@ -180,7 +180,7 @@ public: return READ_SCI11ENDIAN_UINT32(_bitmap + 20); } - void setHunkPaletteOffset(uint32 hunkPaletteOffset) { + inline void setHunkPaletteOffset(uint32 hunkPaletteOffset) { if (hunkPaletteOffset) { hunkPaletteOffset += getBitmapHeaderSize(); } |