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-08-13 15:07:07 +00:00
parent 45fe785511
commit e7cf64e467
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/friend/fgary.cpp
View file

@ -348,6 +348,7 @@ void CNpcGaryFriend::think( int _frames )
if ( abs( groundDist ) > 15 ) if ( abs( groundDist ) > 15 )
{ {
m_drawRotation = 0; m_drawRotation = 0;
CNpcThing::think(_frames);
return; return;
} }
@ -358,6 +359,7 @@ void CNpcGaryFriend::think( int _frames )
if ( abs( groundDist ) > 15 ) if ( abs( groundDist ) > 15 )
{ {
m_drawRotation = 0; m_drawRotation = 0;
CNpcThing::think(_frames);
return; return;
} }

6
source/platform/platform.cpp
View file

@ -1182,6 +1182,9 @@ CRECT const &collisionArea=getCollisionArea();
int height = getHeightFromPlatformAtPosition( friendPos.vx, friendPos.vy ); int height = getHeightFromPlatformAtPosition( friendPos.vx, friendPos.vy );
friendNpc->setPlatform( this ); friendNpc->setPlatform( this );
DVECTOR friendPos = friendNpc->getPos();
friendPos.vy += height;
friendNpc->setPos( friendPos );
m_contact = true; m_contact = true;
} }
@ -1194,6 +1197,9 @@ CRECT const &collisionArea=getCollisionArea();
if ( height >= -threshold && height < 1 ) if ( height >= -threshold && height < 1 )
{ {
friendNpc->setPlatform( this ); friendNpc->setPlatform( this );
DVECTOR friendPos = friendNpc->getPos();
friendPos.vy += height;
friendNpc->setPos( friendPos );
m_contact = true; m_contact = true;
} }