--- a/mm7_4.cpp	Sun Mar 31 12:49:45 2013 +0100
+++ b/mm7_4.cpp	Sun Mar 31 13:20:58 2013 +0100
@@ -133,7 +133,7 @@
         v5 = v8;
       }
       if ( (signed int)(((unsigned int)(11 * v5) >> 5) + (v6 >> 2) + v4) < v2 )
-        EventProcessor(v1->field_16_event_id, PID(i,OBJECT_Decoration), 1);
+        EventProcessor(v1->field_16_event_id, PID(OBJECT_Decoration,i), 1);
     }
     if ( v1->field_2 & 2 )
     {
@@ -977,7 +977,7 @@
     {
       stru_721530.field_7C = v13;
       v14 = 8 * v16;
-      LOBYTE(v14) = PID(v16,OBJECT_Actor);
+      LOBYTE(v14) = PID(OBJECT_Actor,v16);
       stru_721530.uFaceID = v14;
     }
     result = 1;
@@ -2133,11 +2133,11 @@
           v17 = pActors[v16].vPosition.y;
           a1.vPosition.z = pActors[v16].vPosition.z;
           v18 = 8 * v15;
-          LOBYTE(v18) = PID(v15,OBJECT_Actor);
+          LOBYTE(v18) = PID(OBJECT_Actor,v15);
           a1.vPosition.y = v17;
           a1.spell_target_pid = v18;
           v19 = a1.Create(0, 0, 0, 0);
-          DamageMonsterFromParty(PID(v19,OBJECT_Item), *v14, &a3);
+          DamageMonsterFromParty(PID(OBJECT_Item,v19), *v14, &a3);
           ++v9;
         }
         while ( v9 < v13 );
@@ -5521,7 +5521,7 @@
   v68 = v2;
   v5 = (Texture *)(v4 != -1 ? (int)&pBitmaps_LOD->pTextures[v3] : 0);
   v6 = 8 * uFaceID;
-  LOBYTE(v6) = PID(uFaceID,OBJECT_BModel);
+  LOBYTE(v6) = PID(OBJECT_BModel,uFaceID);
   stru_F8AD28.field_0 = v6;
   stru_F8AD28.plane_4.vNormal.x = v1->pFacePlane_old.vNormal.x;
   stru_F8AD28.plane_4.vNormal.y = v1->pFacePlane_old.vNormal.y;
@@ -8707,7 +8707,7 @@
             if ( (signed int)v4->uCurrentActionTime >= v5 )
             {
               v17 = ai_near_actors_targets_pid[v20];
-              v6 = Actor::GetDirectionInfo(PID(v20,OBJECT_Actor), v17, &a3, v2);
+              v6 = Actor::GetDirectionInfo(PID(OBJECT_Actor,v20), 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 + (PID(i,OBJECT_Actor));
+    //v0->sZValue = v25 + (PID(OBJECT_Actor,i));
     v0->actual_z = HIWORD(x);
-    v0->object_pid = PID(i,OBJECT_Actor);
+    v0->object_pid = PID(OBJECT_Actor,i);
 
     v29 = HIDWORD(p->pActorBuffs[5].uExpireTime) == 0;
     v30 = HIDWORD(p->pActorBuffs[5].uExpireTime) < 0;