[ViewVC] Diff of: cvs/deliantra/server/server/attack.C

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.121 by root, Wed Nov 11 03:52:45 2009 UTC vs.
Revision 1.122 by root, Mon Nov 23 12:19:57 2009 UTC

 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
  * which needs new attacktype AT_HOLYWORD to work . b.t. */
 int
 hit_player (object *op, int dam, object *hitter, uint32_t type, int full_hit)
 {
+  int magic = type & AT_MAGIC;
+  int body_attack = op && op->head;     /* Did we hit op's head? */
-  int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
+  int maxdam = 0, ndam = 0, attacktype = 1;
   int maxattacktype;
-  int body_attack = op && op->head;     /* Did we hit op's head? */
   int simple_attack;
   int rtn_kill = 0;
   int friendlyfire;
   if (get_attack_mode (&op, &hitter, &simple_attack))
   attack_message (maxdam, maxattacktype, op, hitter);
   op->stats.hp -= maxdam;
   /* Eneq(@csd.uu.se): Check to see if monster runs away. */
-  if ((op->stats.hp >= 0) &&
+  if (op->stats.hp >= 0
-      (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
+      && (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
-      op->stats.hp < (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp))
+      && op->stats.hp < op->run_away * op->stats.maxhp / 100)
     {
       if (QUERY_FLAG (op, FLAG_MONSTER))
         SET_FLAG (op, FLAG_RUN_AWAY);
       else

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines