diff mm7_6.cpp @ 1936:68f2d9d3a1d9

MSVS 2010 project file
author Ritor1
date Thu, 24 Oct 2013 15:24:14 +0600
parents af38275939cc
children 4ed7d18abe93
line wrap: on
line diff
--- a/mm7_6.cpp	Wed Oct 23 19:13:07 2013 -0700
+++ b/mm7_6.cpp	Thu Oct 24 15:24:14 2013 +0600
@@ -1072,84 +1072,6 @@
   pIconsFrameTable->InitializeAnimation(uIconID_CharacterFrame);
 }
 
-//----- (0042F4DA) --------------------------------------------------------
-int _42F4DA_check_actor_proximity()
-{
-  signed int v0; // edi@1
-  Actor *v1; // esi@4
-  int v2; // ebx@5
-  int v3; // eax@5
-  int v4; // ebx@5
-  unsigned int v5; // ecx@5
-  int v6; // edx@6
-  unsigned int v7; // edx@8
-  unsigned int v8; // edx@10
-  __int16 v9; // ax@12
-  signed int result; // eax@20
-  int v11; // [sp+Ch] [bp-10h]@5
-  int v12; // [sp+10h] [bp-Ch]@5
-  signed int v13; // [sp+14h] [bp-8h]@3
-
-  v0 = 5120;
-  if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
-    v0 = 2560;
-  v13 = 0;
-  if ( (signed int)uNumActors <= 0 )
-  {
-    result = 0;
-  }
-  else
-  {
-    v1 = pActors.data();
-    while ( 1 )
-    {
-		v2 = abs(v1->vInitialPosition.x - pParty->vPosition.x);
-		v11 = abs(v1->vInitialPosition.y - pParty->vPosition.y);
-		v12 = abs(v1->vInitialPosition.z - pParty->vPosition.z);
-      v3 = v2;
-      v4 = v11;
-      v5 = v12;
-      if ( v3 < v11 )
-      {
-        v6 = v3;
-        v3 = v11;
-        v4 = v6;
-      }
-      if ( v3 < v12 )
-      {
-        v7 = v3;
-        v3 = v12;
-        v5 = v7;
-      }
-      if ( v4 < (signed int)v5 )
-      {
-        v8 = v5;
-        v5 = v4;
-        v4 = v8;
-      }
-      if ( (signed int)(((unsigned int)(11 * v4) >> 5) + (v5 >> 2) + v3) < v0 )
-      {
-		v9 = v1->uAIState;
-        if ( v1->uAIState != 5 )
-        {
-          if ( v9 != 4
-            && v9 != 11
-            && v9 != 19
-            && v9 != 17
-			&& (BYTE2(v1->uAttributes) & 8 || ((Actor *)nullptr)->GetActorsRelation( v1)) )
-            break;
-        }
-      }
-      ++v13;
-      ++v1;
-      if ( v13 >= (signed int)uNumActors )
-        return 0;
-    }
-    result = 1;
-  }
-  return result;
-}
-
 //----- (0042F7EB) --------------------------------------------------------
 bool __fastcall sub_42F7EB_DropItemAt(unsigned int uSpriteID, int x, int y, int z, int a4, int count, int a7, unsigned __int16 attributes, ItemGen *a9)
 {