--- a/Chest.cpp	Sun Mar 31 16:42:11 2013 +0600
+++ b/Chest.cpp	Sun Mar 31 16:44:01 2013 +0600
@@ -20,7 +20,7 @@
 #include "Overlays.h"
 
 #include "mm7_data.h"
-
+#include "MM7.h"
 
 
 
@@ -109,9 +109,9 @@
     v31 = 813;
     v32 = 814;
     v5 = rand() % 4;
-    v6 = EvtTargetObj >> 3;
+    v6 = PID_ID(EvtTargetObj);
     v35 = v5;
-    if ( (EvtTargetObj & 7) == OBJECT_Decoration)
+    if ( PID_TYPE(EvtTargetObj) == OBJECT_Decoration)
     {
       v16 = v6;
       v14 = pLevelDecorations[v6].vPosition.x;
@@ -121,7 +121,7 @@
     }
     else
     {
-      if ( (EvtTargetObj & 7) != OBJECT_BModel)
+      if ( PID_TYPE(EvtTargetObj) != OBJECT_BModel)
         goto LABEL_12;
       if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
       {