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-23 21:27:29 +00:00
parent d04702d6a5
commit d3c0e5904a
8 changed files with 87 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

63
source/platform/platform.cpp
View file

@ -151,6 +151,10 @@
#include "platform\prbridge.h"
#endif
#ifndef __PLATFORM_PBALOON_H__
#include "platform\pbaloon.h"
#endif
#include "fx\fx.h"
#include "fx\fxjfish.h"
@ -354,6 +358,12 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
break;
}
case NPC_BALLOON_BRIDGE_PLATFORM:
{
platform = new ("balloon bridge platform") CNpcBalloonBridgePlatform;
break;
}
default:
{
ASSERT( 0 );
@ -991,33 +1001,42 @@ void CNpcPlatform::render()
int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
{
int collided = false;
if ( m_detectCollision && m_isActive && !isSetToShutdown() )
switch(_thisThing->getThingType())
{
CRECT thisRect, thatRect;
case TYPE_PLAYERPROJECTILE:
return( false );
thisRect = getCollisionArea();
thatRect = _thisThing->getCollisionArea();
DVECTOR posDelta = getPosDelta();
thisRect.y1 -= abs( posDelta.vy ) >> 1;
thisRect.y2 += abs( posDelta.vy ) >> 1;
posDelta = _thisThing->getPosDelta();
thatRect.y1 -= abs( posDelta.vy ) >> 1;
thatRect.y2 += abs( posDelta.vy ) >> 1;
if(((thisRect.x1>=thatRect.x1&&thisRect.x1<=thatRect.x2)||(thisRect.x2>=thatRect.x1&&thisRect.x2<=thatRect.x2)||(thisRect.x1<=thatRect.x1&&thisRect.x2>=thatRect.x2))&&
((thisRect.y1>=thatRect.y1&&thisRect.y1<=thatRect.y2)||(thisRect.y2>=thatRect.y1&&thisRect.y2<=thatRect.y2)||(thisRect.y1<=thatRect.y1&&thisRect.y2>=thatRect.y2)))
default:
{
collided = true;
int collided = false;
if ( m_detectCollision && m_isActive && !isSetToShutdown() )
{
CRECT thisRect, thatRect;
thisRect = getCollisionArea();
thatRect = _thisThing->getCollisionArea();
DVECTOR posDelta = getPosDelta();
thisRect.y1 -= abs( posDelta.vy ) >> 1;
thisRect.y2 += abs( posDelta.vy ) >> 1;
posDelta = _thisThing->getPosDelta();
thatRect.y1 -= abs( posDelta.vy ) >> 1;
thatRect.y2 += abs( posDelta.vy ) >> 1;
if(((thisRect.x1>=thatRect.x1&&thisRect.x1<=thatRect.x2)||(thisRect.x2>=thatRect.x1&&thisRect.x2<=thatRect.x2)||(thisRect.x1<=thatRect.x1&&thisRect.x2>=thatRect.x2))&&
((thisRect.y1>=thatRect.y1&&thisRect.y1<=thatRect.y2)||(thisRect.y2>=thatRect.y1&&thisRect.y2<=thatRect.y2)||(thisRect.y1<=thatRect.y1&&thisRect.y2>=thatRect.y2)))
{
collided = true;
}
}
return( collided );
}
}
return( collided );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////