--- a/AudioPlayer.cpp	Tue Feb 12 10:17:11 2013 +0600
+++ b/AudioPlayer.cpp	Tue Feb 12 10:17:35 2013 +0600
@@ -870,7 +870,7 @@
           goto LABEL_184;
         }
         v76 = a3;
-        if ( (a3 & 7) == 1 )
+        if ( (a3 & 7) == OBJECT_BLVDoor)
         {
           if ( uCurrentlyLoadedLevelType != LEVEL_Indoor )
             goto LABEL_184;
@@ -890,7 +890,7 @@
           AIL_set_sample_pan(pMixerChannel5->hSample, v80);
           goto LABEL_184;
         }
-        if ( (a3 & 7) == 2 )
+        if ( (a3 & 7) == OBJECT_Item)
         {
           pLayingItem4 = &pLayingItems[a3 >> 3];
           if ( !GetSoundStrengthByDistanceFromParty(pLayingItem4->vPosition.x, pLayingItem4->vPosition.y, pLayingItem4->vPosition.z) )
@@ -898,7 +898,7 @@
         }
         else
         {
-          if ( (a3 & 7) == 3 )
+          if ( (a3 & 7) == OBJECT_Actor)
           {
             pActor3 = &pActors[a3 >> 3];
             if ( !GetSoundStrengthByDistanceFromParty(pActor3->vPosition.x, pActor3->vPosition.y, pActor3->vPosition.z) )
@@ -910,7 +910,7 @@
             AIL_set_sample_pan(pMixerChannel5->hSample, v80);
 			goto LABEL_184;
           }
-          if ( (a3 & 7) != 5 )
+          if ( (a3 & 7) != OBJECT_Decoration)
           {
 LABEL_184:
             if ( uNumRepeats )
@@ -922,7 +922,7 @@
             AIL_start_sample(v85);
             if ( sPlaybackRate )
               AIL_set_sample_playback_rate(pMixerChannel5->hSample, sPlaybackRate);
-            if ( (v76 & 7) == 4 )
+            if ( (v76 & 7) == OBJECT_Player)
               AIL_sample_ms_position(pMixerChannel5->hSample, &sLastTrackLengthMS, 0);
             return;
           }
@@ -978,7 +978,7 @@
       _4ABE55(pMixerChannel4);
       goto LABEL_150;
     }
-    if ( (a3 & 7) == 2 )
+    if ( (a3 & 7) == OBJECT_Item)
     {
       varC = 5;
       v96 = 7;
@@ -986,7 +986,7 @@
     }
     else
     {
-      if ( (a3 & 7) == 3 )
+      if ( (a3 & 7) == OBJECT_Actor)
       {
         *(float *)&varC = 0.0;
         pActor2 = &pActors[a3 >> 3];
@@ -1000,9 +1000,9 @@
           return;
         goto LABEL_123;
       }
-      if ( (a3 & 7) != 5 )
+      if ( (a3 & 7) != OBJECT_Decoration)
       {
-        if ( (a3 & 7) == 6 )
+        if ( (a3 & 7) == OBJECT_BModel)
         {
           varC = 8;
           v96 = 9;
@@ -1048,7 +1048,7 @@
     v21 = (double)pParty->sEyelevel + (double)pParty->vPosition.z;
     goto LABEL_47;
   }
-  if ( (a3 & 7) == 2 )
+  if ( (a3 & 7) == OBJECT_Item)
   {
     v22 = pAudioPlayer->uNum3DSamples;
     if ( v22 < 16 )
@@ -1065,7 +1065,7 @@
   }
   else
   {
-    if ( (a3 & 7) == 3 )
+    if ( (a3 & 7) == OBJECT_Actor)
     {
       v18 = pAudioPlayer->uNum3DSamples;
       v12 = 0;
@@ -1081,10 +1081,10 @@
       v21 = (double)v100;
       goto LABEL_47;
     }
-    if ( (a3 & 7) != 5 )
+    if ( (a3 & 7) != OBJECT_Decoration)
     {
       v13 = pAudioPlayer->uNum3DSamples;
-      if ( (a3 & 7) == 6 )
+      if ( (a3 & 7) == OBJECT_BModel)
       {
         if ( v13 >= 16 )
         {
@@ -1256,7 +1256,7 @@
       AIL_set_3D_sample_loop_count(*(int *)v42, v86);
       if ( PartyX == -1 )
       {
-        if ( (a3 & 7) == 1 )
+        if ( (a3 & 7) == OBJECT_BLVDoor)
         {
           if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
           {
@@ -1306,13 +1306,13 @@
           }
           return;
         }
-        if ( (a3 & 7) == 2 )
+        if ( (a3 & 7) == OBJECT_Item)
         {
           pLayingItem2 = &pLayingItems[a3 >> 3];
         }
         else
         {
-          if ( (a3 & 7) == 3 )
+          if ( (a3 & 7) == OBJECT_Actor)
           {
             pActor = &pActors[a3 >> 3];
             v46 = pActor->vPosition.y;
@@ -1322,7 +1322,7 @@
             v47 = (double)uNumRepeatsb;
             goto LABEL_101;
           }
-          if ( (a3 & 7) != 5 )
+          if ( (a3 & 7) != OBJECT_Decoration)
           {
             pRenderVertexSoft.vWorldPosition.x = (double)pParty->vPosition.x;
             v43 = (double)pParty->vPosition.y;
@@ -1603,7 +1603,7 @@
         while ( 1 )
         {
           v31 = v30->dword_000004;
-          if ( (v30->dword_000004 & 7) == 1 )
+          if ( (v30->dword_000004 & 7) == OBJECT_BLVDoor)
           {
             if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
             {
@@ -1633,12 +1633,12 @@
           }
           else
           {
-            if ( (v30->dword_000004 & 7) == 2 )
+            if ( (v30->dword_000004 & 7) == OBJECT_Item)
             {
               v32 = &pLayingItems[v31 >> 3];
               goto LABEL_53;
             }
-            if ( (v30->dword_000004 & 7) == 3 )
+            if ( (v30->dword_000004 & 7) == OBJECT_Actor)
             {
               v33 = &pActors[v31 >> 3];
               v34 = GetSoundStrengthByDistanceFromParty(v33->vPosition.x, v33->vPosition.y, v33->vPosition.z);