reordered type description creation to avoid reallocation

[l2e.git] / src / common / Item.cpp

diff --git a/src/common/Item.cpp b/src/common/Item.cpp
index 65df4c8ed08660b549bd7d770eada87723997fc1..f79a6e030446e6cb536a0a76e661cca2e5d9786d 100644 (file)
--- a/src/common/Item.cpp
+++ b/src/common/Item.cpp
@@ -7,20 +7,47 @@
 
 #include "Item.h"
 
+#include "../loader/TypeDescription.h"
+
+using loader::FieldDescription;
+using loader::TypeDescription;
+
 namespace common {
 
 Item::Item()
-: menuIcon(0)
+: name("")
+, menuIcon(0)
 , chestIcon(0)
+, ikari(0)
+, attackAnimation(0)
 
 , value(0)
 , properties(0)
 
 , usability(0)
-, targettingMode(0)
-, equipable(0)
-, equipableBy(0) {
+, equipable(0) {
+
+}
+
+
+void Item::CreateTypeDescription() {
+       Item i;
+
+       int animationId(TypeDescription::GetTypeId("Animation"));
+       int ikariId(TypeDescription::GetTypeId("Ikari"));
+       int spriteId(TypeDescription::GetTypeId("Sprite"));
+       int stringId(TypeDescription::GetTypeId("String"));
+       int targetsId(TypeDescription::GetTypeId("TargetingMode"));
+
+       TypeDescription &td(TypeDescription::CreateOrGet("Item"));
+       td.SetSize(sizeof(Item));
 
+       td.AddField("name", FieldDescription(((char *)&i.name) - ((char *)&i), stringId, true));
+       td.AddField("menuicon", FieldDescription(((char *)&i.menuIcon) - ((char *)&i), spriteId, true));
+       // TODO: implement flags/fields (e.g. for usability)
+       td.AddField("targets", FieldDescription(((char *)&i.targettingMode) - ((char *)&i), targetsId, false));
+       td.AddField("ikari", FieldDescription(((char *)&i.ikari) - ((char *)&i), ikariId, true));
+       td.AddField("attackanimation", FieldDescription(((char *)&i.attackAnimation) - ((char *)&i), animationId, true));
 }
 
 }