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

Merge remote-tracking branch 'fouks/prevent-early-explosive-items' into voting_gui

Browse Source
This commit is contained in:
Benau 2018-12-22 10:06:47 +08:00
commit 3292c8f0c3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/items/powerup_manager.cpp
View File

@ -602,6 +602,13 @@ PowerupManager::PowerupType PowerupManager::getRandomPowerup(unsigned int pos,
} }
else else
*n=1; *n=1;
// Prevents early explosive items
if (stk_config->ticks2Time(World::getWorld()->getTicksSinceStart()) < 15.)
{
if (powerup == POWERUP_CAKE || powerup == POWERUP_RUBBERBALL)
powerup = POWERUP_BOWLING;
}
return (PowerupType)powerup; return (PowerupType)powerup;
} // getRandomPowerup } // getRandomPowerup