aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/fontresource.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-08-21 08:20:32 +0000
committerEugene Sandulenko2010-10-12 23:09:12 +0000
commit1d16dfd281b30627ce0ade7c6c2de0cb7e4cc985 (patch)
treeaebed8218d896782eedf28f4d9f53d6e656812dc /engines/sword25/gfx/fontresource.h
parent018698467143fb2d91c4688db032a883bac8db5c (diff)
downloadscummvm-rg350-1d16dfd281b30627ce0ade7c6c2de0cb7e4cc985.tar.gz
scummvm-rg350-1d16dfd281b30627ce0ade7c6c2de0cb7e4cc985.tar.bz2
scummvm-rg350-1d16dfd281b30627ce0ade7c6c2de0cb7e4cc985.zip
SWORD25: Refactored engine to remove BS_Rect class
svn-id: r53265
Diffstat (limited to 'engines/sword25/gfx/fontresource.h')
-rw-r--r--engines/sword25/gfx/fontresource.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/gfx/fontresource.h b/engines/sword25/gfx/fontresource.h
index 3888927f9c..786405fe11 100644
--- a/engines/sword25/gfx/fontresource.h
+++ b/engines/sword25/gfx/fontresource.h
@@ -41,7 +41,7 @@
#include "sword25/kernel/common.h"
#include "sword25/kernel/resource.h"
-#include "sword25/math/rect.h"
+#include "common/rect.h"
class TiXmlDocument;
class TiXmlElement;
@@ -100,7 +100,7 @@ public:
@param Character der ASCII-Code des Zeichens
@return Das Bounding-Rect des übergebenen Zeichens auf der Charactermap.
*/
- const BS_Rect &GetCharacterRect(int Character) const {
+ const Common::Rect &GetCharacterRect(int Character) const {
BS_ASSERT(Character >= 0 && Character < 256);
return _CharacterRects[Character];
}
@@ -118,7 +118,7 @@ private:
Common::String _BitmapFileName;
int _LineHeight;
int _GapWidth;
- BS_Rect _CharacterRects[256];
+ Common::Rect _CharacterRects[256];
// -----------------------------------------------------------------------------
// Hilfsmethoden
@@ -126,7 +126,7 @@ private:
bool _ParseXMLDocument(const Common::String &FileName, TiXmlDocument &Doc) const;
bool _ParseFontTag(TiXmlElement &Tag, Common::String &BitmapFileName, int &LineHeight, int &GapWidth) const;
- bool _ParseCharacterTag(TiXmlElement &Tag, int &Code, BS_Rect &Rect) const;
+ bool _ParseCharacterTag(TiXmlElement &Tag, int &Code, Common::Rect &Rect) const;
};
} // End of namespace Sword25