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

Browse source
This commit is contained in:
Paul 2001-07-16 19:06:30 +00:00
parent 366b611e2e
commit 2a6beb64f7
1 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

21
source/player/player.cpp
View file

@ -749,9 +749,6 @@ if(newmode!=-1)
m_allowConversation=false; m_allowConversation=false;
m_tryingToManuallyPickupWeapon=false;
m_tryingToAutomaticallyPickupWeapon=false;
m_xMove = Pos.vx; m_xMove = Pos.vx;
/// ///
@ -768,6 +765,14 @@ if(PadGetDown(0)&PAD_TRIANGLE)
{ {
updatePadInput(); updatePadInput();
// Only do the weapon change stuff on the first frame. As the buttons pressed do not
// change over these frames there is no point in doing it every frame
if(i==0)
{
m_tryingToManuallyPickupWeapon=false;
m_tryingToAutomaticallyPickupWeapon=false;
// Weapon collect/drop/swap stuff.. // Weapon collect/drop/swap stuff..
if(m_currentMode==PLAYER_MODE_BASICUNARMED) if(m_currentMode==PLAYER_MODE_BASICUNARMED)
{ {
@ -777,9 +782,6 @@ if(PadGetDown(0)&PAD_TRIANGLE)
} }
if(getPadInputDown()&PI_WEAPONCHANGE) if(getPadInputDown()&PI_WEAPONCHANGE)
{ {
// Trying to pick up a weapon
m_tryingToManuallyPickupWeapon=true;
// 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&&
m_currentMode!=PLAYER_MODE_DEAD) m_currentMode!=PLAYER_MODE_DEAD)
@ -812,6 +814,10 @@ if(PadGetDown(0)&PAD_TRIANGLE)
} }
setMode(PLAYER_MODE_BASICUNARMED); setMode(PLAYER_MODE_BASICUNARMED);
} }
// Now trying to pick up a weapon..
m_tryingToManuallyPickupWeapon=true;
}
} }
// Trying to converate? // Trying to converate?
@ -1623,6 +1629,9 @@ void CPlayer::setMode(PLAYER_MODE _mode)
m_moveVelocity.vx=m_moveVelocity.vy=0; m_moveVelocity.vx=m_moveVelocity.vy=0;
} }
m_currentPlayerModeClass->enter(); m_currentPlayerModeClass->enter();
m_tryingToManuallyPickupWeapon=false;
m_tryingToAutomaticallyPickupWeapon=false;
} }