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-07-03 18:32:04 +00:00
parent cbfc0e6fa9
commit 9a0ce0adc6
11 changed files with 81 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

79
source/platform/pplayer.cpp
View file

@ -26,18 +26,15 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcPlayerBubblePlatform::postInit()
/*void CNpcPlayerBubblePlatform::postInit()
{
CNpcPlatform::postInit();
m_pop = false;
m_scale = ONE;
CNpcBubblePlatform::postInit();
setCollisionSize( 30, 30 );
setCollisionCentreOffset( 0, -15 );
calculateNonRotatedCollisionData();
}
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -66,73 +63,3 @@ void CNpcPlayerBubblePlatform::processLifetime( int _frames )
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcPlayerBubblePlatform::render()
{
if ( m_isActive )
{
CPlatformThing::render();
// Render
if (canRender())
{
DVECTOR &renderPos=getRenderPos();
if ( m_pop )
{
POLY_FT4 *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 );
}
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int CNpcPlayerBubblePlatform::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 );
}
}
}