updated the Change log w/ new additions

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

diff --git a/gameserv/do_attack.cpp b/gameserv/do_attack.cpp
index 02111a333cd60579239b16d7e762c45c07c7ad69..70aa62b5c4bf22eb740157ff01e90d5a131a62a2 100644 (file)
--- a/gameserv/do_attack.cpp
+++ b/gameserv/do_attack.cpp
@@ -36,11 +36,8 @@ void do_attack(char *u)
     }
   else
     {
-      if (!ni->stats->getMaster()) // This is not a master fight
-               fight = ni->stats->getMonster();       // Monster      Could be NULL
-      else                    // This IS a master fight
-               fight = ni->stats->getMaster();      // Master       Could be NULL
-         
+
+         fight = ni->stats->getMonster();       // Monster      Could be NULL
       battle = ni->stats->getBattle();             // Player       Could be NULL
          
       // One has to be !NULL based on the previous else if
@@ -113,7 +110,7 @@ void do_attack(char *u)
                                          " %s is now watching over the Dragon's lair!",
                                          ni->stats->getName().c_str(), ni->stats->getName().c_str(),
                                          ni->stats->getMonster()->name.c_str(), ni->stats->getName().c_str());
-                         dragon.name = "DRAGON-" + ni->stats->getName();
+                         dragon.name = "Dragon " + ni->stats->getName();
                          dragon.weapon = "Breath of Fire";
                          dragon.strength = ni->stats->getStrength();
                          dragon.defense = ni->stats->getDefense();
@@ -238,7 +235,7 @@ void do_attack(char *u)
                          notice(s_GameServ, u, "You have killed \ 2%s\ 2!", battle->stats->getName().c_str());
                          notice(s_GameServ, u, "You recieve \ 2%d\ 2 experience and \ 2%ld\ 2 gold!",
                                         (long int)(battle->stats->getExp() * .10), battle->stats->getGold());
-                         addNews(todaysnews, "%s has defeated %s, leaving %s in a pool of blood", ni->stats->getName().c_str(), battle->stats->getName().c_str()); /* DrLnet - Modified by kain for news instead of just a message */ 
+                         addNews(todaysnews, "%s has defeated %s, leaving %s in a pool of blood", ni->stats->getName().c_str(), battle->stats->getName().c_str(), battle->stats->getName().c_str()); /* DrLnet - Modified by kain for news instead of just a message */ 
                          notice(s_GameServ, battle->getNick(), "You have been killed by \ 2%s\ 2!",
                                         ni->stats->getName().c_str());
                          battle->stats->setHP(0);