Added a file pouch.h which contains an inventory class Pouch to be used for carrying...

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

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index 4e6617d66ed35381050541b85d9347b5504ea81b..55aa9204bf06e05446b29faa249959381899409e 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -1,4 +1,6 @@
 #include "player.h"
+#include "pouch.h"
+#include "extern.h"
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -18,12 +20,13 @@ void Player::reset()
     weapon = 1;
     level = 1;
     alive = 1;
-    started = 1; // Possibly deprecated
-    forest_fights = 100;
+    forest_fights = forestfights;
     player_fights = 3;
     fight = NULL;
     master = NULL;
     battle = NULL;
+    flags = 0;
+    inventory.reset();
 }
 
 Player::Player(aClient *user)
@@ -89,16 +92,16 @@ void Player::setData(Player *right)
         weapon = right->weapon;
         level = right->level;
         alive = right->alive;
-        started = right->started; // Possibly obsoleted
         forest_fights = right->forest_fights;
         player_fights = right->player_fights;
+       flags = right->flags;
     }
     else
     {
         reset();
 
        int num = rand() % 32767;
-       sprintf(name, "Player%d\0", num);
+       sprintf(name, "Player%d", num);
     }
 
     cout << "Setting Player data for " << name << endl;
@@ -134,6 +137,32 @@ monster_::monster_(monster_ *m)
 
     strength = m->strength;
     maxhp = m->maxhp;
+    hp = m->hp;
     gold = m->gold;
     exp = m->exp;
 }
+
+long int Player::setFlags(long int newflags)
+{
+    flags = newflags;
+    return getFlags();
+}
+
+long int Player::addFlag(long int flag)
+{
+    flags |= flag;
+    return getFlags();
+}
+
+long int Player::remFlag(long int flag)
+{
+    flags &= ~flag;
+    return getFlags();
+}
+
+Pouch::Pouch(int h, int s, int d)
+{
+    setHealing(h);
+    setStrength(s);
+    setDefense(d);
+}