X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=be96a2c104b860f0e9dda819388c92c0fa206d81;hb=1907ca03c5e865c4d398170042aa384c67ffff29;hp=efaad1525611302446f7fd9f46479bfd62f19637;hpb=fb9bd716a1740e41efbb08a3bfa42e441d64c693;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index efaad15..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;
 
@@ -78,10 +80,7 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positi
 void Font::CreateTypeDescription() {
 	Font f;
 
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-
-	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"
@@ -90,9 +89,9 @@ void Font::CreateTypeDescription() {
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Font));
 
-	td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), spriteId).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
-	td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), numberId).SetDescription("offset of the column of the first character"));
-	td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), numberId).SetDescription("offset of the row of the first character"));
+	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"));
 }
 
 void Font::Construct(void *data) {