--- a/mm7_4.cpp	Sun Mar 31 10:44:43 2013 +0100
+++ b/mm7_4.cpp	Sun Mar 31 11:46:28 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, 8 * i | 5, 1);
+        EventProcessor(v1->field_16_event_id, PID(i,OBJECT_Decoration), 1);
     }
     if ( v1->field_2 & 2 )
     {
@@ -977,7 +977,7 @@
     {
       stru_721530.field_7C = v13;
       v14 = 8 * v16;
-      LOBYTE(v14) = 8 * v16 | 3;
+      LOBYTE(v14) = PID(v16,OBJECT_Actor);
       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) = 8 * v15 | 3;
+          LOBYTE(v18) = PID(v15,OBJECT_Actor);
           a1.vPosition.y = v17;
           a1.spell_target_pid = v18;
           v19 = a1.Create(0, 0, 0, 0);
-          DamageMonsterFromParty(8 * v19 | 2, *v14, &a3);
+          DamageMonsterFromParty(PID(v19,OBJECT_Item), *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) = 8 * uFaceID | 6;
+  LOBYTE(v6) = PID(uFaceID,OBJECT_BModel);
   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;