implemented equipping weapons and armor and saving what is equipped

[irc/gameservirc.git] / gameserv / player.h

diff --git a/gameserv/player.h b/gameserv/player.h
index b0919dd1410f5bd732853570b17f8b171f397177..5a8d58678e3229e7af1d0f84a2be99f73619e262 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -31,14 +31,12 @@ public:
     long int addFlag(long int);     // Adds a flag to the client's flags
     long int remFlag(long int);     // Removes a flag from the client's current flags
 
-    int wea;
-    int arm; // delete soon
 
-    weapon *getWeapon() { return w; };
-    armor *getArmor() { return a; };
+    item *getWeapon() { return w; };
+    item *getArmor() { return a; };
 
-    void setWeapon (weapon &);  // Set a player's weapon to some item
-    void setArmor (armor &);    // Set a player's weapon to some item
+    void setWeapon (item &);  // Set a player's weapon to some item
+    void setArmor (item &);   // Set a player's weapon to some item
 
     string name;               // Player's Name
     int level;                 // Player's level (1-12)
@@ -63,8 +61,8 @@ public:
 
 private:
     long int flags;            // Player's current flags
-    weapon *w;                  // Player's weapon
-    armor *a;                   // Player's armor
+    item *w;                    // Player's weapon
+    item *a;                    // Player's armor
 };
 
 struct monster_ {