This commit is contained in:
parent
56a034cc8a
commit
8c87a0eaf1
1 changed files with 20 additions and 11 deletions
|
@ -152,6 +152,26 @@ void CNpcSharkManEnemy::processMovement( int _frames )
|
||||||
|
|
||||||
void CNpcSharkManEnemy::processClose( int _frames )
|
void CNpcSharkManEnemy::processClose( int _frames )
|
||||||
{
|
{
|
||||||
|
s32 xDist, yDist;
|
||||||
|
|
||||||
|
DVECTOR newPos = Pos;
|
||||||
|
newPos.vy -= 50;
|
||||||
|
|
||||||
|
CPlayer *player = GameScene.getPlayer();
|
||||||
|
DVECTOR playerPos = player->getPos();
|
||||||
|
|
||||||
|
xDist = playerPos.vx - newPos.vx;
|
||||||
|
yDist = playerPos.vy - newPos.vy;
|
||||||
|
|
||||||
|
if ( xDist > 0 )
|
||||||
|
{
|
||||||
|
m_heading = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_heading = 2048;
|
||||||
|
}
|
||||||
|
|
||||||
if ( m_animNo != ANIM_MANRAY_ATTACK )
|
if ( m_animNo != ANIM_MANRAY_ATTACK )
|
||||||
{
|
{
|
||||||
m_animPlaying = true;
|
m_animPlaying = true;
|
||||||
|
@ -162,17 +182,6 @@ void CNpcSharkManEnemy::processClose( int _frames )
|
||||||
{
|
{
|
||||||
// fire
|
// fire
|
||||||
|
|
||||||
DVECTOR newPos = Pos;
|
|
||||||
newPos.vy -= 50;
|
|
||||||
|
|
||||||
s32 xDist, yDist;
|
|
||||||
|
|
||||||
CPlayer *player = GameScene.getPlayer();
|
|
||||||
DVECTOR playerPos = player->getPos();
|
|
||||||
|
|
||||||
xDist = playerPos.vx - newPos.vx;
|
|
||||||
yDist = playerPos.vy - newPos.vy;
|
|
||||||
|
|
||||||
s16 heading = ratan2( yDist, xDist ) & 4095;
|
s16 heading = ratan2( yDist, xDist ) & 4095;
|
||||||
|
|
||||||
CProjectile *projectile;
|
CProjectile *projectile;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue