This commit is contained in:
parent
f72022e72d
commit
f51c4dba88
@ -369,6 +369,8 @@ void CNpcGaryFriend::think( int _frames )
|
||||
s16 heading = ratan2( yDist, xDist );
|
||||
|
||||
m_drawRotation = heading;
|
||||
|
||||
CNpcThing::think(_frames);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -236,8 +236,6 @@ void CNpcFriend::shutdown()
|
||||
|
||||
void CNpcFriend::think(int _frames)
|
||||
{
|
||||
CNpcThing::think(_frames);
|
||||
|
||||
if ( m_animPlaying )
|
||||
{
|
||||
s32 frameCount;
|
||||
@ -264,6 +262,8 @@ void CNpcFriend::think(int _frames)
|
||||
}
|
||||
|
||||
m_iconStrobe=(m_iconStrobe+(strobespeed))&4095;
|
||||
|
||||
CNpcThing::think(_frames);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -1258,12 +1258,12 @@ int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
|
||||
thatRect = _thisThing->getCollisionArea();
|
||||
|
||||
DVECTOR const &thisPosDelta = getPosDelta();
|
||||
int ThisAbsY=abs(thisPosDelta.vy)>>1;
|
||||
int ThisAbsY=abs(thisPosDelta.vy);
|
||||
thisRect.y1 -= ThisAbsY;
|
||||
thisRect.y2 += ThisAbsY;
|
||||
|
||||
DVECTOR const &ThatPosDelta = _thisThing->getPosDelta();
|
||||
int ThatAbsY=abs(ThatPosDelta.vy)>>1;
|
||||
int ThatAbsY=abs(ThatPosDelta.vy);
|
||||
thatRect.y1 -= ThatAbsY;
|
||||
thatRect.y2 += ThatAbsY;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user