source/game/game.cpp

@@ -617,10 +617,13 @@ void CGameScene::think_playing(int _frames)
 	}
 
 
-	if(!m_pauseMenu->isActive()&&PadGetDown(0)&PAD_START&&canPause())
+	if(canPause()&&!m_pauseMenu->isActive())
+	{
+		if(PadGetDown(0)&PAD_START||!PadIsConnected(0))
 		{
 			m_pauseMenu->select();
 		}
+	}
 
 	// Conversation think ( with pad debounce stuff.. )
 	if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();

source/pickups/pjlammo.h

@@ -60,6 +60,9 @@ public:
 
 protected:
 	virtual int			getWeaponSpriteFrame();
+
+private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_JELLY_LAUNCHER;}
 };
 
 

source/sound/xmplay.cpp

@@ -54,12 +54,24 @@
 	Vars
 	---- */
 
+#ifdef __VERSION_DEBUG__
+#define _SOUNDDEBUG
+#endif
+
+
+
+#ifdef	_SOUNDDEBUG
+
+#include "pad\pads.h"
+
 #ifdef	__USER_paul__
 static int sounddebug=true;
 #else
 static int sounddebug=false;
 #endif
 
+#endif	/* SFX_JELLY_LAUNCHER */
+
 
 /*----------------------------------------------------------------------
 	Function:
@@ -222,29 +234,34 @@ void CXMPlaySound::think()
 
 
 //////////////
+#ifdef	_SOUNDDEBUG
+if(PadGetDown(1)&PAD_L1&&PadGetHeld(1)&(PAD_L2|PAD_R1|PAD_R2))
+{
+	sounddebug=!sounddebug;
+}
 if(sounddebug)
 {
-static const int	colours[6][3]=
-{
+	static const int	colours[6][3]=
+	{
 		{	255,255,255		},			// SONG
 		{	255,  0,255		},			// SFX
 		{	  0,  0,255		},			// LOOPINGSFX
 		{	255,255,  0		},			// SILENT
 		{	  0,255,  0		},			// FREE
 		{	128,128,128		},			// CONTINUE
-};
-static int			frameFlag=0;
+	};
+	static int			frameFlag=0;
 
-int				i,x,free;
-spuChannelUse	*ch;
-POLY_F4			*f4;
+	int				i,x,free;
+	spuChannelUse	*ch;
+	POLY_F4			*f4;
 
-x=50;
-free=0;
-ch=m_spuChannelUse;
+	x=50;
+	free=0;
+	ch=m_spuChannelUse;
 
-for(i=0;i<NUM_SPU_CHANNELS;i++)
-{
+	for(i=0;i<NUM_SPU_CHANNELS;i++)
+	{
 		const int	*colour=&colours[ch->m_useType][0];
 		f4=GetPrimF4();
 		setXYWH(f4,x,20,8,8);
@@ -264,30 +281,30 @@ for(i=0;i<NUM_SPU_CHANNELS;i++)
 
 		x+=10;
 		ch++;
-}
+	}
 
-f4=GetPrimF4();
-setXYWH(f4,50,15,(24*10)-2,2);
-if(frameFlag)
-{
+	f4=GetPrimF4();
+	setXYWH(f4,50,15,(24*10)-2,2);
+	if(frameFlag)
+	{
 		setRGB0(f4,255,255,255);
-}
-else
-{
+	}
+	else
+	{
 		setRGB0(f4,0,0,0);
-}
-AddPrimToList(f4,0);
-frameFlag^=1;
+	}
+	AddPrimToList(f4,0);
+	frameFlag^=1;
 
-if(!free)
-{
+	if(!free)
+	{
 		f4=GetPrimF4();
 		setXYWH(f4,50,30,(24*10)-2,4);
 		setRGB0(f4,255,0,0);
 		AddPrimToList(f4,0);
+	}
 }
-
-}
+#endif	/* _SOUNDDEBUG */
 //////////////
 }