data/translations/text.dat

@@ -152,11 +152,11 @@ eng=RESTART LEVEL
 ; ---------------------------------------------------------------
 
 [STR__DEBUG__BASICUNARMED_MODE]
-eng=Set BASICUNARMED mode
+eng=Set BASIC UNARMED mode
 [STR__DEBUG__FULLUNARMED_MODE]
-eng=Set FULLUNARMED mode
+eng=Set FULL UNARMED mode
 [STR__DEBUG__SQUEAKYBOOTS_MODE]
-eng=Set SQUEAKYBOOTS mode
+eng=Set SQUEAKY BOOTS mode
 [STR__DEBUG__BALLOON_MODE]
 eng=Set BALLOON mode
 [STR__DEBUG__BUBBLEMIXTURE_MODE]
@@ -164,7 +164,9 @@ eng=Set BUBBLE MIXTURE mode
 [STR__DEBUG__NET_MODE]
 eng=Set NET mode
 [STR__DEBUG__CORALBLOWER_MODE]
-eng=Set CORALBLOWER mode
+eng=Set CORAL BLOWER mode
+[STR__DEBUG__JELLYLAUNCHER_MODE]
+eng=Set JELLY LAUNCHER mode
 [STR__DEBUG__DEAD_MODE]
 eng=Set DEAD mode
 [STR__DEBUG__FLY_MODE]

makefile.gaz

@@ -160,6 +160,7 @@ player_src :=		demoplay \
 					pmcoral \
 					pmdead \
 					pmfly \
+					pmjelly \
 					pmnet \
 					psbutt \
 					psduck \

source/game/pause.cpp

@@ -127,6 +127,11 @@ void CPauseMenu::init()
 										STR__DEBUG__CORALBLOWER_MODE,
 										&newmode,PLAYER_MODE_CORALBLOWER);
 	xpos+=TEXT_SPACING;
+	CGUIFactory::createValueButtonFrame(m_guiFrame,
+										(FRAME_WIDTH-TEXT_BOX_WIDTH)/2,xpos,TEXT_BOX_WIDTH,TEXT_BOX_HEIGHT,
+										STR__DEBUG__JELLYLAUNCHER_MODE,
+										&newmode,PLAYER_MODE_JELLY_LAUNCHER);
+	xpos+=TEXT_SPACING;
 	CGUIFactory::createValueButtonFrame(m_guiFrame,
 										(FRAME_WIDTH-TEXT_BOX_WIDTH)/2,xpos,TEXT_BOX_WIDTH,TEXT_BOX_HEIGHT,
 										STR__DEBUG__DEAD_MODE,

source/player/player.cpp

@@ -61,6 +61,10 @@
 #include "player\pmfly.h"
 #endif
 
+#ifndef	__PLAYER_PMJELLY_H__
+#include "player\pmjelly.h"
+#endif
+
 #ifndef __GFX_FONT_H__
 #include "gfx\font.h"
 #endif
@@ -163,6 +167,7 @@ static const char *s_modeText[NUM_PLAYERMODES]=
 	"BUBBLE MIXTURE",
 	"NET",
 	"CORALBLOWER",
+	"JELLY LAUNCHER",
 	"DEAD",
 	"FLY",
 };
@@ -188,6 +193,7 @@ CPlayerModeBalloon			PLAYERMODEBALLOON;
 CPlayerModeBubbleMixture	PLAYERMODEBUBBLEMIXTURE;
 CPlayerModeNet				PLAYERMODENET;
 CPlayerModeCoralBlower		PLAYERMODECORALBLOWER;
+CPlayerModeJellyLauncher	PLAYERMODEJELLYLAUNCHER;
 CPlayerModeDead				PLAYERMODEDEAD;
 CPlayerModeFly				PLAYERMODEFLY;
 
@@ -199,6 +205,7 @@ CPlayerMode	*CPlayer::s_playerModes[NUM_PLAYERMODES]=
 	&PLAYERMODEBUBBLEMIXTURE,	// PLAYER_MODE_BUBBLE_MIXTURE
 	&PLAYERMODENET,				// PLAYER_MODE_NET
 	&PLAYERMODECORALBLOWER,		// PLAYER_MODE_CORALBLOWER
+	&PLAYERMODEJELLYLAUNCHER,	// PLAYER_MODE_JELLY_LAUNCHER
 	&PLAYERMODEDEAD,			// PLAYER_MODE_DEAD
 	&PLAYERMODEFLY,				// PLAYER_MODE_FLY
 };

source/player/player.h

@@ -53,7 +53,7 @@ typedef enum
 	PLAYER_MODE_BUBBLE_MIXTURE,
 	PLAYER_MODE_NET,
 	PLAYER_MODE_CORALBLOWER,
-	//PLAYER_MODE_JELLY_LAUNCHER,
+	PLAYER_MODE_JELLY_LAUNCHER,
 
 	PLAYER_MODE_DEAD,
 

source/player/pmjelly.cpp

@@ -59,7 +59,7 @@
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CPlayerModeJelly::enter()
+void	CPlayerModeJellyLauncher::enter()
 {
 	m_netting=false;
 	m_netState=NET_STATE__EMPTY;
@@ -72,7 +72,7 @@ void	CPlayerModeJelly::enter()
 	Returns:
   ---------------------------------------------------------------------- */
 //int netstate;
-void	CPlayerModeJelly::think()
+void	CPlayerModeJellyLauncher::think()
 {
 	// If we're netting then restore the 'real' anim number/frame before
 	// doing the think so that the rest of the code doesn't know what
@@ -123,7 +123,7 @@ void	CPlayerModeJelly::think()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CPlayerModeJelly::renderModeUi()
+void	CPlayerModeJellyLauncher::renderModeUi()
 {
 	SpriteBank	*sb;
 	sFrameHdr	*fh;
@@ -147,13 +147,13 @@ void	CPlayerModeJelly::renderModeUi()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CPlayerModeJelly::setAnimNo(int _animNo)
+void	CPlayerModeJellyLauncher::setAnimNo(int _animNo)
 {
 	CPlayerModeBase::setAnimNo(_animNo);
 	m_savedAnimNo=_animNo;
 }
 
-void	CPlayerModeJelly::setAnimFrame(int _animFrame)
+void	CPlayerModeJellyLauncher::setAnimFrame(int _animFrame)
 {
 	CPlayerModeBase::setAnimFrame(_animFrame);
 	m_savedAnimFrame=_animFrame;
@@ -165,7 +165,7 @@ void	CPlayerModeJelly::setAnimFrame(int _animFrame)
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-int		CPlayerModeJelly::canSwingNetFromThisState()
+int		CPlayerModeJellyLauncher::canSwingNetFromThisState()
 {
 	int	ret=false;
 

source/player/pmjelly.h

@@ -34,7 +34,7 @@
 	Structure defintions
 	-------------------- */
 
-class CPlayerModeJelly : public CPlayerModeBase
+class CPlayerModeJellyLauncher : public CPlayerModeBase
 {
 public:
 	virtual void				enter();

users/paul/spongebob project/spongebob project.dsp

@@ -880,6 +880,14 @@ SOURCE=..\..\..\source\player\pmfly.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\player\pmjelly.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\player\pmjelly.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\player\pmnet.cpp
 # End Source File
 # Begin Source File