X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FHero.cpp;h=cca9d43f812eba77b89c039fc10990889c97645c;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=ab73a6be70d3ee91fbc003d4918342ebba28638c;hpb=5795ffa948c6e39a624c4fc7773a99afb87579e1;p=l2e.git

diff --git a/src/common/Hero.cpp b/src/common/Hero.cpp
index ab73a6b..cca9d43 100644
--- a/src/common/Hero.cpp
+++ b/src/common/Hero.cpp
@@ -1,10 +1,3 @@
-/*
- * Hero.cpp
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #include "Hero.h"
 
 #include "Item.h"
@@ -15,12 +8,16 @@
 #include "../loader/TypeDescription.h"
 #include "../map/Entity.h"
 
+#include <cstring>
+
 using graphics::Animation;
 using graphics::Sprite;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
 using map::Entity;
+using std::memset;
+
 
 namespace common {
 
@@ -40,18 +37,11 @@ Hero::Hero()
 
 , useMask(0)
 
-, weapon(0)
-, armor(0)
-, shield(0)
-, helmet(0)
-, ring(0)
-, jewel(0)
-
 , battleSprite(0)
 , meleeAnimation(0)
 , attackAnimation(0)
 , spellAnimation(0) {
-
+	memset(equipment, 0, sizeof(equipment));
 }
 
 
@@ -107,7 +97,7 @@ void Hero::CreateTypeDescription() {
 	td.AddField("stats", FieldDescription(((char *)&h.stats) - ((char *)&h), Stats::TYPE_ID));
 
 	td.AddField("level", FieldDescription(((char *)&h.level) - ((char *)&h), Interpreter::NUMBER_ID));
-	td.AddField("ladder", FieldDescription(((char *)&h.levelLadder) - ((char *)&h), Interpreter::NUMBER_ID).SetReferenced().SetAggregate());
+	td.AddField("ladder", FieldDescription(((char *)&h.levelLadder) - ((char *)&h), Interpreter::NUMBER_ID).SetAggregate());
 
 	td.AddField("useMask", FieldDescription(((char *)&h.useMask) - ((char *)&h), Interpreter::NUMBER_ID));