This commit is contained in:
parent
cbfc0e6fa9
commit
9a0ce0adc6
11 changed files with 81 additions and 229 deletions
|
@ -28,41 +28,11 @@
|
|||
|
||||
void CNpcCollapsingBubblePlatform::postInit()
|
||||
{
|
||||
CNpcPlatform::postInit();
|
||||
CNpcBubblePlatform::postInit();
|
||||
|
||||
m_pop = false;
|
||||
m_scale = ONE;
|
||||
m_startCollapse = false;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
void CNpcCollapsingBubblePlatform::render()
|
||||
{
|
||||
SprFrame=0;
|
||||
if ( m_isActive || m_pop )
|
||||
{
|
||||
CPlatformThing::render();
|
||||
|
||||
// Render
|
||||
if (canRender())
|
||||
{
|
||||
DVECTOR &renderPos=getRenderPos();
|
||||
|
||||
if ( m_pop )
|
||||
{
|
||||
SprFrame = CGameScene::getSpriteBank()->printRotatedScaledSprite( FRM__BALLOONBURST, renderPos.vx, renderPos.vy - 16, 4096 << 1, 4096 << 1, 0, 10 );
|
||||
setRGB0( SprFrame, 128, 128, 255 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// Evil hard coded Offsets
|
||||
POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printRotatedScaledSprite( FRM__BUBBLE_1, renderPos.vx, renderPos.vy - 16, m_scale, ONE, 0, 10 );
|
||||
setRGB0( SprFrame, 128, 128, 255 );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void CNpcCollapsingBubblePlatform::processLifetime( int _frames )
|
||||
|
@ -141,48 +111,6 @@ void CNpcCollapsingBubblePlatform::processLifetime( int _frames )
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
int CNpcCollapsingBubblePlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
|
||||
{
|
||||
switch(_thisThing->getThingType())
|
||||
{
|
||||
case TYPE_PLAYERPROJECTILE:
|
||||
return( false );
|
||||
|
||||
default:
|
||||
{
|
||||
int collided = false;
|
||||
|
||||
if ( m_detectCollision && m_isActive && !isSetToShutdown() && !m_pop )
|
||||
{
|
||||
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 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void CNpcCollapsingAcridPlatform::render()
|
||||
{
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue