X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=59059e07436d1893da0a9fc7dc73612fe5c79a92;hb=559457f14d914f6b1cb5d588a0ccf97529f011d1;hp=c68031065b717486f55d06bb589d124b84d0228a;hpb=679b9e39c7680fd46482589f37f0a225032103b7;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index c680310..59059e0 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,6 +7,7 @@
 
 #include "Font.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 #include <cmath>
@@ -14,6 +15,7 @@
 
 using geometry::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 using std::pow;
 
@@ -37,6 +39,18 @@ void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &posit
 	}
 }
 
+void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+	if (!sprite) return;
+
+	int length(0);
+	while (length < maxChars && s[length] != '\0') {
+		++length;
+	}
+	Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
+
+	DrawString(s, dest, position, length);
+}
+
 void Font::DrawDigit(int digit, SDL_Surface *dest, const Vector<int> &position) const {
 	if (!sprite) return;
 
@@ -74,19 +88,34 @@ 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());
+
+	DrawNumber(number, dest, position, digits);
+}
+
 
 void Font::CreateTypeDescription() {
 	Font f;
-	TypeDescription &td(TypeDescription::CreateOrGet("Font"));
 
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Font"));
+	td.SetDescription(
+			"Simple font with fixed-width characters using a sprite for rendering.\n"
+			"Characters from strings are mapped as follows:\n"
+			"<pre>sprite column = column offset + (character % 16)\n"
+			"sprite row    = row    offset + (character / 16)</pre>");
+	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Font));
 
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
+	td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), Sprite::TYPE_ID).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
+	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the column of the first character"));
+	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the row of the first character"));
+}
 
-	td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), spriteId, true));
-	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), numberId, false));
-	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), numberId, false));
+void Font::Construct(void *data) {
+	new (data) Font;
 }
 
 }