X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/4c2a9f3b21e52e4917149c37aa54622d0af4b3be..21567ae6bd3723eafb98b56fbd97ddabe6d072a0:/gameserv/player.cpp

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index b31f532..70572a5 100644
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -21,7 +21,6 @@ using namespace std;
 
 void Player::reset()
 {
-  item *tempItem;
   exp = 1;
   gold = 0;
   bank = 500;
@@ -43,9 +42,6 @@ void Player::reset()
   w = NULL;
   a = NULL;
   inventory->clear();
-  tempItem = findItemByID(3001);
-  inventory->addItem((*Items.begin()))->use(this); // Add the stick
-  inventory->addItem(tempItem)->use(this); // Add Clothes
 }
 
 Player::Player()
@@ -81,24 +77,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\
@@ -200,6 +195,19 @@ Monster::Monster(Monster &m)
   exp = m.exp;
 }
 
+Monster::Monster(const 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;
+}
+
 long int Player::setFlags(long int newflags)
 {
   flags = newflags;