}
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
" %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();