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-05 22:27:34 +00:00
parent dbf746a287
commit dd6b6963e6
3 changed files with 70 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/friend/fgary.cpp
View file

@ -139,7 +139,7 @@ void CNpcGaryFriend::think( int _frames )
// check vertical collision
groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
groundHeight = CGameScene::getCollision()->getHeightFromGroundNonSB( Pos.vx, Pos.vy, yMovement + 16 );
switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy ) & COLLISION_TYPE_MASK )
{
@ -196,7 +196,7 @@ void CNpcGaryFriend::think( int _frames )
// check horizontal collision
if ( CGameScene::getCollision()->getHeightFromGround( Pos.vx + ( multiplier * _frames ), Pos.vy ) < -maxHeight )
if ( CGameScene::getCollision()->getHeightFromGroundNonSB( Pos.vx + ( multiplier * _frames ), Pos.vy ) < -maxHeight )
{
// reverse direction
@ -233,7 +233,7 @@ void CNpcGaryFriend::think( int _frames )
Pos.vy += groundHeight;
if ( CGameScene::getCollision()->getHeightFromGround( Pos.vx + ( multiplier * _frames ), Pos.vy ) < -maxHeight )
if ( CGameScene::getCollision()->getHeightFromGroundNonSB( Pos.vx + ( multiplier * _frames ), Pos.vy ) < -maxHeight )
{
// reverse direction