# HG changeset patch
# User zipi
# Date 1364311263 0
# Node ID 5e3f4bf3b8e6808b22bbb31258ca58d01540584f
# Parent  522591080ac5b88c7f09d7348b25d0ed912a71e0
* UpdateActorAI clean
* VS 2010 fixes

diff -r 522591080ac5 -r 5e3f4bf3b8e6 Player.cpp
--- a/Player.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/Player.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -5847,7 +5847,7 @@
   unsigned __int8 v8; // of@5
   PlayerEquipment *v9; // ebx@19
   Player *v10; // ecx@20
-  enum PLAYER_SKILL_TYPE v11; // edi@21
+  PLAYER_SKILL_TYPE v11; // edi@21
   int v12; // eax@21
   int v13; // edi@21
   char v14; // di@25
@@ -5858,7 +5858,7 @@
   ITEM_EQUIP_TYPE v20; // edi@40
   int v21; // edx@41
   int v22; // eax@42
-  enum PLAYER_SKILL_TYPE v23; // edi@45
+  PLAYER_SKILL_TYPE v23; // edi@45
   unsigned __int16 v24; // ax@45
   unsigned __int16 v25; // bx@45
   unsigned int v26; // eax@45
@@ -5873,12 +5873,12 @@
   ITEM_EQUIP_TYPE v35; // edi@69
   int v36; // edx@70
   int v37; // eax@71
-  enum PLAYER_SKILL_TYPE v38; // edi@74
+  PLAYER_SKILL_TYPE v38; // edi@74
   int v39; // eax@74
   int v40; // eax@89
   char v41; // si@89
   int v42; // eax@96
-  enum PLAYER_SKILL_TYPE v43; // edx@97
+  PLAYER_SKILL_TYPE v43; // edx@97
   int v44; // eax@97
   int v45; // eax@98
   int v46; // eax@99
@@ -6515,9 +6515,9 @@
 }
 
 //----- (004903C9) --------------------------------------------------------
-enum PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order)
-{
-  enum PLAYER_SKILL_TYPE result; // eax@5
+PLAYER_SKILL_TYPE Player::GetSkillIdxByOrder(signed int order)
+{
+  PLAYER_SKILL_TYPE result; // eax@5
   int v3; // edx@5
   char *v4; // ecx@5
   int v5; // esi@11
diff -r 522591080ac5 -r 5e3f4bf3b8e6 Player.h
--- a/Player.h	Tue Mar 26 14:55:43 2013 +0200
+++ b/Player.h	Tue Mar 26 15:21:03 2013 +0000
@@ -485,10 +485,10 @@
   bool CanTrainToNextLevel();
   unsigned int GetExperienceDisplayColor();
   int CalculateIncommingDamage(int resistance, signed int type);
-  ITEM_EQUIP_TYPE   GetEquippedItemEquipType(enum ITEM_EQUIP_TYPE uEquipSlot);
-  PLAYER_SKILL_TYPE GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot);
+  ITEM_EQUIP_TYPE   GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot);
+  PLAYER_SKILL_TYPE GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot);
   bool IsUnarmed();
-  bool HasItemEquipped(enum ITEM_EQUIP_TYPE uEquipIndex);
+  bool HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex);
   bool HasEnchantedItemEquipped(int uEnchantment);
   bool WearsItem(int a1, signed int a2);
   bool StealFromShop(struct ItemGen *a2, int a3, int a4, int a5, int *a6);
@@ -513,14 +513,14 @@
   int _48EA46_calc_special_bonus_by_items(int a2);
   int GetItemsBonus(enum CHARACTER_ATTRIBUTE_TYPE attr, int a3);
   int GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2);
-  char GetActualSkillLevel(enum PLAYER_SKILL_TYPE uSkillType);
+  char GetActualSkillLevel(PLAYER_SKILL_TYPE uSkillType);
   int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2);
   enum CHARACTER_RACE GetRace();
   PLAYER_SEX GetSexByVoice();
   void SetInitialStats();
   int SetSexByVoice();
   void Reset(PLAYER_CLASS_TYPE classType);
-  enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order);
+  PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order);
   void DecreaseAttribute(int eAttribute);
   int IncreaseAttribute(int eAttribute);
   void Player::Zero();
diff -r 522591080ac5 -r 5e3f4bf3b8e6 UIPartyCreation.cpp
--- a/UIPartyCreation.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/UIPartyCreation.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -172,13 +172,13 @@
   unsigned int v34; // eax@44
   int v35; // eax@44
   unsigned int v36; // eax@44
-  enum PLAYER_SKILL_TYPE v37; // eax@44
-  enum PLAYER_SKILL_TYPE v39; // eax@44
-  enum PLAYER_SKILL_TYPE v41; // eax@44
+  PLAYER_SKILL_TYPE v37; // eax@44
+  PLAYER_SKILL_TYPE v39; // eax@44
+  PLAYER_SKILL_TYPE v41; // eax@44
   const char *v42; // edx@44
   char *v43; // ST1C_4@44
   int v45; // eax@44
-  enum PLAYER_SKILL_TYPE v46; // eax@46
+  PLAYER_SKILL_TYPE v46; // eax@46
   const char *v47; // edx@46
   char *v48; // ST1C_4@46
   int v50; // eax@46
@@ -197,7 +197,7 @@
   int v85; // eax@65
   int v89; // eax@67
   int v94; // eax@69
-  enum PLAYER_SKILL_TYPE pSkillId; // edi@72
+  PLAYER_SKILL_TYPE pSkillId; // edi@72
   size_t pLenText; // eax@72
   signed int v104; // ecx@72
   int pColorText; // ecx@79
diff -r 522591080ac5 -r 5e3f4bf3b8e6 UIPopup.cpp
--- a/UIPopup.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/UIPopup.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -1442,10 +1442,10 @@
     unsigned int v9; // eax@8
     unsigned int v10; // eax@8
     unsigned int v11; // eax@8
-    enum PLAYER_SKILL_TYPE v12; // edi@8
+    PLAYER_SKILL_TYPE v12; // edi@8
     unsigned int v13; // eax@8
     unsigned int v14; // eax@8
-    enum PLAYER_SKILL_TYPE v15; // esi@8
+    PLAYER_SKILL_TYPE v15; // esi@8
     int v16; // edi@8
     char v17; // al@8
     int v18; // ST5C_4@8
@@ -1458,7 +1458,7 @@
     unsigned int v25; // eax@9
     unsigned int v26; // eax@9
     unsigned int v27; // ecx@9
-    enum PLAYER_SKILL_TYPE v28; // ebx@9
+    PLAYER_SKILL_TYPE v28; // ebx@9
     unsigned int v29; // eax@9
     char a2[1200]; // [sp+Ch] [bp-538h]@7
     char Source[120]; // [sp+4BCh] [bp-88h]@7
@@ -1600,7 +1600,7 @@
                 && (signed int)v1 >= (signed int)i->uY
                 && (signed int)v1 <= (signed int)i->uW )
                 {
-                v3 = CharacterUI_GetSkillDescText(uActiveCharacter - 1, (enum PLAYER_SKILL_TYPE)i->uControlParam);
+                v3 = CharacterUI_GetSkillDescText(uActiveCharacter - 1, (PLAYER_SKILL_TYPE)i->uControlParam);
                 sub_4179BC_draw_tooltip(pSkillNames[i->uControlParam], v3);
                 v1 = pY;
                 v0 = pX;
@@ -1948,7 +1948,7 @@
         signed int pControlID; // eax@92
         int v16; // eax@95
         int v17; // eax@96
-        enum PLAYER_SKILL_TYPE v18; // eax@98
+        PLAYER_SKILL_TYPE v18; // eax@98
         char *pStr2; // eax@99
         unsigned int v20; // eax@108
         unsigned int pSkillId; // eax@109
@@ -2261,7 +2261,7 @@
                         pY = 0;
                         if ( (signed int)pSkillId < 37 )
                             {
-                            pSkillInfo = CharacterUI_GetSkillDescText(pButton->uControlParam, (enum PLAYER_SKILL_TYPE)pSkillId);
+                            pSkillInfo = CharacterUI_GetSkillDescText(pButton->uControlParam, (PLAYER_SKILL_TYPE)pSkillId);
                             strcpy(pTmpBuf2, pSkillInfo);
                             pWindow.Hint = pTmpBuf2;
                             pStr = pSkillNames[pSkillId];
diff -r 522591080ac5 -r 5e3f4bf3b8e6 mm7_2.cpp
--- a/mm7_2.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/mm7_2.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -6313,8 +6313,8 @@
     if ( pRenderer->LockSurface_DDraw4(pRenderer->pBackBuffer4, &Dst, DDLOCK_WAIT) )
     {
       auto src = (unsigned __int16 *)Dst.lpSurface;
-      auto src_width = (Dst.lPitch / sizeof(short)),
-           src_height = Dst.dwHeight;
+      auto src_width = (Dst.lPitch / sizeof(short));
+      auto src_height = Dst.dwHeight;
       auto dst = pPixels;
       for (uint y = 0; y < height; ++y)
       {
diff -r 522591080ac5 -r 5e3f4bf3b8e6 mm7_3.cpp
--- a/mm7_3.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/mm7_3.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -14931,710 +14931,834 @@
 // 4F75D8: using guessed type int ai_arrays_size;
 
 //----- (00401A91) --------------------------------------------------------
-void __cdecl UpdateActorAI()
-{
-  //unsigned int v0; // esi@4
-  int v1; // eax@7
-  int v2; // ecx@7
-  int v3; // eax@7
-  signed int v4; // edi@10
-  Actor *v5; // esi@12
-  signed int v6; // eax@14
-  __int16 v7; // cx@14
-  Player **v8; // esi@20
-  Player *pPlayer; // ecx@21
-  //Actor *pActor; // esi@34
-  //__int16 v11; // ax@34
-  //unsigned int v12; // eax@47
-  //signed int v13; // edi@47
-  //SpellBuff *v14; // ebx@47
-  //unsigned int v15; // edi@67
-  //char *v16; // eax@67
-  //unsigned int v17; // edx@67
-  //unsigned int v18; // ecx@67
-  //unsigned __int16 v19; // ax@72
-  //int *v20; // esi@80
-  Actor *v21; // ebx@80
-  unsigned __int16 v22; // ax@86
-  signed int v23; // eax@94
-  unsigned int v24; // eax@102
-  signed int v25; // edi@102
-  SpellBuff *v26; // esi@102
-  unsigned int v27; // ecx@123
-  unsigned int v28; // eax@123
-  unsigned int v29; // eax@127
-  AIDirection *v30; // eax@129
-  unsigned __int16 v31; // ax@132
-  unsigned int v32; // esi@142
-  int v33; // eax@144
-  int v34; // eax@147
-  char v35; // al@150
-  unsigned int v36; // edi@152
-  signed int v37; // eax@154
-  unsigned __int8 v38; // sf@158
-  unsigned __int8 v39; // of@158
-  signed int v40; // edx@166
-  unsigned int v41; // ecx@166
-  double v42; // st7@176
-  double v43; // st6@176
-  bool v44; // eax@189
-  bool v45; // eax@192
-  unsigned __int8 v46; // cl@197
-  double v47; // st7@206
-  double v48; // st7@207
-  char v49; // zf@208
-  char v50; // zf@214
-  signed int v51; // edx@219
-  unsigned int v52; // ecx@219
-  __int16 v53; // fps@224
-  unsigned __int8 v54; // c0@224
-  unsigned __int8 v55; // c3@224
-  double v56; // st7@226
-  AIDirection *v57; // eax@246
-  double v58; // st7@246
-  signed int v59; // [sp-18h] [bp-C8h]@213
-  int v60; // [sp-14h] [bp-C4h]@144
-  int v61; // [sp-14h] [bp-C4h]@168
-  AIDirection *v62; // [sp-14h] [bp-C4h]@213
-  signed int v63; // [sp-14h] [bp-C4h]@216
-  unsigned int v64; // [sp-14h] [bp-C4h]@219
-  unsigned int v65; // [sp-10h] [bp-C0h]@144
-  char v66; // [sp-10h] [bp-C0h]@147
-  AIDirection *v67; // [sp-10h] [bp-C0h]@167
-  int v68; // [sp-10h] [bp-C0h]@168
-  AIDirection *v69; // [sp-10h] [bp-C0h]@206
-  int v70; // [sp-10h] [bp-C0h]@213
-  AIDirection *v71; // [sp-10h] [bp-C0h]@216
-  AIDirection v72; // [sp+0h] [bp-B0h]@246
-  AIDirection a3; // [sp+1Ch] [bp-94h]@129
-  AIDirection v74; // [sp+38h] [bp-78h]@246
-  AIDirection v75; // [sp+54h] [bp-5Ch]@129
-  int v76; // [sp+70h] [bp-40h]@83
-  signed int a1; // [sp+74h] [bp-3Ch]@129
-  int v78; // [sp+78h] [bp-38h]@79
-  AIDirection pDir; // [sp+7Ch] [bp-34h]@129
-  float v80; // [sp+98h] [bp-18h]@33
-  int v81; // [sp+9Ch] [bp-14h]@100
-  int v82; // [sp+A0h] [bp-10h]@45
-  //unsigned int uActorID; // [sp+A4h] [bp-Ch]@32
-  unsigned int v84; // [sp+A8h] [bp-8h]@11
-  signed int a2; // [sp+ACh] [bp-4h]@83
-
-  if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
-    MakeActorAIList_ODM();
-  else
-    MakeActorAIList_BLV();
-
-  //v0 = 0;
-  if ( uCurrentlyLoadedLevelType != LEVEL_Indoor && pParty->armageddon_timer > 0 )
-  {
-    if ( pParty->armageddon_timer > 417 )
-    {
-      pParty->armageddon_timer = 0;
-    }
-    else
-    {
-      pParty->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (pParty->sRotationY + rand() % 16 - 8);
-      v1 = rand();
-      v2 = 128;
-      v3 = pParty->sRotationX + v1 % 16 - 8;
-      pParty->sRotationX = v3;
-      if ( v3 > 128 || (v2 = -128, v3 < -128) )
-        pParty->sRotationX = v2;
-      pParty->uFlags |= 2u;
-      pParty->armageddon_timer -= pMiscTimer->uTimeElapsed;
-      v4 = pParty->field_16140 + 50;
-      if ( pParty->armageddon_timer <= 0 )
-      {
-        pParty->armageddon_timer = 0;
-        v84 = 0;
-        if ( (signed int)uNumActors > 0 )
-        {
-          v5 = pActors;//[0].sCurrentHP;
-          do
-          {
-            if ( v5->CanAct() )
-            {
-              v6 = stru_50C198.CalcMagicalDamageToActor(v5, 5, v4);
-              v7 = v5->sCurrentHP - v6;
-              v5->sCurrentHP = v7;
-              if ( v6 )
-              {
-                if ( v7 >= 0 )
-                {
-                  Actor::_4030AD(v84, 4, 0);
-                }
-                else
-                {
-                  Actor::Die(v84);
-                  if ( v5->pMonsterInfo.uExp )
-                    GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp);
-                }
-              }
-            }
-            ++v84;
-            ++v5;
-          }
-          while ( (signed int)v84 < (signed int)uNumActors );
-        }
-        v8 = &pPlayers[1];
-        do
-        {
-          pPlayer = *v8;
-          if ( !(*v8)->pConditions[14] && !pPlayer->pConditions[15] && !pPlayer->pConditions[16] )
-            pPlayer->ReceiveDamage(v4, 5);
-          ++v8;
-        }
-        while ( (signed int)v8 <= (signed int)&pPlayers[4] );
-        //v0 = 0;
-      }
-      if (pTurnEngine->field_1C)
-        --pTurnEngine->field_1C;
-    }
-  }
-
-  if (pParty->bTurnBasedModeOn)
-  {
-    pTurnEngine->_405E14();
-    return;
-  }
-
-
-  //uActorID = v0;
-  for (uint i = 0; i < uNumActors; ++i)
-  {
-    auto actor = pActors + i;
-    //LODWORD(v80) = (int)(char *)pActors + 176; // uAIState
-    //do
-    //{
-      //pActor = (Actor *)(LODWORD(v80) - 176);
-      //v11 = *(unsigned int *)LODWORD(v80);
-      //v49 = *(unsigned int *)LODWORD(v80) == 5;
-    ai_near_actors_targets_pid[i] = OBJECT_Player;
-    if (actor->uAIState == Dead || actor->uAIState == Removed || actor->uAIState == Disabled || actor->uAttributes & 0x0400)
-      continue;
-
-    if (!actor->sCurrentHP && actor->uAIState != Dying)
-      Actor::Die(i);
-
-    //v84 = *(_QWORD *)(LODWORD(v80) + 84) <= 0i64 ? 0 : 1;
-    //v82 = *(_QWORD *)(LODWORD(v80) + 52) <= 0i64 ? 0 : 1;
-      //v12 = 0;
-      //v13 = 0;
-      //v14 = (SpellBuff *)(LODWORD(v80) + 36);
-    for (uint j = 0; j < 22; ++j)
-    {
-      if (j != 10)
-        actor->pActorBuffs[j]._4585CA(pParty->uTimePlayed);
-    }
-      /*do
-      {
-        if ( v13 != 10 )
-        {
-          v14->_4585CA(pParty->uTimePlayed);
-          v12 = 0;
-        }
-        ++v13;
-        ++v14;
-      }
-      while ( v13 < 22 );*/
-    if (!actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime)
-        //&& SHIDWORD(pActor->pActorBuffs[3].uExpireTime) <= (signed int)v12 && (SHIDWORD(pActor->pActorBuffs[3].uExpireTime) < (signed int)v12
-        // || LODWORD(pActor->pActorBuffs[3].uExpireTime) <= v12) )
-      actor->uActorHeight = pMonsterList->pMonsters[actor->pMonsterInfo.uID - 1].uMonsterHeight;
-    if (actor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime)
-      actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
-    else
-      actor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[actor->pMonsterInfo.uID].uHostilityType;
-
-    if (actor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime ||
-        actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime)
-      continue;
-
-      //v15 = pMiscTimer->uTimeElapsed;
-      //v16 = (char *)&pActor->pMonsterInfo.uRecoveryTime;
-      //v17 = pActor->uCurrentActionTime;
-      //v18 = pActor->pMonsterInfo.uRecoveryTime;
-    if (actor->pMonsterInfo.uRecoveryTime)
-    {
-      if (actor->pMonsterInfo.uRecoveryTime < pMiscTimer->uTimeElapsed)
-        actor->pMonsterInfo.uRecoveryTime = 0;
-      else actor->pMonsterInfo.uRecoveryTime -= pMiscTimer->uTimeElapsed;
-    }
-    
-    actor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
-    if (actor->uCurrentActionTime < actor->uCurrentActionLength)
-      continue;
-
-      //v19 = actor->uAIState;
-    if (actor->uAIState == Dying)
-        actor->uAIState = Dead;
-    else
-    {
-      if (actor->uAIState != Summoned)
-      {
-        Actor::AI_StandOrBored(i, OBJECT_Player, 256, nullptr);
-        continue;
-      }
-      actor->uAIState = Standing;
-    }
-
-    actor->uCurrentActionTime = 0;
-    actor->uCurrentActionLength = 0;
-    actor->UpdateAnimation();
-//LABEL_78:
-      //++uActorID;
-      //LODWORD(v80) += 836;
-    //}
-    //while ( (signed int)uActorID < (signed int)uNumActors );
-  }
-
-
-  v78 = 0;
-  int actor_id = -1;
-  if ( ai_arrays_size > 0 )
-  {
-    while ( 1 )
-    {
-      actor_id = ai_near_actors_ids[v78];
-      assert(actor_id < uNumActors);
-
-      //v20 = &ai_near_actors_targets_pid[actor_id];
-      v21 = &pActors[actor_id];
-      Actor::_SelectTarget(actor_id, &ai_near_actors_targets_pid[actor_id], true);
-      if (v21->pMonsterInfo.uHostilityType && !ai_near_actors_targets_pid[actor_id])
-        v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
-      a2 = ai_near_actors_targets_pid[actor_id];
-      v76 = a2 & 7;
-      if ( (a2 & 7) == OBJECT_Actor)
-        v80 = 0.5;
-      else
-        v80 = 1.0;
-      v22 = v21->uAIState;
-      if ( v22 == Dying || v22 == Dead || v22 == Removed || v22 == Disabled || v22 == Summoned)
-        goto LABEL_254;
-      if ( !v21->sCurrentHP )
-        Actor::Die(actor_id);
-      if ( (signed __int64)v21->pActorBuffs[3].uExpireTime <= 0 )
-      {
-        v84 = 0;
-        v23 = 1;
-      }
-      else
-      {
-        v23 = 1;
-        v84 = 1;
-      }
-      if ( (signed __int64)v21->pActorBuffs[1].uExpireTime <= 0 )
-        v82 = 0;
-      else
-        v82 = v23;
-      if ( (signed __int64)v21->pActorBuffs[2].uExpireTime <= 0 )
-        v81 = 0;
-      else
-        v81 = v23;
-      v24 = 0;
-      v25 = 0;
-      v26 = v21->pActorBuffs;
-      do
-      {
-        if ( v25 != 10 )
-        {
-          v26->_4585CA(pParty->uTimePlayed);
-          v24 = 0;
-        }
-        ++v25;
-        ++v26;
-      }
-      while ( v25 < 22 );
-      if ( v84 != v24
-        && SHIDWORD(v21->pActorBuffs[3].uExpireTime) <= (signed int)v24
-        && (SHIDWORD(v21->pActorBuffs[3].uExpireTime) < (signed int)v24
-         || LODWORD(v21->pActorBuffs[3].uExpireTime) <= v24) )
-        v21->uActorHeight = pMonsterList->pMonsters[v21->pMonsterInfo.uID - 1].uMonsterHeight;
-      if ( v82 != v24 )
-      {
-        v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
-        if ( SHIDWORD(v21->pActorBuffs[1].uExpireTime) <= (signed int)v24 )
-        {
-          if ( SHIDWORD(v21->pActorBuffs[1].uExpireTime) < (signed int)v24
-            || LODWORD(v21->pActorBuffs[1].uExpireTime) <= v24 )
-            v21->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[v21->pMonsterInfo.uID].uHostilityType;
-        }
-      }
-      if ( v81 != v24
-        && SHIDWORD(v21->pActorBuffs[2].uExpireTime) <= (signed int)v24
-        && (SHIDWORD(v21->pActorBuffs[2].uExpireTime) < (signed int)v24
-         || LODWORD(v21->pActorBuffs[2].uExpireTime) <= v24) )
-      {
-        v21->uAIState = Removed;
-        goto LABEL_254;
-      }
-      if ( v21->pActorBuffs[5].uExpireTime || v21->pActorBuffs[6].uExpireTime )
-        goto LABEL_254;
-      v27 = pMiscTimer->uTimeElapsed;
-      v28 = v21->pMonsterInfo.uRecoveryTime;
-      v21->uCurrentActionTime += pMiscTimer->uTimeElapsed;
-      if ( (signed int)v28 > 0 )
-        v21->pMonsterInfo.uRecoveryTime = v28 - v27;
-      if ( v21->pMonsterInfo.uRecoveryTime< 0 )
-        v21->pMonsterInfo.uRecoveryTime = 0;
-      v29 = v21->uAttributes;
-      if ( !(v29 & 0x8000) )
-        v21->uAttributes = v29 | 0x8000;
-      a1 = 8 * actor_id | OBJECT_Actor;
-      v30 = Actor::GetDirectionInfo(8 * actor_id | OBJECT_Actor, a2, &a3, 0);
-      v49 = v21->pMonsterInfo.uHostilityType == 0;
-      memcpy(&v75, v30, sizeof(v75));
-      memcpy(&pDir, &v75, sizeof(pDir));
-      if ( !v49 && (signed int)v21->pMonsterInfo.uRecoveryTime <= 0 )
-      {
-        if ( v80 * 307.2 >= (double)(signed int)v75.uDistance
-          && ((v31 = v21->uAIState, v31 == 6) || !v31 || v31 == 1 || v31 == 9)
-          || v21->pMonsterInfo.uMissleAttack1Type && v21->uAIState == 8 )
-        {
-          v32 = actor_id;
-          goto LABEL_152;
-        }
-      }
-      if ( (signed int)v21->uCurrentActionTime < v21->uCurrentActionLength )
-        goto LABEL_254;
-      if ( v21->uAIState == 2 )
-      {
-        v32 = actor_id;
-        v35 = stru_50C198.special_ability_use_check(v21, actor_id);
-        stru_50FE08.Add(
-          a1,
-          5120,
-          v21->vPosition.x,
-          v21->vPosition.y,
-          v21->vPosition.z + ((signed int)v21->uActorHeight >> 1),
-          v35,
-          1);
-        goto LABEL_152;
-      }
-      if ( v21->uAIState == 3 )
-      {
-        v34 = v21->pMonsterInfo.uMissleAttack1Type;
-        v66 = 0;
-        goto LABEL_149;
-      }
-      if ( v21->uAIState == 12 )
-      {
-        v34 = v21->pMonsterInfo.uMissleAttack2Type;
-        v66 = 1;
-LABEL_149:
-        v32 = actor_id;
-        Actor::_404874(actor_id, &pDir, v34, v66);
-        goto LABEL_152;
-      }
-      v32 = actor_id;
-      if ( v21->uAIState == 13 )
-        break;
-      if ( v21->uAIState == 18 )
-      {
-        v65 = v21->pMonsterInfo.uSpellSkillAndMastery2;
-        v60 = 3;
-        v33 = v21->pMonsterInfo.uSpell2ID;
-LABEL_146:
-        Actor::_404AC7(actor_id, &pDir, v33, v60, v65);
-      }
-LABEL_152:
-      v36 = v75.uDistance;
-      if ( v21->pMonsterInfo.uHostilityType )
-        goto LABEL_165;
-      if ( v76 == 3 )
-      {
-        v36 = v75.uDistance;
-        v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (v21->pMonsterInfo.uID - 1) / 3]
-                               + (pActors[a2 >> 3].pMonsterInfo.uID - 1) / 3);
-      }
-      else
-      {
-        v37 = 4;
-      }
-      if ( v37 == 1 )
-        goto LABEL_257;
-      if ( v37 == 2 )
-      {
-        v39 = __OFSUB__(v36, 1024);
-        v38 = ((v36 - 1024) & 0x80000000u) != 0;
-      }
-      else
-      {
-        if ( v37 == 3 )
-        {
-          v39 = __OFSUB__(v36, 2560);
-          v38 = ((v36 - 2560) & 0x80000000u) != 0;
-        }
-        else
-        {
-          if ( v37 != 4 )
-            goto LABEL_165;
-          v39 = __OFSUB__(v36, 5120);
-          v38 = ((v36 - 5120) & 0x80000000u) != 0;
-        }
-      }
-      if ( v38 ^ v39 )
-LABEL_257:
-      v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
-LABEL_165:
-      if ( (signed __int64)v21->pActorBuffs[4].uExpireTime > 0 )
-      {
-        v40 = a2;
-        v41 = v32;
-        if ( (signed int)v36 >= 10240 )
-        {
-          v68 = 0;
-          v61 = 1024;
-          goto LABEL_253;
-        }
-        v67 = &pDir;
-        goto LABEL_182;
-      }
-      if ( v21->pMonsterInfo.uHostilityType != 4 || !a2 )
-        goto LABEL_241;
-      if ( !(v21->uAttributes & 0x020000) || v21->pMonsterInfo.uAIType == 1 )
-      {
-        if ( v21->pMonsterInfo.uAIType == 1 )
-        {
-          v67 = &pDir;
-          if ( v21->pMonsterInfo.uMovementType != 5 )
-            goto LABEL_181;
-          Actor::AI_Stand(
-            v32,
-            a2,
-            (signed __int64)((double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333),
-            &pDir);
-        }
-        else
-        {
-          if ( v21->pMonsterInfo.uAIType == 2 )
-          {
-            v84 = v21->sCurrentHP;
-            v42 = (double)(signed int)v84;
-            v43 = (double)(signed int)v21->pMonsterInfo.uHP * 0.2;
-          }
-          else
-          {
-            if ( v21->pMonsterInfo.uAIType != 3 )
-              goto LABEL_185;
-            v84 = v21->sCurrentHP;
-            v42 = (double)(signed int)v84;
-            v43 = (double)(signed int)v21->pMonsterInfo.uHP * 0.1;
-          }
-          if ( v43 > v42 && (signed int)v36 < 10240 )
-          {
-            v67 = &pDir;
-LABEL_181:
-            v40 = a2;
-            v41 = v32;
-LABEL_182:
-            Actor::_402968(v41, v40, 0, v67);
-            goto LABEL_254;
-          }
-        }
-      }
-LABEL_185:
-      v81 = v36 - v21->uActorRadius;
-      if ( v76 == 3 )
-        v81 -= pActors[a2 >> 3].uActorRadius;
-      if ( v81 < 0 )
-        v81 = 0;
-      rand();
-      v44 = (signed int)v21->pMonsterInfo.uRecoveryTime <= 0;
-      v21->uAttributes &= 0xFBFFFF;
-      v82 = 0;
-      v49 = v21->pMonsterInfo.uMovementType == 5;
-      v84 = v44;
-      if ( v49 )
-        v82 = 1;
-      if ( v81 >= 5120 )
-        goto LABEL_241;
-      v45 = stru_50C198.special_ability_use_check(v21, v32);
-      if ( !v45 )
-      {
-        if ( v21->pMonsterInfo.uMissleAttack1Type )
-        {
-          if ( v84 )
-          {
-            Actor::_403476(v32, a2, &pDir);
-            goto LABEL_254;
-          }
-LABEL_223:
-          if ( v82 )
-            goto LABEL_217;
-          v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
-          //UNDEF(v53);
-          v69 = &pDir;
-          if ( !(v54 | v55) )
-            goto LABEL_219;
-LABEL_225:
-          Actor::_402AD7(v32, a2, v32, (signed __int64)v47, v69);
-          goto LABEL_254;
-        }
-        v56 = v80 * 307.2;
-        if ( (double)v81 >= v56 )
-        {
-          if ( v81 >= 1024 )
-          {
-            if ( v82 )
-              goto LABEL_217;
-            v71 = &pDir;
-            v63 = 0;
-            goto LABEL_240;
-          }
-          goto LABEL_235;
-        }
-        goto LABEL_227;
-      }
-      if ( v45 != 1 )
-      {
-        if ( v45 > 1 && v45 <= 3 )
-        {
-          if ( v45 == 2 )
-            v46 = v21->pMonsterInfo.uSpell1ID;
-          else
-            v46 = v21->pMonsterInfo.uSpell2ID;
-          if ( v46 )
-          {
-            if ( v84 )
-            {
-              if ( v45 == 2 )
-                Actor::_403854(v32, a2, &pDir);
-              else
-                Actor::_403A60(v32, a2, &pDir);
-              goto LABEL_254;
-            }
-            if ( v80 * 307.2 > (double)v81 || v82 )
-            {
-LABEL_217:
-              v69 = &pDir;
-LABEL_218:
-              v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
-LABEL_219:
-              v51 = a2;
-              v64 = (signed __int64)v47;
-              v52 = v32;
-LABEL_247:
-              Actor::AI_Stand(v52, v51, v64, v69);
-              goto LABEL_254;
-            }
-            v69 = &pDir;
-            v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
-            goto LABEL_225;
-          }
-          v48 = v80 * 307.2;
-          if ( (double)v81 >= v48 )
-          {
-            if ( v81 >= 1024 )
-            {
-              v50 = v82 == 0;
-LABEL_215:
-              if ( !v50 )
-                goto LABEL_217;
-              v71 = &pDir;
-              v63 = 256;
-LABEL_240:
-              Actor::_402686(v32, a2, v63, v71);
-              goto LABEL_254;
-            }
-            if ( v82 )
-              goto LABEL_217;
-            v70 = (signed __int64)v48;
-            v62 = &pDir;
-            v59 = 0;
-            goto LABEL_237;
-          }
-          v49 = v84 == 0;
-          goto LABEL_209;
-        }
-LABEL_241:
-        if ( !v21->pMonsterInfo.uMovementType )
-        {
-          v68 = 0;
-          v61 = 1024;
-LABEL_252:
-          v41 = v32;
-          v40 = 4;
-LABEL_253:
-          Actor::_4032B2(v41, v40, v61, v68);
-          goto LABEL_254;
-        }
-        if ( v21->pMonsterInfo.uMovementType == 1 )
-        {
-          v68 = 0;
-          v61 = 2560;
-          goto LABEL_252;
-        }
-        if ( v21->pMonsterInfo.uMovementType == 2 )
-        {
-          v68 = 0;
-          v61 = 5120;
-          goto LABEL_252;
-        }
-        if ( v21->pMonsterInfo.uMovementType == 4 )
-        {
-          v68 = 0;
-          v61 = 10240;
-          goto LABEL_252;
-        }
-        if ( v21->pMonsterInfo.uMovementType == 5 )
-        {
-          v57 = Actor::GetDirectionInfo(a1, 4u, &v72, 0);
-          v58 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
-          memcpy(&v74, v57, sizeof(v74));
-          memcpy(&pDir, &v74, sizeof(pDir));
-          v69 = &pDir;
-          v52 = actor_id;
-          v64 = (signed __int64)v58;
-          v51 = 4;
-          goto LABEL_247;
-        }
-        goto LABEL_254;
-      }
-      if ( !v21->pMonsterInfo.uMissleAttack2Type )
-      {
-        v56 = v80 * 307.2;
-        if ( (double)v81 >= v56 )
-        {
-          if ( v81 >= 1024 )
-          {
-            v50 = v82 == 0;
-            goto LABEL_215;
-          }
-LABEL_235:
-          if ( v82 )
-            goto LABEL_217;
-          v70 = (signed __int64)v56;
-          v62 = &pDir;
-          v59 = 0;
-LABEL_237:
-          Actor::_40281C(v32, a2, v59, v62, v70);
-          goto LABEL_254;
-        }
-LABEL_227:
-        v49 = v84 == 0;
-LABEL_209:
-        v69 = &pDir;
-        if ( v49 )
-          goto LABEL_218;
-        Actor::_403C6C(v32, a2, &pDir);
-        goto LABEL_254;
-      }
-      if ( !v84 )
-        goto LABEL_223;
-      Actor::_40368B(v32, a2, &pDir);
-LABEL_254:
-      ++v78;
-      if ( v78 >= ai_arrays_size )
-        return;
-    }
-    v65 = v21->pMonsterInfo.uSpellSkillAndMastery1;
-    v60 = 2;
-    v33 = v21->pMonsterInfo.uSpell1ID;
-    goto LABEL_146;
-  }
+void __cdecl UpdateActorAI()
+{
+	//unsigned int v0; // esi@4
+	int v1; // eax@7
+	int v2; // ecx@7
+	int v3; // eax@7
+	signed int v4; // edi@10
+	Actor *v5; // esi@12
+	signed int v6; // eax@14
+	__int16 v7; // cx@14
+	Player **v8; // esi@20
+	Player *pPlayer; // ecx@21
+	//Actor *pActor; // esi@34
+	//__int16 v11; // ax@34
+	//unsigned int v12; // eax@47
+	//signed int v13; // edi@47
+	//SpellBuff *v14; // ebx@47
+	//unsigned int v15; // edi@67
+	//char *v16; // eax@67
+	//unsigned int v17; // edx@67
+	//unsigned int v18; // ecx@67
+	//unsigned __int16 v19; // ax@72
+	//int *v20; // esi@80
+	Actor *v21; // ebx@80
+	unsigned __int16 v22; // ax@86
+	//signed int v23; // eax@94
+	//unsigned int v24; // eax@102
+	signed int v25; // edi@102
+	SpellBuff *v26; // esi@102
+	unsigned int v27; // ecx@123
+	unsigned int v28; // eax@123
+	unsigned int v29; // eax@127
+	AIDirection *v30; // eax@129
+	unsigned __int16 v31; // ax@132
+	unsigned int v32; // esi@142
+	int v33; // eax@144
+	int v34; // eax@147
+	char v35; // al@150
+	unsigned int v36; // edi@152
+	signed int v37; // eax@154
+	unsigned __int8 v38; // sf@158
+	unsigned __int8 v39; // of@158
+	signed int v40; // edx@166
+	unsigned int v41; // ecx@166
+	double v42; // st7@176
+	double v43; // st6@176
+	bool v44; // eax@189
+	bool v45; // eax@192
+	unsigned __int8 v46; // cl@197
+	double v47; // st7@206
+	double v48; // st7@207
+	char v49; // zf@208
+	char v50; // zf@214
+	signed int v51; // edx@219
+	unsigned int v52; // ecx@219
+	__int16 v53; // fps@224
+	unsigned __int8 v54; // c0@224
+	unsigned __int8 v55; // c3@224
+	double v56; // st7@226
+	AIDirection *v57; // eax@246
+	double v58; // st7@246
+	signed int v59; // [sp-18h] [bp-C8h]@213
+	int v60; // [sp-14h] [bp-C4h]@144
+	int v61; // [sp-14h] [bp-C4h]@168
+	AIDirection *v62; // [sp-14h] [bp-C4h]@213
+	signed int v63; // [sp-14h] [bp-C4h]@216
+	unsigned int v64; // [sp-14h] [bp-C4h]@219
+	unsigned int v65; // [sp-10h] [bp-C0h]@144
+	char v66; // [sp-10h] [bp-C0h]@147
+	AIDirection *v67; // [sp-10h] [bp-C0h]@167
+	int v68; // [sp-10h] [bp-C0h]@168
+	AIDirection *v69; // [sp-10h] [bp-C0h]@206
+	int v70; // [sp-10h] [bp-C0h]@213
+	AIDirection *v71; // [sp-10h] [bp-C0h]@216
+	AIDirection v72; // [sp+0h] [bp-B0h]@246
+	AIDirection a3; // [sp+1Ch] [bp-94h]@129
+	AIDirection v74; // [sp+38h] [bp-78h]@246
+	AIDirection v75; // [sp+54h] [bp-5Ch]@129
+	int v76; // [sp+70h] [bp-40h]@83
+	signed int a1; // [sp+74h] [bp-3Ch]@129
+	int v78; // [sp+78h] [bp-38h]@79
+	AIDirection pDir; // [sp+7Ch] [bp-34h]@129
+	float v80; // [sp+98h] [bp-18h]@33
+	int v81; // [sp+9Ch] [bp-14h]@100
+	int v82; // [sp+A0h] [bp-10h]@45
+	//unsigned int uActorID; // [sp+A4h] [bp-Ch]@32
+	unsigned int v84; // [sp+A8h] [bp-8h]@11
+	signed int a2; // [sp+ACh] [bp-4h]@83
+	
+	if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
+	MakeActorAIList_ODM();
+	else
+	MakeActorAIList_BLV();
+	
+	//v0 = 0;
+	if ( uCurrentlyLoadedLevelType != LEVEL_Indoor && pParty->armageddon_timer > 0 )
+	{
+		if ( pParty->armageddon_timer > 417 )
+		{
+			pParty->armageddon_timer = 0;
+		}
+		else
+		{
+			pParty->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (pParty->sRotationY + rand() % 16 - 8);
+			v1 = rand();
+			v2 = 128;
+			v3 = pParty->sRotationX + v1 % 16 - 8;
+			pParty->sRotationX = v3;
+			if ( v3 > 128 || (v2 = -128, v3 < -128) )
+			pParty->sRotationX = v2;
+			pParty->uFlags |= 2u;
+			pParty->armageddon_timer -= pMiscTimer->uTimeElapsed;
+			v4 = pParty->field_16140 + 50;
+			if ( pParty->armageddon_timer <= 0 )
+			{
+				pParty->armageddon_timer = 0;
+				v84 = 0;
+				if ( (signed int)uNumActors > 0 )
+				{
+					v5 = pActors;//[0].sCurrentHP;
+					do
+					{
+						if ( v5->CanAct() )
+						{
+							v6 = stru_50C198.CalcMagicalDamageToActor(v5, 5, v4);
+							v7 = v5->sCurrentHP - v6;
+							v5->sCurrentHP = v7;
+							if ( v6 )
+							{
+								if ( v7 >= 0 )
+								{
+									Actor::_4030AD(v84, 4, 0);
+								}
+								else
+								{
+									Actor::Die(v84);
+									if ( v5->pMonsterInfo.uExp )
+									GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp);
+								}
+							}
+						}
+						++v84;
+						++v5;
+					}
+					while ( (signed int)v84 < (signed int)uNumActors );
+				}
+				v8 = &pPlayers[1];
+				do
+				{
+					pPlayer = *v8;
+					if ( !(*v8)->pConditions[14] && !pPlayer->pConditions[15] && !pPlayer->pConditions[16] )
+					pPlayer->ReceiveDamage(v4, 5);
+					++v8;
+				}
+				while ( (signed int)v8 <= (signed int)&pPlayers[4] );
+				//v0 = 0;
+			}
+			if (pTurnEngine->field_1C)
+			--pTurnEngine->field_1C;
+		}
+	}
+	
+	if (pParty->bTurnBasedModeOn)
+	{
+		pTurnEngine->_405E14();
+		return;
+	}
+	
+	
+	//uActorID = v0;
+	for (uint i = 0; i < uNumActors; ++i)
+	{
+		auto actor = pActors + i;
+		//LODWORD(v80) = (int)(char *)pActors + 176; // uAIState
+		//do
+		//{
+			//pActor = (Actor *)(LODWORD(v80) - 176);
+			//v11 = *(unsigned int *)LODWORD(v80);
+			//v49 = *(unsigned int *)LODWORD(v80) == 5;
+			ai_near_actors_targets_pid[i] = OBJECT_Player;
+			if (actor->uAIState == Dead || actor->uAIState == Removed || actor->uAIState == Disabled || actor->uAttributes & 0x0400)
+			continue;
+			
+			if (!actor->sCurrentHP && actor->uAIState != Dying)
+			Actor::Die(i);
+			
+			//v84 = *(_QWORD *)(LODWORD(v80) + 84) <= 0i64 ? 0 : 1;
+			//v82 = *(_QWORD *)(LODWORD(v80) + 52) <= 0i64 ? 0 : 1;
+			//v12 = 0;
+			//v13 = 0;
+			//v14 = (SpellBuff *)(LODWORD(v80) + 36);
+			for (uint j = 0; j < 22; ++j)
+			{
+				if (j != 10)
+				actor->pActorBuffs[j]._4585CA(pParty->uTimePlayed);
+			}
+			/*do
+			{
+				if ( v13 != 10 )
+				{
+					v14->_4585CA(pParty->uTimePlayed);
+					v12 = 0;
+				}
+				++v13;
+				++v14;
+			}
+			while ( v13 < 22 );*/
+			if (!actor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime)
+			//&& SHIDWORD(pActor->pActorBuffs[3].uExpireTime) <= (signed int)v12 && (SHIDWORD(pActor->pActorBuffs[3].uExpireTime) < (signed int)v12
+			// || LODWORD(pActor->pActorBuffs[3].uExpireTime) <= v12) )
+			actor->uActorHeight = pMonsterList->pMonsters[actor->pMonsterInfo.uID - 1].uMonsterHeight;
+			if (actor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime)
+			actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
+			else
+			actor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[actor->pMonsterInfo.uID].uHostilityType;
+			
+			if (actor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime ||
+			actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime)
+			continue;
+			
+			//v15 = pMiscTimer->uTimeElapsed;
+			//v16 = (char *)&pActor->pMonsterInfo.uRecoveryTime;
+			//v17 = pActor->uCurrentActionTime;
+			//v18 = pActor->pMonsterInfo.uRecoveryTime;
+			if (actor->pMonsterInfo.uRecoveryTime)
+			{
+				if (actor->pMonsterInfo.uRecoveryTime < pMiscTimer->uTimeElapsed)
+				actor->pMonsterInfo.uRecoveryTime = 0;
+				else actor->pMonsterInfo.uRecoveryTime -= pMiscTimer->uTimeElapsed;
+			}
+			
+			actor->uCurrentActionTime += pMiscTimer->uTimeElapsed;
+			if (actor->uCurrentActionTime < actor->uCurrentActionLength)
+			continue;
+			
+			//v19 = actor->uAIState;
+			if (actor->uAIState == Dying)
+			actor->uAIState = Dead;
+			else
+			{
+				if (actor->uAIState != Summoned)
+				{
+					Actor::AI_StandOrBored(i, OBJECT_Player, 256, nullptr);
+					continue;
+				}
+				actor->uAIState = Standing;
+			}
+			
+			actor->uCurrentActionTime = 0;
+			actor->uCurrentActionLength = 0;
+			actor->UpdateAnimation();
+			//LABEL_78:
+			//++uActorID;
+			//LODWORD(v80) += 836;
+		//}
+		//while ( (signed int)uActorID < (signed int)uNumActors );
+	}
+	
+	
+	v78 = 0;
+	int actor_id = -1;
+	if ( ai_arrays_size > 0 )
+	{
+		//while ( 1 )
+		for(v78 = 0; v78 < ai_arrays_size; ++v78)
+		{
+			actor_id = ai_near_actors_ids[v78];
+			assert(actor_id < uNumActors);
+			
+			//v20 = &ai_near_actors_targets_pid[actor_id];
+			v21 = &pActors[actor_id];
+			Actor::_SelectTarget(actor_id, &ai_near_actors_targets_pid[actor_id], true);
+			if (v21->pMonsterInfo.uHostilityType && !ai_near_actors_targets_pid[actor_id])
+			v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
+			a2 = ai_near_actors_targets_pid[actor_id];
+			v76 = a2 & 7;
+			if ( (a2 & 7) == OBJECT_Actor)
+			v80 = 0.5;
+			else
+			v80 = 1.0;
+			v22 = v21->uAIState;
+			if ( v22 == Dying || v22 == Dead || v22 == Removed || v22 == Disabled || v22 == Summoned)
+			{
+				continue;
+			}
+			else
+			{
+				if ( !v21->sCurrentHP )
+				Actor::Die(actor_id);
+				v25 = 0;
+				v26 = v21->pActorBuffs;
+				do
+				{
+					if ( v25 != 10 )
+					{
+						v26->_4585CA(pParty->uTimePlayed);
+						//v24 = 0;
+					}
+					++v25;
+					++v26;
+				}
+				while ( v25 < 22 );
+				if ( (signed __int64)v21->pActorBuffs[3].uExpireTime > 0
+				&& SHIDWORD(v21->pActorBuffs[3].uExpireTime) <= 0
+				&& (SHIDWORD(v21->pActorBuffs[3].uExpireTime) < 0
+				|| LODWORD(v21->pActorBuffs[3].uExpireTime) <= 0) )
+				v21->uActorHeight = pMonsterList->pMonsters[v21->pMonsterInfo.uID - 1].uMonsterHeight;
+				if ( (signed __int64)v21->pActorBuffs[1].uExpireTime > 0 )
+				{
+					v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
+					if ( SHIDWORD(v21->pActorBuffs[1].uExpireTime) <= 0 )
+					{
+						if ( SHIDWORD(v21->pActorBuffs[1].uExpireTime) < 0
+						|| LODWORD(v21->pActorBuffs[1].uExpireTime) <= 0 )
+						v21->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[v21->pMonsterInfo.uID].uHostilityType;
+					}
+				}
+				if ( (signed __int64)v21->pActorBuffs[2].uExpireTime > 0
+				&& SHIDWORD(v21->pActorBuffs[2].uExpireTime) <= 0
+				&& (SHIDWORD(v21->pActorBuffs[2].uExpireTime) < 0
+				|| LODWORD(v21->pActorBuffs[2].uExpireTime) <= 0) )
+				{
+					v21->uAIState = Removed;
+					continue;
+				}
+				else if ( v21->pActorBuffs[5].uExpireTime || v21->pActorBuffs[6].uExpireTime )
+				{
+					continue;
+				}
+				else
+				{
+					v27 = pMiscTimer->uTimeElapsed;
+					v28 = v21->pMonsterInfo.uRecoveryTime;
+					v21->uCurrentActionTime += pMiscTimer->uTimeElapsed;
+					if ( (signed int)v28 > 0 )
+					v21->pMonsterInfo.uRecoveryTime = v28 - v27;
+					if ( v21->pMonsterInfo.uRecoveryTime< 0 )
+					v21->pMonsterInfo.uRecoveryTime = 0;
+					v29 = v21->uAttributes;
+					if ( !(v29 & 0x8000) )
+					v21->uAttributes = v29 | 0x8000;
+					a1 = 8 * actor_id | OBJECT_Actor;
+					v30 = Actor::GetDirectionInfo(8 * actor_id | OBJECT_Actor, a2, &a3, 0);
+					v49 = v21->pMonsterInfo.uHostilityType == 0;
+					memcpy(&v75, v30, sizeof(v75));
+					memcpy(&pDir, &v75, sizeof(pDir));
+					if ( !v49
+					&& (signed int)v21->pMonsterInfo.uRecoveryTime <= 0
+					&& v80 * 307.2 >= (double)(signed int)v75.uDistance
+					&& ((v31 = v21->uAIState, v31 == 6) || !v31 || v31 == 1 || v31 == 9)
+					|| v21->pMonsterInfo.uMissleAttack1Type && v21->uAIState == 8 )
+					{
+						v32 = actor_id;
+					}
+					else
+					{
+						if ( (signed int)v21->uCurrentActionTime < v21->uCurrentActionLength )
+						{
+							continue;
+						}
+						else if ( v21->uAIState == 2 )
+						{
+							v32 = actor_id;
+							v35 = stru_50C198.special_ability_use_check(v21, actor_id);
+							stru_50FE08.Add(
+							a1,
+							5120,
+							v21->vPosition.x,
+							v21->vPosition.y,
+							v21->vPosition.z + ((signed int)v21->uActorHeight >> 1),
+							v35,
+							1
+							);
+						}
+						else if ( v21->uAIState == 3 )
+						{
+							v34 = v21->pMonsterInfo.uMissleAttack1Type;
+							v66 = 0;
+							v32 = actor_id;
+							Actor::_404874(actor_id, &pDir, v34, v66);
+						}
+						else if ( v21->uAIState == 12 )
+						{
+							v34 = v21->pMonsterInfo.uMissleAttack2Type;
+							v66 = 1;
+							v32 = actor_id;
+							Actor::_404874(actor_id, &pDir, v34, v66);
+						}
+						else
+						{
+							v32 = actor_id;
+							if ( v21->uAIState == 13 )
+							{
+								v65 = v21->pMonsterInfo.uSpellSkillAndMastery1;
+								v60 = 2;
+								v33 = v21->pMonsterInfo.uSpell1ID;
+								Actor::_404AC7(actor_id, &pDir, v33, v60, v65);
+							}
+							else if ( v21->uAIState == 18 )
+							{
+								v65 = v21->pMonsterInfo.uSpellSkillAndMastery2;
+								v60 = 3;
+								v33 = v21->pMonsterInfo.uSpell2ID;
+								Actor::_404AC7(actor_id, &pDir, v33, v60, v65);
+							}
+						}
+					}
+				}
+			}
+			v36 = v75.uDistance;
+			if ( !v21->pMonsterInfo.uHostilityType )
+			{
+				if ( v76 == 3 )
+				{
+					v36 = v75.uDistance;
+					v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (v21->pMonsterInfo.uID - 1) / 3]
+					+ (pActors[a2 >> 3].pMonsterInfo.uID - 1) / 3);
+				}
+				else
+				{
+					v37 = 4;
+				}
+				if ( v37 == 2 )
+				{
+					v39 = __OFSUB__(v36, 1024);
+					v38 = ((v36 - 1024) & 0x80000000u) != 0;
+				}
+				else if ( v37 == 3 )
+				{
+					v39 = __OFSUB__(v36, 2560);
+					v38 = ((v36 - 2560) & 0x80000000u) != 0;
+				}
+				else if ( v37 == 4 )
+				{
+					v39 = __OFSUB__(v36, 5120);
+					v38 = ((v36 - 5120) & 0x80000000u) != 0;
+				}
+				if ( v37 >= 1 && v37 <= 4 && v38 ^ v39 || v37 == 1 )
+				v21->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
+			}
+			if ( (signed __int64)v21->pActorBuffs[4].uExpireTime > 0 )
+			{
+				v40 = a2;
+				v41 = v32;
+				if ( (signed int)v36 >= 10240 )
+				{
+					v68 = 0;
+					v61 = 1024;
+					Actor::_4032B2(v41, v40, v61, v68);
+					continue;
+				}
+				v67 = &pDir;
+				Actor::_402968(v41, v40, 0, v67);
+				continue;
+			}
+			if ( v21->pMonsterInfo.uHostilityType == 4 && a2 )
+			{
+				if ( !(v21->uAttributes & 0x020000) || v21->pMonsterInfo.uAIType == 1 )
+				{
+					if ( v21->pMonsterInfo.uAIType == 1 )
+					{
+						v67 = &pDir;
+						if ( v21->pMonsterInfo.uMovementType != 5 )
+						{
+							v40 = a2;
+							v41 = v32;
+							Actor::_402968(v41, v40, 0, v67);
+							continue;
+						}
+						Actor::AI_Stand(
+						v32,
+						a2,
+						(signed __int64)((double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333),
+						&pDir);
+					}
+					else
+					{
+						if ( v21->pMonsterInfo.uAIType == 2 )
+						{
+							v84 = v21->sCurrentHP;
+							v42 = (double)(signed int)v84;
+							v43 = (double)(signed int)v21->pMonsterInfo.uHP * 0.2;
+						}
+						else
+						{
+							v84 = v21->sCurrentHP;
+							v42 = (double)(signed int)v84;
+							v43 = (double)(signed int)v21->pMonsterInfo.uHP * 0.1;
+						}
+						if ( v21->pMonsterInfo.uAIType == 2 || v21->pMonsterInfo.uAIType == 3 )
+						if ( v43 > v42 && (signed int)v36 < 10240 )
+						{
+							v67 = &pDir;
+							v40 = a2;
+							v41 = v32;
+							Actor::_402968(v41, v40, 0, v67);
+							continue;
+						}
+					}
+				}
+				v81 = v36 - v21->uActorRadius;
+				if ( v76 == 3 )
+				v81 -= pActors[a2 >> 3].uActorRadius;
+				if ( v81 < 0 )
+				v81 = 0;
+				rand();
+				v44 = (signed int)v21->pMonsterInfo.uRecoveryTime <= 0;
+				v21->uAttributes &= 0xFBFFFF;
+				v82 = 0;
+				v49 = v21->pMonsterInfo.uMovementType == 5;
+				v84 = v44;
+				if ( v49 )
+				v82 = 1;
+				if ( v81 < 5120 )
+				{
+					v45 = stru_50C198.special_ability_use_check(v21, v32);
+					if ( !v45 )
+					{
+						if ( v21->pMonsterInfo.uMissleAttack1Type )
+						{
+							if ( v84 )
+							{
+								Actor::_403476(v32, a2, &pDir);
+								continue;
+								
+							}
+							if ( v82 )
+							{
+								v69 = &pDir;
+								v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+								v51 = a2;
+								v64 = (signed __int64)v47;
+								v52 = v32;
+								Actor::AI_Stand(v52, v51, v64, v69);
+								continue;
+							}
+							v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+							//UNDEF(v53);
+							v69 = &pDir;
+							if ( !(v54 | v55) )
+							{
+								v51 = a2;
+								v64 = (signed __int64)v47;
+								v52 = v32;
+								Actor::AI_Stand(v52, v51, v64, v69);
+								continue;
+							}
+							Actor::_402AD7(v32, a2, v32, (signed __int64)v47, v69);
+							continue;
+						}
+						v56 = v80 * 307.2;
+						if ( (double)v81 >= v56 )
+						{
+							if ( v81 >= 1024 )
+							{
+								if ( v82 )
+								{
+									v69 = &pDir;
+									v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+									v51 = a2;
+									v64 = (signed __int64)v47;
+									v52 = v32;
+									Actor::AI_Stand(v52, v51, v64, v69);
+									continue;
+								}
+								v71 = &pDir;
+								v63 = 0;
+								
+								Actor::_402686(v32, a2, v63, v71);
+								continue;
+							}
+							if ( v82 )
+							{
+								v69 = &pDir;
+								v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+								v51 = a2;
+								v64 = (signed __int64)v47;
+								v52 = v32;
+								Actor::AI_Stand(v52, v51, v64, v69);
+								continue;
+							}
+							v70 = (signed __int64)v56;
+							v62 = &pDir;
+							v59 = 0;
+							Actor::_40281C(v32, a2, v59, v62, v70);
+							continue;
+						}
+						v49 = v84 == 0;
+						v69 = &pDir;
+						if ( v49 )
+						{
+							v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+							v51 = a2;
+							v64 = (signed __int64)v47;
+							v52 = v32;
+							Actor::AI_Stand(v52, v51, v64, v69);
+							continue;
+						}
+						Actor::_403C6C(v32, a2, &pDir);
+						continue;
+					}
+					if ( v45 != 1 )
+					{
+						if ( v45 > 1 && v45 <= 3 )
+						{
+							if ( v45 == 2 )
+							v46 = v21->pMonsterInfo.uSpell1ID;
+							else
+							v46 = v21->pMonsterInfo.uSpell2ID;
+							if ( v46 )
+							{
+								if ( v84 )
+								{
+									if ( v45 == 2 )
+									Actor::_403854(v32, a2, &pDir);
+									else
+									Actor::_403A60(v32, a2, &pDir);
+									continue;
+								}
+								if ( v80 * 307.2 > (double)v81 || v82 )
+								{
+									v69 = &pDir;
+									v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+									v51 = a2;
+									v64 = (signed __int64)v47;
+									v52 = v32;
+									Actor::AI_Stand(v52, v51, v64, v69);
+									continue;
+									
+								}
+								v69 = &pDir;
+								v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+								Actor::_402AD7(v32, a2, v32, (signed __int64)v47, v69);
+								continue;
+							}
+							v48 = v80 * 307.2;
+							if ( (double)v81 >= v48 )
+							{
+								if ( v81 >= 1024 )
+								{
+									v50 = v82 == 0;
+									if ( !v50 )
+									{
+										v69 = &pDir;
+										v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+										v51 = a2;
+										v64 = (signed __int64)v47;
+										v52 = v32;
+										Actor::AI_Stand(v52, v51, v64, v69);
+										continue;
+									}
+									v71 = &pDir;
+									v63 = 256;
+									Actor::_402686(v32, a2, v63, v71);
+									continue;
+									
+								}
+								if ( v82 )
+								{
+									v69 = &pDir;
+									v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+									v51 = a2;
+									v64 = (signed __int64)v47;
+									v52 = v32;
+									Actor::AI_Stand(v52, v51, v64, v69);
+									continue;
+								}
+								v70 = (signed __int64)v48;
+								v62 = &pDir;
+								v59 = 0;
+								Actor::_40281C(v32, a2, v59, v62, v70);
+								continue;
+							}
+							v49 = v84 == 0;
+							v69 = &pDir;
+							if ( v49 )
+							{
+								v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+								v51 = a2;
+								v64 = (signed __int64)v47;
+								v52 = v32;
+								Actor::AI_Stand(v52, v51, v64, v69);
+								continue;
+							}
+							Actor::_403C6C(v32, a2, &pDir);
+							continue;
+						}
+					}
+				}
+			}
+			if ( v21->pMonsterInfo.uHostilityType != 4 || !a2 || v81 >= 5120 || v45 != 1 )
+			{
+				if ( !v21->pMonsterInfo.uMovementType )
+				{
+					v68 = 0;
+					v61 = 1024;
+					v41 = v32;
+					v40 = 4;
+					Actor::_4032B2(v41, v40, v61, v68);
+					continue;
+					
+				}
+				if ( v21->pMonsterInfo.uMovementType == 1 )
+				{
+					v68 = 0;
+					v61 = 2560;
+					v41 = v32;
+					v40 = 4;
+					Actor::_4032B2(v41, v40, v61, v68);
+					continue;
+				}
+				if ( v21->pMonsterInfo.uMovementType == 2 )
+				{
+					v68 = 0;
+					v61 = 5120;
+					v41 = v32;
+					v40 = 4;
+					Actor::_4032B2(v41, v40, v61, v68);
+					continue;
+				}
+				if ( v21->pMonsterInfo.uMovementType == 4 )
+				{
+					v68 = 0;
+					v61 = 10240;
+					v41 = v32;
+					v40 = 4;
+					Actor::_4032B2(v41, v40, v61, v68);
+					continue;
+				}
+				if ( v21->pMonsterInfo.uMovementType == 5 )
+				{
+					v57 = Actor::GetDirectionInfo(a1, 4u, &v72, 0);
+					v58 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+					memcpy(&v74, v57, sizeof(v74));
+					memcpy(&pDir, &v74, sizeof(pDir));
+					v69 = &pDir;
+					v52 = actor_id;
+					v64 = (signed __int64)v58;
+					v51 = 4;
+					Actor::AI_Stand(v52, v51, v64, v69);
+					continue;
+				}
+				continue;
+				
+			}
+			if ( !v21->pMonsterInfo.uMissleAttack2Type )
+			{
+				v56 = v80 * 307.2;
+				if ( (double)v81 >= v56 )
+				{
+					if ( v81 >= 1024 )
+					{
+						v50 = v82 == 0;
+						if ( !v50 )
+						{
+							v69 = &pDir;
+							v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+							v51 = a2;
+							v64 = (signed __int64)v47;
+							v52 = v32;
+							Actor::AI_Stand(v52, v51, v64, v69);
+							continue;
+						}
+						v71 = &pDir;
+						v63 = 256;
+						Actor::_402686(v32, a2, v63, v71);
+						continue;
+					}
+					if ( v82 )
+					{
+						v69 = &pDir;
+						v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+						v51 = a2;
+						v64 = (signed __int64)v47;
+						v52 = v32;
+						Actor::AI_Stand(v52, v51, v64, v69);
+						continue;
+					}
+					v70 = (signed __int64)v56;
+					v62 = &pDir;
+					v59 = 0;
+					Actor::_40281C(v32, a2, v59, v62, v70);
+					continue;
+					
+				}
+				v49 = v84 == 0;
+				v69 = &pDir;
+				if ( v49 )
+				{
+					v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+					v51 = a2;
+					v64 = (signed __int64)v47;
+					v52 = v32;
+					Actor::AI_Stand(v52, v51, v64, v69);
+					continue;
+				}
+				Actor::_403C6C(v32, a2, &pDir);
+				continue;
+			}
+			if ( !v84 )
+			{
+				if ( v82 )
+				{
+					v69 = &pDir;
+					v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+					v51 = a2;
+					v64 = (signed __int64)v47;
+					v52 = v32;
+					Actor::AI_Stand(v52, v51, v64, v69);
+					continue;
+				}
+				v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
+				//UNDEF(v53);
+				v69 = &pDir;
+				if ( !(v54 | v55) )
+				{
+					v51 = a2;
+					v64 = (signed __int64)v47;
+					v52 = v32;
+					Actor::AI_Stand(v52, v51, v64, v69);
+					continue;
+				}
+				Actor::_402AD7(v32, a2, v32, (signed __int64)v47, v69);
+				continue;
+			}
+			Actor::_40368B(v32, a2, &pDir);
+		}
+	}
 }
 
 //----- (0040261D) --------------------------------------------------------
diff -r 522591080ac5 -r 5e3f4bf3b8e6 mm7_5.cpp
--- a/mm7_5.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/mm7_5.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -3485,7 +3485,7 @@
   void *v3; // edi@21
   signed int v4; // eax@29
   int v5; // ecx@29
-  enum PLAYER_SKILL_TYPE v6; // edi@37
+  PLAYER_SKILL_TYPE v6; // edi@37
   GUIWindow *pWindow; // eax@56
   unsigned int v8; // edx@56
   //Player *pCurrentPlayer; // edi@57
@@ -11802,7 +11802,7 @@
 }
 
 //----- (00417AD4) --------------------------------------------------------
-unsigned int __fastcall GetSkillColor(unsigned int uPlayerClass, enum PLAYER_SKILL_TYPE uPlayerSkillType, signed int skill_level)
+unsigned int __fastcall GetSkillColor(unsigned int uPlayerClass, PLAYER_SKILL_TYPE uPlayerSkillType, signed int skill_level)
 {
   int v8; // eax@10
   int v12; // eax@14
diff -r 522591080ac5 -r 5e3f4bf3b8e6 mm7_6.cpp
--- a/mm7_6.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/mm7_6.cpp	Tue Mar 26 15:21:03 2013 +0000
@@ -3121,7 +3121,7 @@
   const char *v664; // [sp+0h] [bp-E84h]@802
   int v665; // [sp+0h] [bp-E84h]@807
   int v666; // [sp+4h] [bp-E80h]@12
-  enum PLAYER_SKILL_TYPE v667; // [sp+4h] [bp-E80h]@25
+  PLAYER_SKILL_TYPE v667; // [sp+4h] [bp-E80h]@25
   //unsigned __int8 v668; // [sp+4h] [bp-E80h]@100
   int v669; // [sp+4h] [bp-E80h]@123
   Vec3_int_ *v670; // [sp+4h] [bp-E80h]@133