X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/23f22a79c2bf2c2dea183fe8b8139d241a4c6434..8c5016fa576197e69b6848e8a39dbaecf26aa13a:/gameserv/player.cpp

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index 76cc134..744521a 100644
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -26,10 +26,8 @@ void Player::reset()
   bank = 500;
   hp = 10;
   maxhp = 10;
-  strength = 0;
-  defense = 0;
-  arm = 1;
-  wea = 1;
+  strength = 2;
+  defense = 1;
   level = 1;
   forest_fights = forestfights;
   player_fights = 3;
@@ -40,6 +38,8 @@ void Player::reset()
   lastcommand = 0;
   lastlogin = 0;
   setAlive(this);
+  w = NULL;
+  a = NULL;
   inventory->clear();
 }
 
@@ -120,8 +120,6 @@ void Player::setData(Player *right)
       maxhp = right->maxhp;
       strength = right->strength;
       defense = right->defense;
-      arm = right->arm;
-      wea = right->wea;
       level = right->level;
       forest_fights = right->forest_fights;
       player_fights = right->player_fights;
@@ -130,6 +128,8 @@ void Player::setData(Player *right)
       client = right->client;
       lastcommand = right->lastcommand;
       lastlogin = right->lastlogin;
+      w = right->w;
+      a = right->a;
     }
   else
     {
@@ -207,3 +207,12 @@ long int Player::remFlag(long int flag)
   flags &= ~flag;
   return getFlags();
 }
+
+void Player::setWeapon(item &weap)
+{
+  w = &weap;
+}
+void Player::setArmor(item &arm)
+{
+  a = &arm;
+}