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

Browse source
This commit is contained in:
Charles 2001-07-17 15:40:12 +00:00
parent f0698cd771
commit 9744a422b0
1 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
source/enemy/nssnake.cpp
View file

@ -546,6 +546,26 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
Pos.vx += moveX; Pos.vx += moveX;
Pos.vy += moveY; Pos.vy += moveY;
// check for hitting ground
if ( CGameScene::getCollision()->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
{
switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy ) & COLLISION_TYPE_MASK )
{
case COLLISION_TYPE_FLAG_SOLID:
{
Pos = oldPos;
m_heading += 1024;
m_heading &= 4095;
break;
}
default:
break;
}
}
updateTail( oldPos, _frames ); updateTail( oldPos, _frames );
} }
@ -843,6 +863,33 @@ void CNpcSeaSnakeEnemy::processClose( int _frames )
} }
} }
// check for hitting ground
if ( CGameScene::getCollision()->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
{
switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy ) & COLLISION_TYPE_MASK )
{
case COLLISION_TYPE_FLAG_SOLID:
{
m_movementTimer = GameState::getOneSecondInFrames();
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_timerFunc = NPC_TIMER_ATTACK_DONE;
m_timerTimer = 5 * GameState::getOneSecondInFrames();
m_sensorFunc = NPC_SENSOR_NONE;
Pos = oldPos;
m_heading += 1024;
m_heading &= 4095;
break;
}
default:
break;
}
}
updateTail( oldPos, _frames ); updateTail( oldPos, _frames );
/* /*