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

2018-12-22 10:06:47 +08:00
parent 64acb295a8 dc9513ec8d
commit 3292c8f0c3
1 changed files with 7 additions and 0 deletions
--- a/src/items/powerup_manager.cpp
+++ b/src/items/powerup_manager.cpp
@@ -602,6 +602,13 @@ PowerupManager::PowerupType PowerupManager::getRandomPowerup(unsigned int pos,
    }
    else
        *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;
 }   // getRandomPowerup