zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-08-18 20:28:12 +00:00
parent d3d3b2e25f
commit 343883562c
1 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
source/player/player.cpp
View file

@ -846,6 +846,16 @@ if(newmode!=-1)
{ {
// If already armed then drop current weapon // If already armed then drop current weapon
if(m_currentMode!=PLAYER_MODE_BASICUNARMED) if(m_currentMode!=PLAYER_MODE_BASICUNARMED)
{
switch(m_currentPlayerModeClass->getState())
{
case STATE_BUTTBOUNCE:
case STATE_BUTTFALL:
case STATE_BUTTLAND:
case STATE_BUTTBOUNCEUP:
break;
default:
{ {
static const int s_pickupsToDrop[NUM_PLAYERMODES]= static const int s_pickupsToDrop[NUM_PLAYERMODES]=
{ {
@ -875,6 +885,10 @@ if(newmode!=-1)
((CBaseWeaponPickup*)pickup)->setHasBeenCollected(); ((CBaseWeaponPickup*)pickup)->setHasBeenCollected();
} }
setMode(PLAYER_MODE_BASICUNARMED); setMode(PLAYER_MODE_BASICUNARMED);
break;
}
}
} }
// Now trying to pick up a weapon.. // Now trying to pick up a weapon..