Mercurial > mm7

diff mm7_4.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 7fcbc83557b9
children f4394e320312
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Mar 31 12:01:31 2013 +0100
+++ b/mm7_4.cpp	Sun Mar 31 12:39:29 2013 +0100
@@ -8707,7 +8707,7 @@
             if ( (signed int)v4->uCurrentActionTime >= v5 )
             {
               v17 = ai_near_actors_targets_pid[v20];
-              v6 = Actor::GetDirectionInfo(8 * v20 | OBJECT_Actor, v17, &a3, v2);
+              v6 = Actor::GetDirectionInfo(PID(v20,OBJECT_Actor), v17, &a3, v2);
               v7 = v4->uAIState;
               memcpy(&v15, v6, sizeof(v15));
               v8 = v7 - 4;
@@ -8996,9 +8996,9 @@
     LOWORD(v25) = 0;
     LOBYTE(v26) = v41;
 
-    //v0->sZValue = v25 + (8 * i | OBJECT_Actor);
+    //v0->sZValue = v25 + (PID(i,OBJECT_Actor));
     v0->actual_z = HIWORD(x);
-    v0->object_pid = v8 * i | OBJECT_Actor;
+    v0->object_pid = PID(i,OBJECT_Actor);
 
     v29 = HIDWORD(p->pActorBuffs[5].uExpireTime) == 0;
     v30 = HIDWORD(p->pActorBuffs[5].uExpireTime) < 0;