X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FItem.cpp;h=3eee887590dcaf93d3f34e8427bf77f44d6566c6;hb=7b3710c47f24e64e0d01378a4564730bcb2f6ef2;hp=2bd337d061321d2b3a07de749d65b24be52514b4;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/common/Item.cpp b/src/common/Item.cpp
index 2bd337d..3eee887 100644
--- a/src/common/Item.cpp
+++ b/src/common/Item.cpp
@@ -1,10 +1,3 @@
-/*
- * Item.cpp
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #include "Item.h"
 
 #include "Ikari.h"
@@ -33,9 +26,9 @@ Item::Item()
 , properties(0)
 
 , equipability(0)
+, heroMask(0)
 
 , mostUseful(false)
-, equipable(false)
 , cursed(false)
 , fruit(false)
 , scenario(false)
@@ -57,7 +50,6 @@ void Item::CreateTypeDescription() {
 	td.AddField("menuicon", FieldDescription(((char *)&i.menuIcon) - ((char *)&i), Sprite::TYPE_ID).SetReferenced().SetDescription("icon that is displayed in menus"));
 
 	td.AddField("mostUseful", FieldDescription(((char *)&i.mostUseful) - ((char *)&i), Interpreter::BOOLEAN_ID));
-	td.AddField("equipable", FieldDescription(((char *)&i.equipable) - ((char *)&i), Interpreter::BOOLEAN_ID));
 	td.AddField("cursed", FieldDescription(((char *)&i.cursed) - ((char *)&i), Interpreter::BOOLEAN_ID));
 	td.AddField("fruit", FieldDescription(((char *)&i.fruit) - ((char *)&i), Interpreter::BOOLEAN_ID));
 	td.AddField("scenario", FieldDescription(((char *)&i.scenario) - ((char *)&i), Interpreter::BOOLEAN_ID));
@@ -67,10 +59,35 @@ void Item::CreateTypeDescription() {
 	td.AddField("targets", FieldDescription(((char *)&i.targettingMode) - ((char *)&i), TargetingMode::TYPE_ID).SetDescription("how target selection is to be performed"));
 	td.AddField("ikari", FieldDescription(((char *)&i.ikari) - ((char *)&i), Ikari::TYPE_ID).SetReferenced().SetDescription("ikari attack of the item (sensible only for equipment)"));
 	td.AddField("attackanimation", FieldDescription(((char *)&i.attackAnimation) - ((char *)&i), Animation::TYPE_ID).SetReferenced().SetDescription("animation that is run when the item is used for attacking"));
+	td.AddField("equipability", FieldDescription(((char *)&i.equipability) - ((char *)&i), Interpreter::NUMBER_ID).SetDescription("how this item can be equipped"));
+	td.AddField("heroMask", FieldDescription(((char *)&i.heroMask) - ((char *)&i), Interpreter::NUMBER_ID).SetDescription("which heroes may equip this item"));
 }
 
 void Item::Construct(void *data) {
 	new (data) Item;
 }
 
+
+bool Item::Less(const Item &lhs, const Item &rhs) {
+	if (lhs.IsMostUseful()) {
+		return !rhs.IsMostUseful();
+	}
+	if (lhs.IsEquipable()) {
+		if (rhs.IsMostUseful()) {
+			return false;
+		}
+		if (!rhs.IsEquipable()) {
+			return true;
+		}
+		return lhs.equipability < rhs.equipability;
+	}
+	if (lhs.IsFruit()) {
+		if (rhs.IsMostUseful() || rhs.IsEquipable()) {
+			return true;
+		}
+		return !rhs.IsFruit();
+	}
+	return false;
+}
+
 }