ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug that allowed to fire powerups before start, don't penalize anymore if honking before start (#3632)

Browse Source 
Signed-off-by: Fouks <42526046+Fouks0@users.noreply.github.com>
This commit is contained in:
Fouks0 2018-11-28 01:45:39 +01:00 committed by auriamg
parent 88a1dcc724
commit 1a1775e5cc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/karts/controller/player_controller.cpp
View File

@ -329,8 +329,7 @@ void PlayerController::update(int ticks)
if (World::getWorld()->isStartPhase()) if (World::getWorld()->isStartPhase())
{ {
if ((m_controls->getAccel() || m_controls->getBrake()|| if ((m_controls->getAccel() || m_controls->getBrake()||
m_controls->getFire() || m_controls->getNitro()) && m_controls->getNitro()) && !NetworkConfig::get()->isNetworking())
!NetworkConfig::get()->isNetworking())
{ {
// Only give penalty time in READY_PHASE. // Only give penalty time in READY_PHASE.
// Penalty time check makes sure it doesn't get rendered on every // Penalty time check makes sure it doesn't get rendered on every

6
src/karts/kart.cpp
View File

@ -1576,7 +1576,13 @@ void Kart::update(int ticks)
} }
// use() needs to be called even if there currently is no collecteable // use() needs to be called even if there currently is no collecteable
// since use() can test if something needs to be switched on/off. // since use() can test if something needs to be switched on/off.
if (!World::getWorld()->isStartPhase())
m_powerup->use(); m_powerup->use();
else
{
if(!getKartAnimation())
beep();
}
World::getWorld()->onFirePressed(getController()); World::getWorld()->onFirePressed(getController());
m_fire_clicked = 1; m_fire_clicked = 1;
} }