Implemented the definitions for the new items class and added some declarations into...

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

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index 372ebe1fbb726ca903065c27fbc6cde467ba5d25..3d3887b52f8e13704634f985e8db41c3e86dfe68 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -1,3 +1,4 @@
+#include "item.h"
 #include "player.h"
 #include "pouch.h"
 #include "extern.h"
@@ -16,8 +17,8 @@ void Player::reset()
     maxhp = 10;
     strength = 0;
     defense = 0;
-    armor = 1;
-    weapon = 1;
+    arm = 1;
+    wea = 1;
     level = 1;
     forest_fights = forestfights;
     player_fights = 3;
@@ -40,18 +41,6 @@ Player::Player()
     #endif
 }
 
-Player::Player(aClient *user)
-{
-
-    if (user)
-    {
-       setData(user->stats);
-       name = user->getNick();
-    }
-    else
-       setData(NULL);
-}
-
 Player::Player(char *n)
 {
     reset(); // Set defaults
@@ -115,8 +104,8 @@ void Player::setData(Player *right)
         maxhp = right->maxhp;
         strength = right->strength;
         defense = right->defense;
-        armor = right->armor;
-        weapon = right->weapon;
+        arm = right->arm;
+        wea = right->wea;
         level = right->level;
         forest_fights = right->forest_fights;
         player_fights = right->player_fights;