source/player/player.cpp

@@ -684,15 +684,6 @@ else if(oldmode!=-1&&!(PadGetHeld(0)&PAD_L1))
 	oldmode=-1;
 }
 
-#ifdef __USER_paul__
-if(PadGetHeld(0)&PAD_L1&&PadGetHeld(0)&PAD_L2)
-{
-	if(m_currentMode!=PLAYER_MODE_DEAD)
-	{
-		dieYouPorousFreak();
-	}
-}
-#endif
 if(newmode!=-1)
 {
 	setMode((PLAYER_MODE)newmode);
@@ -723,10 +714,26 @@ if(newmode!=-1)
 		}
 	}
 
+	m_tryingToPickupWeapon=false;
 	for(i=0;i<_frames;i++)
 	{
 		// Think
 		updatePadInput();
+if(getPadInputDown())
+{
+	PAUL_DBGMSG("%02x",getPadInputDown());
+}
+		if(getPadInputDown()&PI_WEAPONCHANGE)
+		{
+			if(!m_tryingToPickupWeapon&&
+			   m_currentMode!=PLAYER_MODE_BASICUNARMED&&
+			   m_currentMode!=PLAYER_MODE_FULLUNARMED&&
+			   m_currentMode!=PLAYER_MODE_DEAD)
+			{
+				setMode(PLAYER_MODE_FULLUNARMED);
+			}
+			m_tryingToPickupWeapon=true;
+		}
 
 		// Trying to converate?
 		if(m_allowConversation==false&&
@@ -1959,6 +1966,10 @@ PLAYERINPUT CPlayer::readPadInput()
 	{
 		input=(PLAYERINPUT)(input|PI_CATCH);
 	}
+	if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_WEAPONCHANGE))
+	{
+		input=(PLAYERINPUT)(input|PI_WEAPONCHANGE);
+	}
 
 
 #ifdef _RECORD_DEMO_MODE_

source/player/player.h

@@ -156,6 +156,7 @@ typedef enum
 	PI_JUMP			=1<<4,
 	PI_FIRE			=1<<5,
 	PI_CATCH		=1<<6,
+	PI_WEAPONCHANGE	=1<<7,
 }PLAYERINPUT;
 
 
@@ -258,6 +259,7 @@ public:
 	void			setPlayerPos(DVECTOR *_pos)							{Pos=*_pos;}
 	PLAYERINPUT		getPadInputHeld()									{return m_padInput;}
 	PLAYERINPUT		getPadInputDown()									{return m_padInputDown;}
+	int				tryingToPickupWeapon()								{return m_tryingToPickupWeapon;}
 	class CLayerCollision	*getLayerCollision()						{return m_layerCollision;}
 							
 	void			inSoakUpState();
@@ -336,6 +338,7 @@ private:
 	PLAYERINPUT			m_padInput;			// Controls that are being held down
 	PLAYERINPUT			m_lastPadInput;		// Last frames controls
 	PLAYERINPUT			m_padInputDown;		// Controls that were pressed this frame
+	int					m_tryingToPickupWeapon;
 
 	
 	// Various info about the current map