mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 21:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

# Units will now back away from enemies when below minimum range.

Browse Source 
Also a small water specular strength tweak.

This was SVN commit r4481.
This commit is contained in:
Matei
2006-10-04 04:47:58 +00:00
parent 1735502032
commit 1036799546
4 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/EntityStateProcessing.cpp
+20 -4
View File
@@ -475,10 +475,26 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
float adjMinRange = action->m_MinRange + m_bounds->m_radius + target->m_bounds->m_radius;
if( delta.within( adjMinRange ) )
{
// Too close... do nothing.
entf_clear(ENTF_IS_RUNNING);
entf_clear(ENTF_SHOULD_RUN);
return( false );
// Too close... avoid it if allowed by the current stance.
if( current->m_source == CEntityOrder::SOURCE_UNIT_AI && !m_stance->allowsMovement() )
{
popOrder();
m_actor->SetRandomAnimation( "idle" );
return false; // We're not allowed to move at all by the current stance
}
entf_set(ENTF_SHOULD_RUN);
chooseMovementSpeed( action->m_MinRange );
// The pathfinder will push its result in front of the current order
if( !g_Pathfinder.requestAvoidPath( me, current, action->m_MinRange + 2.0f ) )
{
popOrder(); // Nothing we can do.. maybe we'll find a better target
m_actor->SetRandomAnimation( "idle" );
return false;
}
return true;
}
}