source/player/player.cpp

@@ -74,6 +74,10 @@
 #include "player\pmcart.h"
 #endif
 
+#ifndef __PLAYER_PMSWAL_H__
+#include "player\pmswal.h"
+#endif
+
 #ifndef __GFX_FONT_H__
 #include "gfx\font.h"
 #endif
@@ -205,6 +209,7 @@ static const char *s_modeText[NUM_PLAYERMODES]=
 	"DEAD",
 	"FLY",
 	"CART",
+	"SWALLOW",
 };
 #endif
 
@@ -226,6 +231,7 @@ CPlayerModeJellyLauncher	PLAYERMODEJELLYLAUNCHER;
 CPlayerModeDead				PLAYERMODEDEAD;
 CPlayerModeFly				PLAYERMODEFLY;
 CPlayerModeCart				PLAYERMODECART;
+CPlayerModeSwallow			PLAYERMODESWALLOW;
 
 CPlayerMode	*CPlayer::s_playerModes[NUM_PLAYERMODES]=
 {
@@ -239,6 +245,7 @@ CPlayerMode	*CPlayer::s_playerModes[NUM_PLAYERMODES]=
 	&PLAYERMODEDEAD,			// PLAYER_MODE_DEAD
 	&PLAYERMODEFLY,				// PLAYER_MODE_FLY
 	&PLAYERMODECART,			// PLAYER_MODE_CART
+	&PLAYERMODESWALLOW,			// PLAYER_MODE_SWALLOW
 };
 
 
@@ -301,6 +308,7 @@ PLAYER_ADDONS	s_addonNumbers[NUM_PLAYERMODES]=
 	NO_ADDON,									//	PLAYER_MODE_DEAD
 	NO_ADDON,									//	PLAYER_MODE_FLY
 	NO_ADDON,									//	PLAYER_MODE_CART
+	NO_ADDON,									//	PLAYER_MODE_SWALLOW
 };
 
 s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
@@ -2008,7 +2016,8 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
 	if(m_invincibleFrameCount==0&&								// Don't take damage if still recovering from the last hit
 	   m_invincibilityRingTimer==0&&							// Or if we have the invincibility ring on
 	   m_currentPlayerModeClass->getState()!=STATE_SOAKUP&&		// Or soaking up
-	   m_currentMode!=PLAYER_MODE_DEAD)							// Or already dead! :)
+	   m_currentMode!=PLAYER_MODE_DEAD &&
+	   m_currentMode!=PLAYER_MODE_SWALLOW)							// Or already dead! :)
 	{
 		int	ouchThatHurt=true;
 		int	ouchThatHurtSoMuchThatImJustGoingToDieNow=false;

source/player/player.h

@@ -60,6 +60,7 @@ typedef enum
 	PLAYER_MODE_FLY,
 
 	PLAYER_MODE_CART,
+	PLAYER_MODE_SWALLOW,
 
 	NUM_PLAYERMODES,
 }PLAYER_MODE;
@@ -88,6 +89,7 @@ typedef enum
 	STATE_CART,
 	STATE_FLOAT,
 	STATE_CELEBRATE,
+	STATE_SWALLOW,
 
 	NUM_STATES,
 }PLAYER_STATE;
@@ -258,6 +260,7 @@ public:
 
 public:
 	void			setMode(PLAYER_MODE _mode);
+	PLAYER_MODE		getMode()											{return m_currentMode;}
 	int				getFacing();
 	void			setFacing(int _facing);
 	int				getAnimFrame();

source/player/pmbubble.cpp

@@ -82,6 +82,10 @@
 #include "player\psdance.h"
 #endif
 
+#ifndef __PLAYER_PSSWAL_H__
+#include "player\psswal.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -138,6 +142,7 @@ static	CPlayerState	*s_stateTable[]=
 	&s_stateCart,							// STATE_CART
 	&s_stateFloat,							// STATE_FLOAT
 	&s_stateDance,							// STATE_CELEBRATE
+	&s_stateSwallow,						// STATE_SWALLOW
 };
 
 

source/player/pmjelly.cpp

@@ -94,6 +94,10 @@
 #include "player\psdance.h"
 #endif
 
+#ifndef __PLAYER_PSSWAL_H__
+#include "player\psswal.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -150,6 +154,7 @@ static	CPlayerState	*s_stateTable[]=
 	&s_stateCart,							// STATE_CART
 	&s_stateFloat,							// STATE_FLOAT
 	&s_stateDance,							// STATE_CELEBRATE
+	&s_stateSwallow,						// STATE_SWALLOW
 };
 
 

source/player/pmodes.cpp

@@ -74,6 +74,10 @@
 #include "player\pscart.h"
 #endif
 
+#ifndef __PLAYER_PSSWAL_H__
+#include "player\psswal.h"
+#endif
+
 #ifndef __PLAYER_PSFLOAT_H__
 #include "player\psfloat.h"
 #endif
@@ -142,6 +146,7 @@ static	CPlayerState	*s_stateTable[]=
 	&s_stateCart,							// STATE_CART
 	&s_stateFloat,							// STATE_FLOAT
 	&s_stateDance,							// STATE_CELEBRATE
+	&s_stateSwallow,						// STATE_SWALLOW
 };
 
 static	PlayerMetrics	s_playerMetrics=