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,6 +234,11 @@ 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]=
@@ -286,8 +303,8 @@ if(!free)
 		setRGB0(f4,255,0,0);
 		AddPrimToList(f4,0);
 	}
-
 }
+#endif	/* _SOUNDDEBUG */
 //////////////
 }