zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-05-11 20:56:43 +00:00
parent 15d3aff1ab
commit c48fce126a
12 changed files with 119 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

60
source/enemy/npc.cpp
View file

@ -860,55 +860,51 @@ void CNpcEnemy::collidedWith( CThing *_thisThing )
ATTACK_STATE playerState = player->getAttackState();
switch( playerState )
if(playerState==ATTACK_STATE__NONE)
{
case ATTACK_STATE__NONE:
if ( !player->isRecoveringFromHit() )
{
if ( !player->isRecoveringFromHit() )
switch( m_data[m_type].detectCollision )
{
switch( m_data[m_type].detectCollision )
case DETECT_NO_COLLISION:
{
case DETECT_NO_COLLISION:
{
// ignore
// ignore
break;
}
break;
}
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
processUserCollision( _thisThing );
processUserCollision( _thisThing );
break;
}
break;
}
case DETECT_ATTACK_COLLISION_GENERIC:
{
processAttackCollision();
processUserCollision( _thisThing );
case DETECT_ATTACK_COLLISION_GENERIC:
{
processAttackCollision();
processUserCollision( _thisThing );
break;
}
break;
}
}
break;
}
}
else
{
// player is attacking, respond appropriately
default:
if ( m_controlFunc != NPC_CONTROL_SHOT )
{
// player is attacking, respond appropriately
if ( m_controlFunc != NPC_CONTROL_SHOT )
if(playerState==ATTACK_STATE__BUTT_BOUNCE)
{
m_controlFunc = NPC_CONTROL_SHOT;
m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
player->justButtBouncedABadGuy();
}
break;
m_controlFunc = NPC_CONTROL_SHOT;
m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
}
}