X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FPartyLayout.cpp;h=00fa930f9eb711853e469e32c61bc14d456ad96d;hb=5f9a1893c0db8f53889a390e4c4b95d57abd4384;hp=27d587e7c165e68a2d4f0128ae00a8ac2aa1deec;hpb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;p=l2e.git

diff --git a/src/battle/PartyLayout.cpp b/src/battle/PartyLayout.cpp
index 27d587e..00fa930 100644
--- a/src/battle/PartyLayout.cpp
+++ b/src/battle/PartyLayout.cpp
@@ -1,16 +1,11 @@
-/*
- * PartyLayout.cpp
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #include "PartyLayout.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 using std::vector;
 
@@ -39,14 +34,12 @@ void PartyLayout::CalculatePositions(int width, int height, vector<Vector<int> >
 void PartyLayout::CreateTypeDescription() {
 	PartyLayout p;
 
-	int vectorId(TypeDescription::GetTypeId("Vector"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("PartyLayout"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "PartyLayout"));
 	td.SetDescription("Positions of party members");
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(PartyLayout));
 
-	td.AddField("positions", FieldDescription(((char *)&p.positions) - ((char *)&p), vectorId).SetReferenced().SetAggregate().SetDescription("the members' positions"));
+	td.AddField("positions", FieldDescription(((char *)&p.positions) - ((char *)&p), Interpreter::VECTOR_ID).SetAggregate().SetDescription("the members' positions"));
 }
 
 void PartyLayout::Construct(void *data) {