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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index c680310..be96a2c 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;
 
@@ -77,16 +79,23 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positi
 
 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;
 }
 
 }