diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index bdfcbce0f..fd062b318 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -163,7 +163,7 @@ static PlayerMetrics s_playerMetrics= void CPlayerModeCoralBlower::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_launchHeading=0; - m_launchHeadingChangeSpeed=0; } break; case BLOWER_STATE__AIMING: @@ -294,49 +293,17 @@ void CPlayerModeCoralBlower::think() } else { - int padHeld; - padHeld=getPadInputHeld(); - if(padHeld&PI_UP) + int padDown; + padDown=getPadInputDown(); + if(padDown&PI_UP) { - 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_launchHeadingBLOWER_MAXIMUM_AIM_ANGLE) - { - m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE; - } - } - else - { - m_launchHeadingChangeSpeed=0; + m_launchHeading+=BLOWER_AIM_MOVE_AMOUNT; + if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE; } } break; diff --git a/source/player/pmcoral.h b/source/player/pmcoral.h index f7d4de719..88e92a910 100644 --- a/source/player/pmcoral.h +++ b/source/player/pmcoral.h @@ -61,8 +61,7 @@ private: BLOWER_TARGET_DISTANCE=40, BLOWER_MINIMUM_AIM_ANGLE=-768, BLOWER_MAXIMUM_AIM_ANGLE=768, - BLOWER_AIM_SPEED_INITIAL=1, - BLOWER_AIM_SPEED_MAXIMUM=50, + BLOWER_AIM_MOVE_AMOUNT=256, }; DVECTOR *getSuckUpPoint(); @@ -72,7 +71,6 @@ private: u8 m_enemyFrame; int m_launchHeading; - int m_launchHeadingChangeSpeed; };