--- a/mm7_1.cpp	Tue Feb 12 02:02:26 2013 +0200
+++ b/mm7_1.cpp	Tue Feb 12 03:02:13 2013 +0200
@@ -4406,7 +4406,7 @@
     v5 = rand() % 4;
     v6 = dword_5B5920 >> 3;
     v35 = v5;
-    if ( (dword_5B5920 & 7) == 5 )
+    if ( (dword_5B5920 & 7) == OBJECT_Decoration)
     {
       v16 = v6;
       v14 = pLevelDecorations[v6].vPosition.x;
@@ -4416,7 +4416,7 @@
     }
     else
     {
-      if ( (dword_5B5920 & 7) != 6 )
+      if ( (dword_5B5920 & 7) != OBJECT_BModel)
         goto LABEL_12;
       if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
       {
@@ -5063,7 +5063,7 @@
           uLastPointedObjectID = pMouse->uPointingObjectID;
           return;
         }
-        if ( (v18 & 7) == 6 )                   // bmodel
+        if ( (v18 & 7) == OBJECT_BModel)
         {
           if ( v18 < (signed int)0x2000000u )
           {
@@ -6003,7 +6003,7 @@
     v1 = pMouse->GetCursorPos(&a2);
     v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]];
   }
-  if ( (v0 & 7) == 2 )
+  if ( (v0 & 7) == OBJECT_Item)
   {
     a2.y = (signed int)(unsigned __int16)v0 >> 3;
     v21 = (signed int)(unsigned __int16)v0 >> 3;
@@ -6035,9 +6035,9 @@
     }
     goto LABEL_13;
   }
-  if ( (v0 & 7) != 3 )
-  {
-    if ( (v0 & 7) == 5 )
+  if ( (v0 & 7) != OBJECT_Actor)
+  {
+    if ( (v0 & 7) == OBJECT_Decoration)
     {
       v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
       if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 )
@@ -6058,7 +6058,7 @@
     }
     else
     {
-      if ( (v0 & 7) != 6 || (unsigned int)v0 >= 0x2000000 )
+      if ( (v0 & 7) != OBJECT_BModel || (unsigned int)v0 >= 0x2000000 )
         goto LABEL_13;
       v2 = (signed int)(unsigned __int16)v0 >> 3;
       if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)