diff Actor.cpp @ 2057:b7485a6502f2

AgressorAtackInfo
author Ritor1
date Sun, 01 Dec 2013 20:13:48 +0600
parents 28cb79ae2f6f
children f9698295c0bd
line wrap: on
line diff
--- a/Actor.cpp	Sat Nov 30 21:00:37 2013 +0200
+++ b/Actor.cpp	Sun Dec 01 20:13:48 2013 +0600
@@ -3097,7 +3097,7 @@
 			else if ( pActor->uAIState == AttackingMelee )
 			{
 				v35 = pActor->special_ability_use_check(actor_id);
-				stru_50FE08.Add(
+				AgressorAtackInfo.Add(
 					a1,
 					5120,
 					pActor->vPosition.x,
@@ -4036,8 +4036,8 @@
             flag = true;
           if ( flag == true )
           {
-            if ( !(pPlayers[j + 1]->pConditions[12] | pPlayers[j + 1]->pConditions[13]
-                 | pPlayers[j + 1]->pConditions[14] | pPlayers[j + 1]->pConditions[15] | pPlayers[j + 1]->pConditions[16]) )
+            if ( !(pPlayers[j + 1]->pConditions[Condition_Paralyzed] | pPlayers[j + 1]->pConditions[Condition_Unconcious]
+                 | pPlayers[j + 1]->pConditions[Condition_Dead] | pPlayers[j + 1]->pConditions[Condition_Pertified] | pPlayers[j + 1]->pConditions[Condition_Eradicated]) )
               Victims_list[v2++] = j;
           }
         }
@@ -4048,8 +4048,8 @@
   }
   for ( uint i = 0; i < 4; ++i )
   {
-    if ( !(pPlayers[i + 1]->pConditions[12] | pPlayers[i + 1]->pConditions[13]
-         | pPlayers[i + 1]->pConditions[14] | pPlayers[i + 1]->pConditions[15] | pPlayers[i + 1]->pConditions[16]) )
+    if ( !(pPlayers[i + 1]->pConditions[Condition_Paralyzed] | pPlayers[i + 1]->pConditions[Condition_Unconcious]
+         | pPlayers[i + 1]->pConditions[Condition_Dead] | pPlayers[i + 1]->pConditions[Condition_Pertified] | pPlayers[i + 1]->pConditions[Condition_Eradicated]) )
       Victims_list[v2++] = i;
   }
   if ( v2 )