Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-08-10 18:55:44 +00:00
parent f72022e72d
commit f51c4dba88
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/friend/fgary.cpp
View File

@ -369,6 +369,8 @@ void CNpcGaryFriend::think( int _frames )
s16 heading = ratan2( yDist, xDist ); s16 heading = ratan2( yDist, xDist );
m_drawRotation = heading; m_drawRotation = heading;
CNpcThing::think(_frames);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

4
source/friend/friend.cpp
View File

@ -236,8 +236,6 @@ void CNpcFriend::shutdown()
void CNpcFriend::think(int _frames) void CNpcFriend::think(int _frames)
{ {
CNpcThing::think(_frames);
if ( m_animPlaying ) if ( m_animPlaying )
{ {
s32 frameCount; s32 frameCount;
@ -264,6 +262,8 @@ void CNpcFriend::think(int _frames)
} }
m_iconStrobe=(m_iconStrobe+(strobespeed))&4095; m_iconStrobe=(m_iconStrobe+(strobespeed))&4095;
CNpcThing::think(_frames);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

4
source/platform/platform.cpp
View File

@ -1258,12 +1258,12 @@ int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
thatRect = _thisThing->getCollisionArea(); thatRect = _thisThing->getCollisionArea();
DVECTOR const &thisPosDelta = getPosDelta(); DVECTOR const &thisPosDelta = getPosDelta();
int ThisAbsY=abs(thisPosDelta.vy)>>1; int ThisAbsY=abs(thisPosDelta.vy);
thisRect.y1 -= ThisAbsY; thisRect.y1 -= ThisAbsY;
thisRect.y2 += ThisAbsY; thisRect.y2 += ThisAbsY;
DVECTOR const &ThatPosDelta = _thisThing->getPosDelta(); DVECTOR const &ThatPosDelta = _thisThing->getPosDelta();
int ThatAbsY=abs(ThatPosDelta.vy)>>1; int ThatAbsY=abs(ThatPosDelta.vy);
thatRect.y1 -= ThatAbsY; thatRect.y1 -= ThatAbsY;
thatRect.y2 += ThatAbsY; thatRect.y2 += ThatAbsY;