updated the Change log w/ new additions

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

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index f2a693eb3a1e84c7100b49ce897de4ce3ce54562..f0651239560571247903f529d86ce56d742afb99 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -36,8 +36,9 @@ void Player::reset()
   battle = NULL;
   flags = 0;
   lastcommand = 0;
-  lastlogin = 0;
+  lastlogin = time(NULL);
   setAlive(this);
+  clearMaster(this);
   w = NULL;
   a = NULL;
   inventory->clear();
@@ -67,6 +68,8 @@ Player::Player(char *n)
 
 Player::Player(string n)
 {
+  if (inventory != NULL)
+       delete inventory;
   inventory = new pouch();
   reset();
   name = n;
@@ -76,24 +79,23 @@ Player::Player(string n)
 }
 
 Player::~Player()
-{   
-  delete inventory;
-
+{
+  if (inventory != NULL)
+       delete inventory;
+  
+  delMonster();
+  delMaster();
+  delBattle();
 #ifdef DEBUGMODE
   string *output;
   output = new string("Deleting Player");
-#endif
-  
-#ifdef DEBUGMODE
   *output += ": " + name;
-#endif
-  
-#ifdef DEBUGMODE
   *output += "    Password: " + password;
   log ("%s", output->c_str());
   delete output;
 #endif
 }
+
 void Player::setPassword(const char *p)
 {
   static char saltChars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUV\
@@ -107,6 +109,11 @@ WXYZ0123456789./";
   password = crypt(p, salt);
 }
 
+void Player::setRawPassword(const char *p)
+{
+  password = p;
+}
+
 void Player::setData(Player *right)
 {
   if (right)
@@ -148,11 +155,11 @@ void Player::setData(Player *right)
 #endif
 }
 
-monster_::~monster_()
+Monster::~Monster()
 {
 }
 
-monster_::monster_()
+Monster::Monster()
 {
   name.erase();
   weapon.erase();
@@ -164,7 +171,7 @@ monster_::monster_()
   maxhp = hp = 0;
 }
 
-monster_::monster_(monster_ *m)
+Monster::Monster(Monster *m)
 {
   name = m->name;
   weapon = m->weapon;
@@ -177,7 +184,20 @@ monster_::monster_(monster_ *m)
   exp = m->exp;
 }
 
-monster_::monster_(monster_ &m)
+Monster::Monster(Monster &m)
+{
+  name = m.name;
+  weapon = m.weapon;
+  death = m.death;
+  strength = m.strength;
+  defense = m.defense;
+  maxhp = m.maxhp;
+  hp = m.hp;
+  gold = m.gold;
+  exp = m.exp;
+}
+
+Monster::Monster(const Monster &m)
 {
   name = m.name;
   weapon = m.weapon;
@@ -355,7 +375,7 @@ void Player::setClient(aClient *c)
   client = c;
 }
 
-void Player::setMonster(Monster m)
+void Player::setMonster(Monster *m)
 {
   fight = new Monster(m);
 }