fixed some bugs

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@398 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv/do_attack.cpp b/gameserv/do_attack.cpp
index 1f6b9c6736ef92304a93d4523fa7b2f3c7ad4700..02111a333cd60579239b16d7e762c45c07c7ad69 100644 (file)
--- a/gameserv/do_attack.cpp
+++ b/gameserv/do_attack.cpp
@@ -122,6 +122,8 @@ void do_attack(char *u)
                          save_dragon();
                          clearDragonFight(ni->stats);
                          reset(ni->stats);
+                         ni->stats->delMonster();
+                         return;
                        }
                  
                  ni->stats->addExp(fight->exp);

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 959b4b34e8d79f31562355dcd9d8651c97a42f4a..205026c7deeec7207989835cb6a5107dff6b2f9b 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -3374,8 +3374,8 @@ void reset(Player *p)
   
   p->reset();
   tempItem = findItemByID(3001);
-  p->inventory->addItem((*Items.begin())); // Add the stick
-  p->inventory->addItem(tempItem); // Add Clothes
+  p->inventory->addItem((*Items.begin()))->use(p); // Add the stick
+  p->inventory->addItem(tempItem)->use(p); // Add Clothes
 }
 
 void updateTS(Player *p)