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-05-21 16:28:10 +00:00
parent 0b3c1a069c
commit 55119a981e
1 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/platform/platform.cpp
View file

@ -940,8 +940,6 @@ void CNpcPlatform::collidedWith( CThing *_thisThing )
switch(_thisThing->getThingType()) switch(_thisThing->getThingType())
{ {
case TYPE_PLAYER: case TYPE_PLAYER:
{
if ( m_detectCollision && m_isActive )
{ {
CPlayer *player; CPlayer *player;
DVECTOR playerPos; DVECTOR playerPos;
@ -982,7 +980,6 @@ void CNpcPlatform::collidedWith( CThing *_thisThing )
} }
} }
} }
}
break; break;
} }
@ -1036,6 +1033,8 @@ int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
{ {
int collided = false; int collided = false;
if ( m_detectCollision && m_isActive && !isSetToShutdown() )
{
CRECT thisRect, thatRect; CRECT thisRect, thatRect;
thisRect = getCollisionArea(); thisRect = getCollisionArea();
@ -1056,6 +1055,7 @@ int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
{ {
collided = true; collided = true;
} }
}
return( collided ); return( collided );
} }