X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.h;h=d435266e084d7476378996d19ce0451ca643bd29;hb=c33724dc441c5b21a4eb84aa0105c95e82a66adc;hp=6a8a5c23c11e500e73969aecb9198550d6ce0b5e;hpb=9648fd7d258ae1a2baccb8dd5b6f7a9491e55803;p=l2e.git

diff --git a/src/graphics/Font.h b/src/graphics/Font.h
index 6a8a5c2..d435266 100644
--- a/src/graphics/Font.h
+++ b/src/graphics/Font.h
@@ -1,15 +1,8 @@
-/*
- * Font.h
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_FONT_H_
 #define GRAPHICS_FONT_H_
 
 #include "Sprite.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 #include <SDL.h>
 
@@ -29,12 +22,15 @@ public:
 public:
 	int CharWidth() const { return sprite->Width(); }
 	int CharHeight() const { return sprite->Height(); }
-	void DrawChar(char c, SDL_Surface *dest, const geometry::Vector<int> &position) const;
-	void DrawString(const char *s, SDL_Surface *dest, const geometry::Vector<int> &position, int maxWidth = 0) const;
-	void DrawStringRight(const char *s, SDL_Surface *dest, const geometry::Vector<int> &position, int maxWidth = 0) const;
-	void DrawDigit(int d, SDL_Surface *dest, const geometry::Vector<int> &position) const;
-	void DrawNumber(int n, SDL_Surface *dest, const geometry::Vector<int> &position, int digits = 0) const;
-	void DrawNumberRight(int n, SDL_Surface *dest, const geometry::Vector<int> &position, int digits = 0) const;
+	int StringWidth(const char *) const;
+	int StringHeight(const char *) const;
+
+	void DrawChar(char c, SDL_Surface *dest, const math::Vector<int> &position) const;
+	void DrawString(const char *s, SDL_Surface *dest, const math::Vector<int> &position, int maxWidth = 0) const;
+	void DrawStringRight(const char *s, SDL_Surface *dest, const math::Vector<int> &position, int maxWidth = 0) const;
+	void DrawDigit(int d, SDL_Surface *dest, const math::Vector<int> &position) const;
+	void DrawNumber(int n, SDL_Surface *dest, const math::Vector<int> &position, int digits = 0) const;
+	void DrawNumberRight(int n, SDL_Surface *dest, const math::Vector<int> &position, int digits = 0) const;
 
 public:
 	void SetSprite(const Sprite *s) { sprite = s; }
@@ -53,4 +49,4 @@ private:
 
 }
 
-#endif /* GRAPHICS_FONT_H_ */
+#endif