1 files changed, 8 insertions, 22 deletions
diff --git a/engines/wage/entities.h b/engines/wage/entities.h
index 6a97abf39e..5fc1a08b36 100644
--- a/engines/wage/entities.h
+++ b/engines/wage/entities.h
@@ -58,9 +58,7 @@ class Design;
 class Obj;
 class Scene;
 class Script;
-class Weapon;
 
-typedef Common::Array<Weapon *> WeaponArray;
 typedef Common::Array<Obj *> ObjArray;
 typedef Common::Array<Chr *> ChrArray;
 typedef Common::List<Obj *> ObjList;
@@ -219,18 +217,14 @@ public:
 
 	Context _context;
 
-	WeaponArray *getWeapons(bool includeMagic);
+	ObjArray *getWeapons(bool includeMagic);
 	ObjArray *getMagicalObjects();
 	const char *getDefiniteArticle(bool capitalize);
 
-public:
-	bool hasNativeWeapon1() {
-		return (_nativeWeapon1.size() > 0 && _operativeVerb1.size() > 0);
-	}
+	Obj *_weapon1;
+	Obj *_weapon2;
 
-	bool hasNativeWeapon2() {
-		return (_nativeWeapon2.size() > 0 && _operativeVerb2.size() > 0);
-	}
+public:
 	int wearObjIfPossible(Obj *obj);
 	void wearObjs();
 
@@ -299,21 +293,13 @@ public:
 			_currentOwner = NULL;
 	}
 
-	Chr *removeFromChr();
-	Designed *removeFromCharOrScene();
-};
-
-class Weapon : public Obj {
-public:
-	int _numberOfUses;
-
-	Weapon() : _numberOfUses(0) {}
-
 	void decrementNumberOfUses() {
-		if (_numberOfUses != -1) {
+		if (_numberOfUses != -1)
 			_numberOfUses--;
-		}
 	}
+
+	Chr *removeFromChr();
+	Designed *removeFromCharOrScene();
 };
 
 class Scene : public Designed {