updated the Change log w/ new additions

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

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index eec8743503a78ae0c52070c8cfb797e5cad6edbc..f0651239560571247903f529d86ce56d742afb99 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -46,8 +46,6 @@ void Player::reset()
 
 Player::Player()
 {
-  if (inventory != NULL)
-       delete inventory;
   inventory = new pouch();
   setData(NULL);
   
@@ -58,8 +56,6 @@ Player::Player()
 
 Player::Player(char *n)
 {
-  if (inventory != NULL)
-       delete inventory;
   inventory = new pouch();
   reset(); // Set defaults
   
@@ -83,9 +79,13 @@ 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");