Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Range and melee attack split up.

Browse Source 
This was SVN commit r3396.
This commit is contained in:
pyrolink 2006-01-22 08:53:35 +00:00
parent 0e861e5ab1
commit c6620bb358
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/simulation/EntityStateProcessing.cpp
View File

@ -332,6 +332,20 @@ bool CEntity::processContactAction( CEntityOrder* current, size_t UNUSED(timeste
current->m_data[0].location = current->m_data[0].entity->m_position;
float Distance = (current->m_data[0].location - m_position).length();
//TODO: find a better way than assuming constant action indicators.
if ( current->m_data[1].data == 1 )
{
//Are we closer using ranged attack?
if ( fabs(Distance - m_actions[4].m_MaxRange) < fabs(Distance - action->m_MaxRange) &&
Distance > m_actions[4].m_MinRange && !m_shouldRun && m_actions.find( 4 ) != m_actions.end())
{
action = &m_actions[4];
current->m_data[1].data = 4;
}
else
action = &m_actions[1];
}
if( Distance < action->m_MaxRange )
{
(int&)current->m_type = transition;
@ -440,6 +454,21 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
}
CVector2D delta = current->m_data[0].entity->m_position - m_position;
float deltaLength = delta.length();
//TODO: find a better way than assuming constant action indicators.
if ( current->m_data[1].data == 1 )
{
//Are we closer using ranged attack?
if ( fabs(deltaLength - m_actions[4].m_MaxRange) < fabs(deltaLength - action->m_MaxRange) &&
deltaLength > m_actions[4].m_MinRange && !m_shouldRun && m_actions.find( 4 ) != m_actions.end())
{
action = &m_actions[4];
current->m_data[1].data = 4;
}
else
action = &m_actions[1];
}
float adjRange = action->m_MaxRange + m_bounds->m_radius + current->m_data[0].entity->m_bounds->m_radius;
@ -461,7 +490,6 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
// We're aiming to end up at a location just inside our maximum range
// (is this good enough?)
delta = delta.normalize() * ( adjRange - m_bounds->m_radius );
float deltaLength = delta.length();
if ( m_actor )
{