X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/8e8005496ea89dc8d8c7ffb12c76836a4de701a4..26b1738621ecdeb4fdf857d76a6f9b882a296da6:/gameserv/do_attack.cpp

diff --git a/gameserv/do_attack.cpp b/gameserv/do_attack.cpp
index 4f1ce64..222ebf0 100644
--- a/gameserv/do_attack.cpp
+++ b/gameserv/do_attack.cpp
@@ -51,26 +51,26 @@ void do_attack(char *u)
   if (!player_fight(ni))
     {
       // Player's Hit
-      hit = ((ni->stats->strength + webonus[ni->stats->weapon]) / 2) +
-	(rand() % ((ni->stats->strength + webonus[ni->stats->weapon]) / 2)) - 
+      hit = ((ni->stats->strength + webonus[ni->stats->wea]) / 2) +
+	(rand() % ((ni->stats->strength + webonus[ni->stats->wea]) / 2)) - 
 	fight->defense;
 
       // Opponent's Hit
       mhit = (fight->strength / 2) +
 	(rand() % (fight->strength / 2) - (ni->stats->defense +
-					   arbonus[ni->stats->armor]));
+					   arbonus[ni->stats->arm]));
     }
   else
     {
       // Opponent's Hit
-      mhit = (((battle->stats->strength + webonus[battle->stats->weapon]) / 2) +
-	      (rand() % ((battle->stats->strength + webonus[battle->stats->weapon])) / 2) -
-	      (ni->stats->defense + arbonus[ni->stats->armor]));
+      mhit = (((battle->stats->strength + webonus[battle->stats->wea]) / 2) +
+	      (rand() % ((battle->stats->strength + webonus[battle->stats->wea])) / 2) -
+	      (ni->stats->defense + arbonus[ni->stats->arm]));
 
       // Player's Hit
-      hit = (((ni->stats->strength + webonus[ni->stats->weapon]) / 2) +
-	     (rand() % ((ni->stats->strength + webonus[ni->stats->weapon])) / 2) -
-	     (battle->stats->defense + arbonus[battle->stats->armor]));
+      hit = (((ni->stats->strength + webonus[ni->stats->wea]) / 2) +
+	     (rand() % ((ni->stats->strength + webonus[ni->stats->wea])) / 2) -
+	     (battle->stats->defense + arbonus[battle->stats->arm]));
     }
 
   if (!player_fight(ni))
@@ -103,9 +103,9 @@ void do_attack(char *u)
 	    ni->stats->name.c_str(), ni->stats->name.c_str(),
 	    ni->stats->fight->name.c_str(), ni->stats->name.c_str());
 	    dragon.name = "DRAGON-" + ni->stats->name;
-	    dragon.weapon = weapons[ni->stats->weapon];
-	    dragon.strength = ni->stats->strength + webonus[ni->stats->weapon];
-	    dragon.defense = ni->stats->defense + arbonus[ni->stats->armor];
+	    dragon.weapon = weapons[ni->stats->wea];
+	    dragon.strength = ni->stats->strength + webonus[ni->stats->wea];
+	    dragon.defense = ni->stats->defense + arbonus[ni->stats->arm];
 	    dragon.hp = ni->stats->maxhp;
 	    dragon.maxhp = ni->stats->maxhp;
 	    save_dragon();
@@ -222,7 +222,7 @@ void do_attack(char *u)
 
 	      notice(s_GameServ, battle->getNick(), "%s has hit you with their %s for "\
 		     "^B%d^B damage!", ni->stats->name.c_str(),
-		     weapons[ni->stats->weapon], hit);
+		     weapons[ni->stats->wea], hit);
 	    }
 	  else
 	    {