diff --git a/data/gui/screens/options_ui.stkgui b/data/gui/screens/options_ui.stkgui
index 921c45b52..512a97da4 100644
--- a/data/gui/screens/options_ui.stkgui
+++ b/data/gui/screens/options_ui.stkgui
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index b4b91d939..267df2932 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -450,11 +450,14 @@ namespace UserConfigParams
PARAM_DEFAULT( StringUserConfigParam("all", "last_kart_group",
"Last selected kart group") );
PARAM_PREFIX IntUserConfigParam m_soccer_red_ai_num
- PARAM_DEFAULT( IntUserConfigParam(0, "m_soccer_red_ai_num",
+ PARAM_DEFAULT( IntUserConfigParam(0, "soccer-red-ai-num",
&m_race_setup_group, "Number of red AI karts in soccer mode.") );
PARAM_PREFIX IntUserConfigParam m_soccer_blue_ai_num
- PARAM_DEFAULT( IntUserConfigParam(0, "m_soccer_blue_ai_num",
+ PARAM_DEFAULT( IntUserConfigParam(0, "soccer-blue-ai-num",
&m_race_setup_group, "Number of blue AI karts in soccer mode.") );
+ PARAM_PREFIX BoolUserConfigParam m_karts_powerup_gui
+ PARAM_DEFAULT( BoolUserConfigParam(false, "karts-powerup-gui",
+ &m_race_setup_group, "Show other karts' held powerups in race gui.") );
// ---- Wiimote data
PARAM_PREFIX GroupUserConfigParam m_wiimote_group
diff --git a/src/states_screens/options/options_screen_ui.cpp b/src/states_screens/options/options_screen_ui.cpp
index d3eac1558..14ab88f97 100644
--- a/src/states_screens/options/options_screen_ui.cpp
+++ b/src/states_screens/options/options_screen_ui.cpp
@@ -231,6 +231,10 @@ void OptionsScreenUI::init()
assert(splitscreen_method != NULL);
splitscreen_method->setState(UserConfigParams::split_screen_horizontally);
+ CheckBoxWidget* karts_powerup_gui = getWidget("karts_powerup_gui");
+ assert(karts_powerup_gui != NULL);
+ karts_powerup_gui->setState(UserConfigParams::m_karts_powerup_gui);
+
//Forbid changing this setting in game
splitscreen_method->setActive(!in_game);
@@ -374,7 +378,12 @@ void OptionsScreenUI::eventCallback(Widget* widget, const std::string& name, con
CheckBoxWidget* split_screen_horizontally = getWidget("split_screen_horizontally");
assert(split_screen_horizontally != NULL);
UserConfigParams::split_screen_horizontally = split_screen_horizontally->getState();
-
+ }
+ else if (name == "karts_powerup_gui")
+ {
+ CheckBoxWidget* karts_powerup_gui = getWidget("karts_powerup_gui");
+ assert(karts_powerup_gui != NULL);
+ UserConfigParams::m_karts_powerup_gui = karts_powerup_gui->getState();
}
else if (name == "showfps")
{
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 77bb1ad9a..65d1d3199 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -1077,7 +1077,8 @@ void RaceGUIBase::drawPlayerIcon(AbstractKart *kart, int x, int y, int w,
// Current item(s) and how many if > 1
const Powerup* powerup = kart->getPowerup();
- if (powerup->getType() != PowerupManager::POWERUP_NOTHING && !kart->hasFinishedRace())
+ if (UserConfigParams::m_karts_powerup_gui &&
+ powerup->getType() != PowerupManager::POWERUP_NOTHING && !kart->hasFinishedRace())
{
int numberItems = kart->getPowerup()->getNum();
video::ITexture *iconItem = powerup->getIcon()->getTexture();