Mercurial > mm7

diff mm7_2.cpp @ 849:8fafe3645f36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* PID replaces * Actor::GetDirectionInfo cleaning
author zipi
date Sun, 31 Mar 2013 11:46:28 +0100
parents ceef50611567
children e4bd2a0bf08b
line wrap: on
line diff
--- a/mm7_2.cpp	Sun Mar 31 10:44:43 2013 +0100
+++ b/mm7_2.cpp	Sun Mar 31 11:46:28 2013 +0100
@@ -4124,7 +4124,7 @@
     {
       if ( v20 == uNumActors )
         ++uNumActors;
-      v6->uSummonerID = 8 * v17 | 4;
+      v6->uSummonerID = PID(v17,OBJECT_Player);
       result = v6->pActorBuffs[2].Apply(
                  pParty->uTimePlayed + (signed __int64)((double)(a3 << 7) * 0.033333335),
                  v16,
@@ -11283,7 +11283,7 @@
             v115 = 8 * v153;
             v129 = 0;
             v128 = -1;
-            LOBYTE(v115) = 8 * v153 | 2;
+            LOBYTE(v115) = PID(v153,OBJECT_Item);
             v127 = 0;
             v126 = v115;
             v116 = v143;
@@ -11553,7 +11553,7 @@
 LABEL_132:
         v73 = v2->vPosition.z;
         v74 = v2->vPosition.y;
-        v75 = 8 * v72 | 2;
+        v75 = PID(v72,OBJECT_Item);
         v2->vVelocity.z = v66;
         v2->vVelocity.y = v66;
         v76 = v2->vPosition.x;
@@ -11872,7 +11872,7 @@
     v2->vVelocity.z = 0;
     v38 = 8 * v153;
     v39 = v2->vPosition.y;
-    LOBYTE(v38) = 8 * v153 | 2;
+    LOBYTE(v38) = PID(v153,OBJECT_Item);
     v2->vVelocity.y = 0;
     v2->vVelocity.x = 0;
     v40 = v2->vPosition.x;
@@ -11930,7 +11930,7 @@
         v2->uSpriteFrameID = v32;
         v102 = 8 * v153;
         v103 = v2->vPosition.y;
-        LOBYTE(v102) = 8 * v153 | 2;
+        LOBYTE(v102) = PID(v153,OBJECT_Item);
         v2->vVelocity.x = v32;
         v2->vVelocity.y = v32;
         v104 = v2->vPosition.x;
@@ -12024,7 +12024,7 @@
   v13 = 8 * v153;
   v129 = v9;
   v128 = -1;
-  LOBYTE(v13) = 8 * v153 | 2;
+  LOBYTE(v13) = PID(v153,OBJECT_Item);
   v127 = v9;
   v126 = v13;
 LABEL_28: