This commit is contained in:
parent
d00521459d
commit
c483e466aa
Binary file not shown.
Binary file not shown.
@ -436,7 +436,7 @@ void CNpcIronDogfishEnemy::hasBeenSteamed( DVECTOR &steamPos )
|
||||
|
||||
//hasBeenAttacked();
|
||||
m_steamTimer = 4 * GameState::getOneSecondInFrames();
|
||||
m_effect->killFX();
|
||||
//m_effect->killFX();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -753,6 +753,18 @@ void CNpcFlyingDutchmanEnemy::collidedWith(CThing *_thisThing)
|
||||
m_controlFunc = NPC_CONTROL_SHOT;
|
||||
m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
|
||||
|
||||
s32 minX, maxX;
|
||||
m_npcPath.getPathXExtents( &minX, &maxX );
|
||||
|
||||
if ( m_extension == minX )
|
||||
{
|
||||
m_extension = maxX;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_extension = minX;
|
||||
}
|
||||
|
||||
drawAttackEffect();
|
||||
}
|
||||
}
|
||||
@ -797,14 +809,20 @@ u8 CNpcFlyingDutchmanEnemy::hasBeenAttacked()
|
||||
m_fadeDown = true;
|
||||
m_timerTimer = 0;
|
||||
m_fireCount = 0;*/
|
||||
|
||||
s32 minX, maxX;
|
||||
m_npcPath.getPathXExtents( &minX, &maxX );
|
||||
|
||||
if ( m_extension == minX )
|
||||
{
|
||||
m_extension = maxX;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_extension = minX;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return( true );
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void CNpcFlyingDutchmanEnemy::shakePlatformLoose()
|
||||
{
|
||||
}
|
||||
|
@ -33,7 +33,6 @@ protected:
|
||||
void processShotRecoil( int _frames );
|
||||
void processShotDeathEnd( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
void shakePlatformLoose();
|
||||
|
||||
enum NPC_FLYING_DUTCHMAN_STATE
|
||||
{
|
||||
|
@ -434,7 +434,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
4,
|
||||
3,
|
||||
64,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__SHOCK_ENEMY,
|
||||
@ -798,7 +798,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
4,
|
||||
3,
|
||||
256,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__SHOCK_ENEMY,
|
||||
|
Loading…
Reference in New Issue
Block a user