diff --git a/source/platform/pbubble.cpp b/source/platform/pbubble.cpp index de21a31a6..05cbbdbf1 100644 --- a/source/platform/pbubble.cpp +++ b/source/platform/pbubble.cpp @@ -63,7 +63,10 @@ void CNpcBubblePlatform::render() } else { - m_modelGfx->Render(renderPos); + // Evil hard coded Offsets + POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printFT4( FRM__BUBBLE_1, renderPos.vx-16, renderPos.vy-32, 0, 0, 10 ); + setRGB0( SprFrame, 128, 128, 255 ); +// m_modelGfx->Render(renderPos); } } } diff --git a/source/platform/pcbubble.cpp b/source/platform/pcbubble.cpp index a015971b0..3751e50c5 100644 --- a/source/platform/pcbubble.cpp +++ b/source/platform/pcbubble.cpp @@ -34,9 +34,9 @@ void CNpcCollapsingBubblePlatform::postInit() } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - void CNpcCollapsingBubblePlatform::render() { + SprFrame=0; if ( m_isActive || m_pop ) { CPlatformThing::render(); @@ -48,12 +48,15 @@ void CNpcCollapsingBubblePlatform::render() if ( m_pop ) { - POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printRotatedScaledSprite( FRM__BALLOONBURST, renderPos.vx, renderPos.vy - 16, 4096 << 1, 4096 << 1, 0, 10 ); + SprFrame = CGameScene::getSpriteBank()->printRotatedScaledSprite( FRM__BALLOONBURST, renderPos.vx, renderPos.vy - 16, 4096 << 1, 4096 << 1, 0, 10 ); setRGB0( SprFrame, 128, 128, 255 ); } else { - m_modelGfx->Render(renderPos); + // Evil hard coded Offsets + POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printFT4( FRM__BUBBLE_1, renderPos.vx-16, renderPos.vy-32, 0, 0, 10 ); + setRGB0( SprFrame, 128, 128, 255 ); +// m_modelGfx->Render(renderPos); } } } @@ -173,24 +176,10 @@ int CNpcCollapsingBubblePlatform::checkCollisionAgainst(CThing *_thisThing, int void CNpcCollapsingAcridPlatform::render() { - if ( m_isActive || m_pop ) + + CNpcCollapsingBubblePlatform::render(); + if (SprFrame) { - 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, 255, 255, 128 ); - } - else - { - m_modelGfx->Render(renderPos); - } - } + setRGB0( SprFrame, 255, 255, 128 ); } } diff --git a/source/platform/pcbubble.h b/source/platform/pcbubble.h index 998b3cc1a..601dd0ba6 100644 --- a/source/platform/pcbubble.h +++ b/source/platform/pcbubble.h @@ -27,6 +27,7 @@ protected: virtual void processLifetime( int _frames ); virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); u8 m_pop; + POLY_FT4 *SprFrame; }; class CNpcCollapsingAcridPlatform : public CNpcCollapsingBubblePlatform diff --git a/source/platform/pplayer.cpp b/source/platform/pplayer.cpp index 8d41f04b6..1f267c3b4 100644 --- a/source/platform/pplayer.cpp +++ b/source/platform/pplayer.cpp @@ -77,7 +77,10 @@ void CNpcPlayerBubblePlatform::render() } else { - m_modelGfx->Render(renderPos); + // Evil hard coded Offsets + POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printFT4( FRM__BUBBLE_1, renderPos.vx-16, renderPos.vy-32, 0, 0, 10 ); + setRGB0( SprFrame, 128, 128, 255 ); +// m_modelGfx->Render(renderPos); } } }