X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FSpell.h;h=0f864b81bda0c3c8bd42373e24cf324e82c9a3b1;hb=15b018d9915412a341e2064760fc915fc5bdbade;hp=eb8fa02928605b2e84b2aa37084fbdc994a43405;hpb=b02da898c7c8a08141df4e797774a61cf5e0163f;p=l2e.git

diff --git a/src/common/Spell.h b/src/common/Spell.h
index eb8fa02..0f864b8 100644
--- a/src/common/Spell.h
+++ b/src/common/Spell.h
@@ -15,6 +15,9 @@ namespace common {
 
 class Spell {
 
+public:
+	static const int TYPE_ID = 304;
+
 public:
 	Spell();
 
@@ -23,8 +26,8 @@ public:
 	Uint16 Value() const { return value; }
 	Uint8 Cost() const { return cost; }
 
-	bool CanUseOnStatusScreen() const { return usability & USABILITY_STATUS; }
-	bool CanUseInBattle() const { return usability & USABILITY_BATTLE; }
+	bool CanUseOnStatusScreen() const { return status; }
+	bool CanUseInBattle() const { return battle; }
 
 	TargetingMode &GetTargetingMode() { return targetingMode; }
 	const TargetingMode &GetTargetingMode() const { return targetingMode; }
@@ -36,33 +39,23 @@ public:
 public:
 	void SetName(const char *n) { name = n; }
 	void SetCost(Uint8 c) { cost = c; }
-	void SetUsableInBattle() { usability |= USABILITY_BATTLE; }
+	void SetUsableInBattle() { battle = true; }
 
 	static void CreateTypeDescription();
 	static void Construct(void *);
 
-private:
-	enum Usability {
-		// USABILITY_UNUSED = 1,
-		// USABILITY_UNUSED = 2,
-		// USABILITY_UNUSED = 4,
-		// USABILITY_UNUSED = 8,
-		// USABILITY_UNUSED = 16,
-		// USABILITY_UNUSED = 32,
-		USABILITY_STATUS = 64,
-		USABILITY_BATTLE = 128,
-	};
-
 private:
 	const char *name;
 
 	int value;
 
 	int cost;
-	Uint8 usability;
 	TargetingMode targetingMode;
 	HeroGroup usableBy;
 
+	bool status;
+	bool battle;
+
 };
 
 }