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-06-19 15:31:18 +00:00
parent 75649b9bef
commit 914a5338cb
2 changed files with 10 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

51
source/player/pmcoral.cpp
View file

@ -163,7 +163,7 @@ static PlayerMetrics s_playerMetrics=
void CPlayerModeCoralBlower::enter() void CPlayerModeCoralBlower::enter()
{ {
CPlayerModeBase::enter(); CPlayerModeBase::enter();
m_blowerState=BLOWER_STATE__EMPTY; m_blowerState=BLOWER_STATE__FULL;
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -255,7 +255,6 @@ void CPlayerModeCoralBlower::think()
{ {
m_blowerState=BLOWER_STATE__AIMING; m_blowerState=BLOWER_STATE__AIMING;
m_launchHeading=0; m_launchHeading=0;
m_launchHeadingChangeSpeed=0;
} }
break; break;
case BLOWER_STATE__AIMING: case BLOWER_STATE__AIMING:
@ -294,49 +293,17 @@ void CPlayerModeCoralBlower::think()
} }
else else
{ {
int padHeld; int padDown;
padHeld=getPadInputHeld(); padDown=getPadInputDown();
if(padHeld&PI_UP) if(padDown&PI_UP)
{ {
if(m_launchHeadingChangeSpeed>-BLOWER_AIM_SPEED_INITIAL) m_launchHeading-=BLOWER_AIM_MOVE_AMOUNT;
{ if(m_launchHeading<BLOWER_MINIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MINIMUM_AIM_ANGLE;
m_launchHeadingChangeSpeed=-BLOWER_AIM_SPEED_INITIAL;
} }
else else if(padDown&PI_DOWN)
{ {
if(m_launchHeadingChangeSpeed>-BLOWER_AIM_SPEED_MAXIMUM) m_launchHeading+=BLOWER_AIM_MOVE_AMOUNT;
{ if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE;
m_launchHeadingChangeSpeed--;
}
}
m_launchHeading+=m_launchHeadingChangeSpeed;
if(m_launchHeading<BLOWER_MINIMUM_AIM_ANGLE)
{
m_launchHeading=BLOWER_MINIMUM_AIM_ANGLE;
}
}
else if(padHeld&PI_DOWN)
{
if(m_launchHeadingChangeSpeed<BLOWER_AIM_SPEED_INITIAL)
{
m_launchHeadingChangeSpeed=BLOWER_AIM_SPEED_INITIAL;
}
else
{
if(m_launchHeadingChangeSpeed<BLOWER_AIM_SPEED_MAXIMUM)
{
m_launchHeadingChangeSpeed++;
}
}
m_launchHeading+=m_launchHeadingChangeSpeed;
if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)
{
m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE;
}
}
else
{
m_launchHeadingChangeSpeed=0;
} }
} }
break; break;

4
source/player/pmcoral.h
View file

@ -61,8 +61,7 @@ private:
BLOWER_TARGET_DISTANCE=40, BLOWER_TARGET_DISTANCE=40,
BLOWER_MINIMUM_AIM_ANGLE=-768, BLOWER_MINIMUM_AIM_ANGLE=-768,
BLOWER_MAXIMUM_AIM_ANGLE=768, BLOWER_MAXIMUM_AIM_ANGLE=768,
BLOWER_AIM_SPEED_INITIAL=1, BLOWER_AIM_MOVE_AMOUNT=256,
BLOWER_AIM_SPEED_MAXIMUM=50,
}; };
DVECTOR *getSuckUpPoint(); DVECTOR *getSuckUpPoint();
@ -72,7 +71,6 @@ private:
u8 m_enemyFrame; u8 m_enemyFrame;
int m_launchHeading; int m_launchHeading;
int m_launchHeadingChangeSpeed;
}; };