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-05-09 22:12:00 +00:00
parent 5ac705e30b
commit 88ebe93333
14 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/player/player.cpp
View file

@ -1545,9 +1545,13 @@ PLAYERINPUT CPlayer::readPadInput()
{
input=(PLAYERINPUT)(input|PI_JUMP);
}
if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION))
if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_FIRE))
{
input=(PLAYERINPUT)(input|PI_ACTION);
input=(PLAYERINPUT)(input|PI_FIRE);
}
if(pad&CPadConfig::getButton(CPadConfig::PAD_CFG_CATCH))
{
input=(PLAYERINPUT)(input|PI_CATCH);
}

3
source/player/player.h
View file

@ -130,7 +130,8 @@ typedef enum
PI_LEFT =1<<2,
PI_RIGHT =1<<3,
PI_JUMP =1<<4,
PI_ACTION =1<<5,
PI_FIRE =1<<5,
PI_CATCH =1<<6,
}PLAYERINPUT;

2
source/player/pmbubble.cpp
View file

@ -99,7 +99,7 @@ void CPlayerModeBubbleMixture::think()
else
{
// Start to blow?
if(!m_blowing&&getPadInputDown()&PI_ACTION&&canBlowBubbleFromThisState()&&m_player->getBubbleAmmo())
if(!m_blowing&&getPadInputDown()&PI_FIRE&&canBlowBubbleFromThisState()&&m_player->getBubbleAmmo())
{
// Spawn the bubbly platform thingy..!
CNpcPlayerBubblePlatform *bubble;

2
source/player/pmchop.cpp
View file

@ -79,7 +79,7 @@ void CPlayerModeChop::think()
CPlayerModeBase::think();
// Start to chop?
if(!m_chopping&&getPadInputDown()&PI_ACTION&&canAttackFromThisState())
if(!m_chopping&&getPadInputDown()&PI_FIRE&&canAttackFromThisState())
{
m_chopFrame=0;
getPlayerCollisionSize(&m_savedCSX,&m_savedCSY,&m_savedCSW,&m_savedCSH);

8
source/player/pmcoral.cpp
View file

@ -158,14 +158,14 @@ void CPlayerModeCoralBlower::think()
switch(m_blowerState)
{
case BLOWER_STATE__EMPTY:
if(getPadInputDown()&PI_ACTION&&getState()==STATE_IDLE)
if(getPadInputDown()&PI_FIRE&&getState()==STATE_IDLE)
{
m_blowerState=BLOWER_STATE__SUCKING;
m_enemy=NULL;
}
break;
case BLOWER_STATE__SUCKING:
if(!(getPadInputHeld()&PI_ACTION&&getState()==STATE_IDLE))
if(!(getPadInputHeld()&PI_FIRE&&getState()==STATE_IDLE))
{
m_blowerState=BLOWER_STATE__EMPTY;
}
@ -225,7 +225,7 @@ void CPlayerModeCoralBlower::think()
}
break;
case BLOWER_STATE__FULL:
if(getPadInputDown()&PI_ACTION&&getState()==STATE_IDLE)
if(getPadInputDown()&PI_FIRE&&getState()==STATE_IDLE)
{
m_blowerState=BLOWER_STATE__AIMING;
}
@ -235,7 +235,7 @@ void CPlayerModeCoralBlower::think()
{
m_blowerState=BLOWER_STATE__FULL;
}
else if(!(getPadInputHeld()&PI_ACTION))
else if(!(getPadInputHeld()&PI_FIRE))
{
// Fire!
m_blowerState=BLOWER_STATE__EMPTY;

2
source/player/pmdead.cpp
View file

@ -73,7 +73,7 @@ void CPlayerModeDead::think()
m_player->moveVertical(5);
if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_ACTION)||
if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)||
m_deadTime>DEATH_TIMEOUT)
{
respawn();

4
source/player/pmjelly.cpp
View file

@ -92,7 +92,7 @@ void CPlayerModeJellyLauncher::think()
switch(m_firingState)
{
case FIRING_STATE__NONE:
if(getPadInputDown()&PI_ACTION&&m_player->getJellyAmmo()&&canFireFromThisState())
if(getPadInputDown()&PI_FIRE&&m_player->getJellyAmmo()&&canFireFromThisState())
{
m_firingFrame=0;
m_firingTime=0;
@ -100,7 +100,7 @@ void CPlayerModeJellyLauncher::think()
}
break;
case FIRING_STATE__POWERINGUP:
if(getPadInputHeld()&PI_ACTION)
if(getPadInputHeld()&PI_FIRE)
{
int fc,frame;
if(m_firingTime<TIMEOUT_FOR_BIG_SHOT)

2
source/player/pmnet.cpp
View file

@ -108,7 +108,7 @@ void CPlayerModeNet::think()
CPlayerModeBase::think();
// Start to net?
if(!m_netting&&getPadInputDown()&PI_ACTION&&canSwingNetFromThisState())
if(!m_netting&&getPadInputDown()&PI_FIRE&&canSwingNetFromThisState())
{
m_netFrame=0;
m_netting=true;