makefile.gaz

@@ -137,7 +137,8 @@ platform_src :=		platform \
 					plift \
 					plurve \
 					psoil \
-					pbubtube
+					pbubtube \
+					pgbubble
 
 hazard_src :=		hazard \
 					hfalling \

source/platform/pbgeyser.cpp

@@ -23,10 +23,6 @@
 #include "game\game.h"
 #endif
 
-#ifndef __PLATFORM_PBUBBLE_H__
-#include "platform\pbubble.h"
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void CNpcGeyserPlatformGenerator::collidedWith(CThing *_thisThing)

source/platform/pbubble.cpp

@@ -28,25 +28,33 @@
 
 void CNpcBubblePlatform::postInit()
 {
-	CNpcPlatform::postInit();
+	setCollisionSize( 30, 30 );
+	setCollisionCentreOffset( 0, -15 );
+
+	calculateNonRotatedCollisionData();
+	setCollisionAngle( m_tiltAngle >> 8 );
 
 	m_pop = false;
+	m_scale = ONE;
+}
 
-	s32 minX, maxX, minY, maxY;
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	m_npcPath.getPathXExtents( &minX, &maxX );
+void CNpcBubblePlatform::shutdown()
-	m_npcPath.getPathYExtents( &minY, &maxY );
+{
+	if ( m_soundId != NOT_PLAYING )
+	{
+		CSoundMediator::stopAndUnlockSfx( (xmPlayingId) m_soundId );
+	}
 
-	m_thinkArea.x1 = minX;
+	CPlatformThing::shutdown();
-	m_thinkArea.x2 = maxX;
-	m_thinkArea.y1 = minY;
-	m_thinkArea.y2 = maxY;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void CNpcBubblePlatform::render()
 {
+	SprFrame=0;
 	if ( m_isActive || m_pop )
 	{
 		CPlatformThing::render();
@@ -58,15 +66,14 @@ void CNpcBubblePlatform::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
 			{
 				// Evil hard coded Offsets
-				POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printFT4( FRM__BUBBLE_1, renderPos.vx-16, renderPos.vy-32, 0, 0, 10 );
+				POLY_FT4 *SprFrame = CGameScene::getSpriteBank()->printRotatedScaledSprite( FRM__BUBBLE_1, renderPos.vx, renderPos.vy - 16, m_scale, ONE, 0, 10 );
 				setRGB0( SprFrame, 128, 128, 255 );
-//				m_modelGfx->Render(renderPos);
 			}
 		}
 	}
@@ -74,57 +81,43 @@ void CNpcBubblePlatform::render()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void CNpcBubblePlatform::processMovement( int _frames )
+int CNpcBubblePlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
 {
-	if ( !isSetToShutdown() && !m_pop )
+	switch(_thisThing->getThingType())
 	{
-		Pos.vy -= m_speed * _frames;
+		case TYPE_PLAYERPROJECTILE:
+			return( false );
 
-		if ( m_npcPath.getWaypointCount() )
+		default:
 		{
-			s32 minY, maxY;
+			int collided = false;
 
-			m_npcPath.getPathYExtents( &minY, &maxY );
+			if ( m_detectCollision && m_isActive && !isSetToShutdown() && !m_pop )
-
-			if ( Pos.vy < minY )
 			{
-				m_lifetime = GameState::getOneSecondInFrames() >> 2;
+				CRECT thisRect, thatRect;
-				m_pop = true;
+
+				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;
+				}
 			}
-		}
-		else
-		{
-			if ( Pos.vy < 0 )
-			{
-				m_lifetime = GameState::getOneSecondInFrames() >> 2;
-				m_pop = true;
-			}
-		}
 
-		DVECTOR	offset = CLevel::getCameraPos();
+			return( collided );
-
-		s32 yPos = Pos.vy - offset.vy;
-
-		if ( yPos < 0 )
-		{
-			setToShutdown();
 		}
 	}
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CNpcBubblePlatform::processLifetime( int _frames )
-{
-	if ( m_pop )
-	{
-		if ( m_lifetime <= 0 )
-		{
-			setToShutdown();
-		}
-		else
-		{
-			m_lifetime = 0;
-		}
-	}
-}

source/platform/pbubble.h

@@ -23,11 +23,15 @@ class CNpcBubblePlatform : public CNpcPlatform
 public:
 	virtual void		render();
 	virtual void		postInit();
+	virtual void		shutdown();
+	virtual void		setGraphic( sThingPlatform *ThisPlatform )			{}
+	virtual void		setGraphic( u8 graphicNum )							{}
 protected:
-	virtual void		processLifetime( int _frames );
+	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
-	virtual void		processMovement( int _frames );
 
 	u8					m_pop;
+	s16					m_scale;
+	POLY_FT4			*SprFrame;
 };
 
 #endif

source/platform/pcbubble.cpp

@@ -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()
 {
 

source/platform/pcbubble.h

@@ -14,22 +14,18 @@
 #ifndef __PLATFORM_PCBUBBLE_H__
 #define __PLATFORM_PCBUBBLE_H__
 
-#ifndef __PLATFORM_PLATFORM_H__
+#ifndef __PLATFORM_PBUBBLE_H__
-#include "platform\platform.h"
+#include "platform\pbubble.h"
 #endif
 
-class CNpcCollapsingBubblePlatform : public CNpcPlatform
+class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform
 {
 public:
-	virtual void		render();
 	virtual void		postInit();
+	virtual	CRECT const	*getThinkBBox()												{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		processLifetime( int _frames );
-	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
-	u8					m_pop;
 	u8					m_startCollapse;
-	s16					m_scale;
-	POLY_FT4			*SprFrame;
 };
 
 class CNpcCollapsingAcridPlatform : public CNpcCollapsingBubblePlatform

source/platform/platform.cpp

@@ -203,6 +203,10 @@
 #include "platform\pplayer.h"
 #endif
 
+#ifndef __PLATFORM_PGBUBBLE_H__
+#include "platform\pgbubble.h"
+#endif
+
 #include "fx\fx.h"
 #include "fx\fxjfish.h"
 
@@ -231,7 +235,7 @@ CNpcPlatform	*CNpcPlatform::Create(int Type)
 
 		case NPC_BUBBLE_PLATFORM:
 		{
-			platform = new ("bubble platform") CNpcBubblePlatform;
+			platform = new ("geyser bubble platform") CNpcGeyserBubblePlatform;
 			break;
 		}
 

source/platform/platform.h

@@ -117,8 +117,8 @@ public:
 	void				setTiltable( bool isTiltable );
 	void				setWaypointPtr( u16 *newPtr )							{m_npcPath.setWaypointPtr( newPtr );}
 	void				setWaypointCount( u8 newCount )							{m_npcPath.setWaypointCount( newCount );}
-	void				setGraphic( sThingPlatform *ThisPlatform );
+	virtual void		setGraphic( sThingPlatform *ThisPlatform );
-	void				setGraphic( u8 graphicNum );
+	virtual void		setGraphic( u8 graphicNum );
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		trigger()												{;}
 	virtual u8			isCart()												{return( false );}

source/platform/pplayer.cpp

@@ -26,18 +26,15 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void CNpcPlayerBubblePlatform::postInit()
+/*void CNpcPlayerBubblePlatform::postInit()
 {
-	CNpcPlatform::postInit();
+	CNpcBubblePlatform::postInit();
-
-	m_pop = false;
-	m_scale = ONE;
 
 	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 );
-		}
-	}
-}

source/platform/pplayer.h

@@ -14,22 +14,17 @@
 #ifndef __PLATFORM_PPLAYER_H__
 #define __PLATFORM_PPLAYER_H__
 
-#ifndef __PLATFORM_PLATFORM_H__
+#ifndef __PLATFORM_PBUBBLE_H__
-#include "platform\platform.h"
+#include "platform\pbubble.h"
 #endif
 
-class CNpcPlayerBubblePlatform : public CNpcPlatform
+class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
 {
 public:
-	virtual void		postInit();
+	//virtual void		postInit();
-	virtual void		render();
-	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
 	virtual	CRECT const	*getThinkBBox()												{return( CThing::getThinkBBox() );}
 protected:
 	virtual void		processLifetime( int _frames );
-
-	u8					m_pop;
-	s16					m_scale;
 };
 
 #endif

users/paul/spongebob project/spongebob project.dsp

@@ -1617,6 +1617,14 @@ SOURCE=..\..\..\source\platform\pfishhk3.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\platform\pgbubble.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\platform\pgbubble.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\platform\pgeyser.cpp
 # End Source File
 # Begin Source File