Mercurial > mm7
diff mm7_3.cpp @ 448:ee47cc585e1b
Слияние
author | Ritor1 |
---|---|
date | Sat, 23 Feb 2013 23:46:20 +0600 |
parents | 55684f4eda73 |
children | ad1e9c0bf6da |
line wrap: on
line diff
--- a/mm7_3.cpp Sat Feb 23 23:45:50 2013 +0600 +++ b/mm7_3.cpp Sat Feb 23 23:46:20 2013 +0600 @@ -17691,7 +17691,7 @@ //unsigned int v17; // edx@67 //unsigned int v18; // ecx@67 //unsigned __int16 v19; // ax@72 - int *v20; // esi@80 + //int *v20; // esi@80 Actor *v21; // ebx@80 unsigned __int16 v22; // ax@86 signed int v23; // eax@94 @@ -17848,7 +17848,7 @@ //pActor = (Actor *)(LODWORD(v80) - 176); //v11 = *(unsigned int *)LODWORD(v80); //v49 = *(unsigned int *)LODWORD(v80) == 5; - dword_4F6E08[i] = 4; + ai_near_actors_targets_pid[i] = OBJECT_Player; if (actor->uAIState == Dead || actor->uAIState == Removed || actor->uAIState == Disabled || actor->uAttributes & 0x0400) continue; @@ -17937,12 +17937,12 @@ actor_id = ai_near_actors_ids[v78]; assert(actor_id < uNumActors); - v20 = &dword_4F6E08[actor_id]; + //v20 = &ai_near_actors_targets_pid[actor_id]; v21 = &pActors[actor_id]; - Actor::_401221(actor_id, &dword_4F6E08[actor_id], 1u); - if ( v21->pMonsterInfo.uHostilityType && !*v20 ) + 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 = *v20; + a2 = ai_near_actors_targets_pid[actor_id]; v76 = a2 & 7; if ( (a2 & 7) == OBJECT_Actor) v80 = 0.5; @@ -18696,7 +18696,7 @@ v7 = v6->uAttributes; if ( v7 & 0x8000 < 0 ) { - v8 = dword_4F6E08[v5]; + v8 = ai_near_actors_targets_pid[v5]; LOBYTE(v7) = v7 | 0x80; v6->uAttributes = v7; v33 = 8 * v5 | OBJECT_Actor;