From 820e6b8bd3783f78605f477a6f3f1548ffd8db98 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sat, 18 Jun 2016 21:20:52 -0500
Subject: 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
---
 engines/sci/graphics/text32.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sci/graphics/text32.h')

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();
 		}
-- 
cgit v1.2.3