X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=9b415514f44f185c3a147580f4721d0470cc1b77;hb=5cca794c5b6549b7750c88b5c2217d659fa963dd;hp=94d451ae7a9f7d272cc706599c9ce4b5b774849d;hpb=9648fd7d258ae1a2baccb8dd5b6f7a9491e55803;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 94d451a..9b41551 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -1,19 +1,13 @@
-/*
- * Font.cpp
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #include "Font.h"
 
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 #include <cmath>
+#include <cstring>
 #include <iostream>
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
@@ -21,6 +15,35 @@ using std::pow;
 
 namespace graphics {
 
+int Font::StringWidth(const char *s) const {
+	int width(0), col(0);
+	for (int i(0); s[i]; ++i) {
+		if (s[i] == '\n') {
+			if (width < col) {
+				width = col;
+			}
+			col = 0;
+		} else {
+			++col;
+		}
+	}
+	return (width < col ? col : width) * CharWidth();
+}
+
+int Font::StringHeight(const char *s) const {
+	if (*s == '\0') {
+		return 0;
+	}
+	int height(1);
+	for (; *s; ++s) {
+		if (*s == '\n') {
+			++height;
+		}
+	}
+	return height * CharHeight();
+}
+
+
 void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) const {
 	if (!sprite) return;
 
@@ -54,8 +77,12 @@ void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &
 	if (!sprite) return;
 
 	int length(0);
-	while (length < maxWidth && s[length] != '\0') {
-		++length;
+	if (maxWidth > 0) {
+		while (length < maxWidth && s[length] != '\0') {
+			++length;
+		}
+	} else {
+		length = std::strlen(s);
 	}
 	Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
 
@@ -102,7 +129,16 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positi
 void Font::DrawNumberRight(int number, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
 	if (!sprite) return;
 
-	Vector<int> position(positionIn.X() - digits * CharWidth(), positionIn.Y());
+	Vector<int> position(positionIn);
+	if (digits > 0) {
+		position.X() -= digits * CharWidth();
+	} else if (number == 0) {
+		position.X() -= CharWidth();
+	} else {
+		for (int i = number; i > 0; i /= 10) {
+			position.X() -= CharWidth();
+		}
+	}
 
 	DrawNumber(number, dest, position, digits);
 }