X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=ba5c64d4dbdcf29d79fc671464269d33bdc7cdc8;hb=0285546b22f9e8f496ca6b1abffdd232647b6b6a;hp=59059e07436d1893da0a9fc7dc73612fe5c79a92;hpb=f552d26f537af9fa48255bd71cdc1a0a1b860bac;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 59059e0..ba5c64d 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -1,10 +1,3 @@
-/*
- * Font.cpp
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #include "Font.h"
 
 #include "../loader/Interpreter.h"
@@ -21,6 +14,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;
 
@@ -29,21 +51,32 @@ void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) cons
 	sprite->Draw(dest, position, col, row);
 }
 
-void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxWidth) const {
 	if (!sprite) return;
 
 	Vector<int> position(positionIn);
+	Vector<int> lineHead(positionIn);
 	Vector<int> step(CharWidth(), 0);
-	for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) {
-		DrawChar(s[i], dest, position);
+	Vector<int> lineBreak(0, CharHeight());
+	for (int i(0), col(0); s[i] && (maxWidth <= 0 || col < maxWidth); ++i) {
+		if (s[i] == '\n') {
+			lineHead += lineBreak;
+			position = lineHead;
+			col = 0;
+		} else {
+			DrawChar(s[i], dest, position);
+			position += step;
+			++col;
+		}
 	}
 }
 
-void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxWidth) const {
+	// NOTE: this does not handle line breaks
 	if (!sprite) return;
 
 	int length(0);
-	while (length < maxChars && s[length] != '\0') {
+	while (length < maxWidth && s[length] != '\0') {
 		++length;
 	}
 	Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());