don't lock player character onto its tile

[l2e.git] / src / battle / Resources.cpp

diff --git a/src/battle/Resources.cpp b/src/battle/Resources.cpp
index a1365d070bd05e25f35f242e488b4e548d1292e3..6c469469e2ce10627358cc1fd3b603aac3e6afaf 100644 (file)
--- a/src/battle/Resources.cpp
+++ b/src/battle/Resources.cpp
@@ -83,9 +83,6 @@ Resources::Resources()
 
 void Resources::CreateTypeDescription() {
        Resources r;
-       TypeDescription &td(TypeDescription::CreateOrGet("BattleResources"));
-
-       td.SetSize(sizeof(Resources));
 
        int animationId(TypeDescription::GetTypeId("Animation"));
        int colorId(TypeDescription::GetTypeId("Color"));
@@ -97,6 +94,10 @@ void Resources::CreateTypeDescription() {
        int spriteId(TypeDescription::GetTypeId("Sprite"));
        int stringId(TypeDescription::GetTypeId("String"));
 
+       TypeDescription &td(TypeDescription::CreateOrGet("BattleResources"));
+       td.SetConstructor(&Construct);
+       td.SetSize(sizeof(Resources));
+
        td.AddField("swapCursor", FieldDescription(((char *)&r.swapCursor) - ((char *)&r), spriteId, true));
        td.AddField("moveIcons", FieldDescription(((char *)&r.moveIcons) - ((char *)&r), spriteId, true));
        td.AddField("attackIcons", FieldDescription(((char *)&r.attackIcons) - ((char *)&r), spriteId, true));
@@ -151,7 +152,7 @@ void Resources::CreateTypeDescription() {
        td.AddField("ringMenuIcon", FieldDescription(((char *)&r.ringMenuIcon) - ((char *)&r), spriteId, true));
        td.AddField("jewelMenuIcon", FieldDescription(((char *)&r.jewelMenuIcon) - ((char *)&r), spriteId, true));
 
-       td.AddField("levelLabelCol", FieldDescription(((char *)&r.levelLabelCol) - ((char *)&r), numberId, false));
+       td.AddField("levelLabelRow", FieldDescription(((char *)&r.levelLabelRow) - ((char *)&r), numberId, false));
        td.AddField("levelLabelCol", FieldDescription(((char *)&r.levelLabelCol) - ((char *)&r), numberId, false));
        td.AddField("healthLabelRow", FieldDescription(((char *)&r.healthLabelRow) - ((char *)&r), numberId, false));
        td.AddField("healthLabelCol", FieldDescription(((char *)&r.healthLabelCol) - ((char *)&r), numberId, false));
@@ -160,9 +161,13 @@ void Resources::CreateTypeDescription() {
        td.AddField("moveLabelRow", FieldDescription(((char *)&r.moveLabelRow) - ((char *)&r), numberId, false));
        td.AddField("moveLabelCol", FieldDescription(((char *)&r.moveLabelCol) - ((char *)&r), numberId, false));
        td.AddField("ikariLabelRow", FieldDescription(((char *)&r.ikariLabelRow) - ((char *)&r), numberId, false));
-       td.AddField("ikariLabelRow", FieldDescription(((char *)&r.ikariLabelRow) - ((char *)&r), numberId, false));
+       td.AddField("ikariLabelCol", FieldDescription(((char *)&r.ikariLabelCol) - ((char *)&r), numberId, false));
 
        td.AddField("heroesBgColor", FieldDescription(((char *)&r.heroesBgColor) - ((char *)&r), colorId, false));
 }
 
+void Resources::Construct(void *data) {
+       new (data) Resources;
+}
+
 }