Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-05-29 16:12:06 +00:00
parent 5ac50e9c22
commit bf8cdb4ae1
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/pickups/pickup.h
View File

@ -111,13 +111,11 @@ private:
};
class CBaseWeaponPickup : public CBaseRespawningPickup
class CBaseWeaponPickup : public CBasePickup
{
protected:
virtual void collidedWith(CThing *_thisThing);
virtual int getRespawnTime() {return 5*60;}
};

13
source/player/player.cpp
View File

@ -746,17 +746,28 @@ if(newmode!=-1)
{
// Think
updatePadInput();
if(getPadInputDown()&PI_WEAPONCHANGE)
if(!m_tryingToPickupWeapon)
{
if(m_currentMode==PLAYER_MODE_BASICUNARMED||
m_currentMode==PLAYER_MODE_FULLUNARMED)
{
// Always trying to pickup weapon if unarmed... means that when SB walks
// over an item whilst unarmed, he automatically picks it up
m_tryingToPickupWeapon=true;
}
else if(getPadInputDown()&PI_WEAPONCHANGE)
{
if(!m_tryingToPickupWeapon&&
m_currentMode!=PLAYER_MODE_BASICUNARMED&&
m_currentMode!=PLAYER_MODE_FULLUNARMED&&
m_currentMode!=PLAYER_MODE_DEAD)
{
// Drop current weapon
setMode(PLAYER_MODE_FULLUNARMED);
}
m_tryingToPickupWeapon=true;
}
}
// Trying to converate?
if(m_allowConversation==false&&