Skip to content

Commit

Permalink
xrGame/ai/monsters/monster_enemy_memory.cpp: used range-based for in …
Browse files Browse the repository at this point in the history
…loops
  • Loading branch information
Xottab-DUTY committed May 12, 2018
1 parent 85eb522 commit 2363442
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/xrGame/ai/monsters/monster_enemy_memory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,13 @@ void CMonsterEnemyMemory::update()

float const feel_enemy_max_distance = monster->get_feel_enemy_max_distance();

for (auto I = objects.cbegin(); I != objects.cend(); ++I)
for (const auto& enemy : objects)
{
const CEntityAlive* enemy = *I;
const bool feel_enemy =
monster->Position().distance_to(enemy->Position()) < feel_enemy_max_distance;

if (feel_enemy || monster->memory().visual().visible_now(*I))
add_enemy(*I);
if (feel_enemy || monster->memory().visual().visible_now(enemy))
add_enemy(enemy);
}

if (g_actor)
Expand All @@ -112,11 +111,13 @@ void CMonsterEnemyMemory::update()
remove_non_actual();

// обновить опасность
for (ENEMIES_MAP_IT it = m_objects.begin(); it != m_objects.end(); it++)
// XXX: review with below example
// for (auto& [entity, memory] : m_objects)
for (auto& it : m_objects)
{
u8 relation_value = u8(monster->tfGetRelationType(it->first));
float dist = monster->Position().distance_to(it->second.position);
it->second.danger = (1 + relation_value * relation_value * relation_value) / (1 + dist);
const u8 relation_value = u8(monster->tfGetRelationType(it.first));
const float dist = monster->Position().distance_to(it.second.position);
it.second.danger = (1 + relation_value * relation_value * relation_value) / (1 + dist);
}
}

Expand Down

0 comments on commit 2363442

Please sign in to comment.