Mercurial > mm7

diff mm7_5.cpp @ 860:8fc2f035abc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* AI function renames * more PID replaces
author zipi
date Sun, 31 Mar 2013 12:39:29 +0100
parents 8fafe3645f36
children fea81e031484
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Mar 31 12:01:31 2013 +0100
+++ b/mm7_5.cpp	Sun Mar 31 12:39:29 2013 +0100
@@ -5381,7 +5381,7 @@
             {
               if ( v7->sCurrentHP >= 1 )
               {
-                Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0);
+                Actor::_4030AD(uActorID, PID(a4,OBJECT_Player), 0);
                 Actor::AggroSurroundingPeasants(uActorID, 1);
               }
               else
@@ -5567,7 +5567,7 @@
                   {
                     if ( v44->sCurrentHP >= 1 )
                     {
-                      Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0);
+                      Actor::_4030AD(uActorID, PID(a4,OBJECT_Player), 0);
                       Actor::AggroSurroundingPeasants(uActorID, 1);
                     }
                     else
@@ -7339,7 +7339,7 @@
                   v22 = 2;
                   v17 = v5->pMonsterInfo.uSpell1ID;
                 }
-                Actor::_404AC7(v4, &a4, v17, v22, v24);
+                Actor::SpellAttack(v4, &a4, v17, v22, v24);
 LABEL_25:
                 v16 = a2a;
                 v23 = &a4;
@@ -7355,7 +7355,7 @@
               v18 = v5->pMonsterInfo.uMissleAttack1Type;
               v25 = 0;
             }
-            Actor::_404874(v4, &a4, v18, v25);
+            Actor::RangedAttack(v4, &a4, v18, v25);
             goto LABEL_25;
           }
         }
@@ -7827,7 +7827,7 @@
           goto LABEL_25;
         }
 LABEL_24:
-        Actor::_402968(v16, v15, v21, v23);
+        Actor::Flee(v16, v15, v21, v23);
 LABEL_25:
         v17 = v29;
         v29->field_C = 4;
@@ -7844,9 +7844,9 @@
   if ( (signed int)v11 < 5120 )
   {
     if ( v4->pMonsterInfo.uMissleAttack1Type && (signed int)v11 < 1024 )
-      Actor::_402AD7(uActorID, a2a, uActorID, 32, &pDir);
+      Actor::Pursue1(uActorID, a2a, uActorID, 32, &pDir);
     else
-      Actor::_40281C(uActorID, a2a, 32, &pDir, 307);
+      Actor::Pursue2(uActorID, a2a, 32, &pDir, 307);
     goto LABEL_59;
   }
 LABEL_46: