--- a/Actor.cpp	Tue Feb 12 02:02:26 2013 +0200
+++ b/Actor.cpp	Tue Feb 12 03:02:13 2013 +0200
@@ -2143,7 +2143,7 @@
   }
   else
   {
-    if ( (edx0 & 7) == 3 )
+    if ( (edx0 & 7) == OBJECT_Actor)
     {
       v8 = edx0 >> 3;
       v6 = (AIDirection *)pActors[v8].vPosition.x;
@@ -2152,7 +2152,7 @@
     }
     else
     {
-      if ( (edx0 & 7) == 4 )
+      if ( (edx0 & 7) == OBJECT_Player)
       {
         v6 = (AIDirection *)pParty->vPosition.x;
         v7 = (AIDirection *)pParty->vPosition.y;
@@ -2176,7 +2176,7 @@
       v13 = 0;
       if ( !arg0 )
       {
-        v14 = Actor::GetDirectionInfo(8 * v24 | 3, a2, &a3, 0);
+        v14 = Actor::GetDirectionInfo(8 * v24 | OBJECT_Actor, a2, &a3, 0);
         v12 = &v20;
         memcpy(&v20, v14, sizeof(v20));
         v13 = 0;
@@ -2542,7 +2542,7 @@
   v22 = uActorID;
   v3 = &pActors[uActorID];
   a2 = edx0;
-  if ( (edx0 & 7) == 3 )
+  if ( (edx0 & 7) == OBJECT_Actor)
   {
     v6 = edx0 >> 3;
     v4 = (AIDirection *)pActors[v6].vPosition.x;
@@ -2551,7 +2551,7 @@
   }
   else
   {
-    if ( (edx0 & 7) == 4 )
+    if ( (edx0 & 7) == OBJECT_Player)
     {
       v4 = (AIDirection *)pParty->vPosition.x;
       v5 = (AIDirection *)pParty->vPosition.y;
@@ -2573,7 +2573,7 @@
     v10 = 0;
     if ( !pDir )
     {
-      v11 = Actor::GetDirectionInfo(8 * v22 | 3, a2, &a3, 0);
+      v11 = Actor::GetDirectionInfo(8 * v22 | OBJECT_Actor, a2, &a3, 0);
       v9 = &v18;
       memcpy(&v18, v11, sizeof(v18));
       v10 = 0;
@@ -2654,7 +2654,7 @@
   v22 = uActorID;
   v3 = &pActors[uActorID];
   a2 = edx0;
-  if ( (edx0 & 7) == 3 )
+  if ( (edx0 & 7) == OBJECT_Actor)
   {
     v6 = edx0 >> 3;
     v4 = (AIDirection *)pActors[v6].vPosition.x;
@@ -2663,7 +2663,7 @@
   }
   else
   {
-    if ( (edx0 & 7) == 4 )
+    if ( (edx0 & 7) == OBJECT_Player)
     {
       v4 = (AIDirection *)pParty->vPosition.x;
       v5 = (AIDirection *)pParty->vPosition.y;
@@ -2685,7 +2685,7 @@
     v10 = 0;
     if ( !pDir )
     {
-      v11 = Actor::GetDirectionInfo(8 * v22 | 3, a2, &a3, 0);
+      v11 = Actor::GetDirectionInfo(8 * v22 | OBJECT_Actor, a2, &a3, 0);
       v9 = &v18;
       memcpy(&v18, v11, sizeof(v18));
       v10 = 0;
@@ -2765,7 +2765,7 @@
   v21 = uActorID;
   v3 = &pActors[uActorID];
   a2 = edx0;
-  if ( (edx0 & 7) == 3 )
+  if ( (edx0 & 7) == OBJECT_Actor)
   {
     v6 = edx0 >> 3;
     v4 = (AIDirection *)pActors[v6].vPosition.x;
@@ -2774,7 +2774,7 @@
   }
   else
   {
-    if ( (edx0 & 7) == 4 )
+    if ( (edx0 & 7) == OBJECT_Player)
     {
       v4 = (AIDirection *)pParty->vPosition.x;
       v5 = (AIDirection *)pParty->vPosition.y;
@@ -2796,7 +2796,7 @@
     v10 = 0;
     if ( !pDir )
     {
-      v11 = Actor::GetDirectionInfo(8 * v21 | 3, a2, &a3, 0);
+      v11 = Actor::GetDirectionInfo(8 * v21 | OBJECT_Actor, a2, &a3, 0);
       v9 = &v17;
       memcpy(&v17, v11, sizeof(v17));
       v10 = 0;
@@ -2861,7 +2861,7 @@
   v21 = uActorID;
   v3 = &pActors[uActorID];
   a2 = edx0;
-  if ( (edx0 & 7) == 3 )
+  if ( (edx0 & 7) == OBJECT_Actor)
   {
     v6 = edx0 >> 3;
     v4 = pActors[v6].vPosition.x;
@@ -2870,7 +2870,7 @@
   }
   else
   {
-    if ( (edx0 & 7) == 4 )
+    if ( (edx0 & 7) == OBJECT_Player)
     {
       v4 = pParty->vPosition.x;
       v5 = pParty->vPosition.y;
@@ -2900,7 +2900,7 @@
     v11 = 0;
     if ( !pDir )
     {
-      v12 = Actor::GetDirectionInfo(8 * v21 | 3, a2, &a3, 0);
+      v12 = Actor::GetDirectionInfo(8 * v21 | OBJECT_Actor, a2, &a3, 0);
       v10 = &v18;
       memcpy(&v18, v12, sizeof(v18));
       v11 = 0;
@@ -3483,7 +3483,7 @@
     memcpy(&a3, Actor::GetDirectionInfo(v7, 4u, &v10, 0), sizeof(a3));
     memcpy(&v13, &a3, sizeof(v13));
     if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT)
-      || (a2 & 7) == 3 && (double)(signed int)v13.uDistance < 307.2 )
+      || (a2 & 7) == OBJECT_Actor && (double)(signed int)v13.uDistance < 307.2 )
     {
       if ( !uActionLength )
         uActionLength = 256;