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

Removed minimal race gui.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-11-28 06:06:45 +00:00
parent b1c6ca2865
commit 26744f16d1
5 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/gui/options_ui.stkgui
View File

@ -39,12 +39,6 @@
<label height="100%" I18N="In the ui settings" text="Allow STK to connect to the Internet"/>
</div>
<div width="75%" height="fit" layout="horizontal-row" >
<checkbox id="minimal-racegui"/>
<spacer width="20" height="100%" />
<label height="100%" I18N="In the ui settings" text="Minimal Race GUI"/>
</div>
<spacer height="18" width="4"/>
<!-- ************ LANGUAGE CHOICE ************ -->

2
src/config/user_config.hpp
View File

@ -562,8 +562,6 @@ namespace UserConfigParams
PARAM_PREFIX BoolUserConfigParam m_cache_overworld
PARAM_DEFAULT( BoolUserConfigParam(true, "cache-overworld") );
PARAM_PREFIX BoolUserConfigParam m_minimal_race_gui
PARAM_DEFAULT( BoolUserConfigParam(false, "minimal-race-gui") );
// TODO : is this used with new code? does it still work?
PARAM_PREFIX BoolUserConfigParam m_crashed
PARAM_DEFAULT( BoolUserConfigParam(false, "crashed") );

15
src/states_screens/options_screen_ui.cpp
View File

@ -125,14 +125,6 @@ void OptionsScreenUI::init()
assert( news != NULL );
news->setState( UserConfigParams::m_internet_status
==INetworkHttp::IPERM_ALLOWED );
CheckBoxWidget* min_gui = getWidget<CheckBoxWidget>("minimal-racegui");
assert( min_gui != NULL );
min_gui->setState( UserConfigParams::m_minimal_race_gui);
if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
min_gui->setDeactivated();
else
min_gui->setActivated();
// --- select the right skin in the spinner
bool currSkinFound = false;
@ -236,13 +228,6 @@ void OptionsScreenUI::eventCallback(Widget* widget, const std::string& name, con
// a race condition can be introduced resulting in a crash).
INetworkHttp::get()->startNetworkThread();
}
else if (name=="minimal-racegui")
{
CheckBoxWidget* min_gui = getWidget<CheckBoxWidget>("minimal-racegui");
assert( min_gui != NULL );
UserConfigParams::m_minimal_race_gui =
!UserConfigParams::m_minimal_race_gui;
}
else if (name == "language")
{
ListWidget* list_widget = getWidget<ListWidget>("language");

18
src/states_screens/race_gui.cpp
View File

@ -65,17 +65,8 @@ RaceGUI::RaceGUI()
m_marker_rendered_size = 2 << ((int) ceil(1.0 + log(32.0 * scaling)));
m_marker_ai_size = (int)( 14.0f * scaling);
m_marker_player_size = (int)( 16.0f * scaling);
if (UserConfigParams::m_minimal_race_gui)
{
m_map_width = (int)(160.0f * scaling);
m_map_height = (int)(160.0f * scaling);
}
else
{
m_map_width = (int)(100.0f * scaling);
m_map_height = (int)(100.0f * scaling);
}
m_map_left = (int)( 10.0f * scaling);
m_map_bottom = (int)( 10.0f * scaling);
@ -189,12 +180,7 @@ void RaceGUI::renderGlobal(float dt)
drawGlobalMiniMap();
if (!m_is_tutorial &&
(UserConfigParams::m_minimal_race_gui == false || world->getIdent() == IDENT_STRIKES))
{
drawGlobalPlayerIcons(m_map_height);
}
if (!m_is_tutorial) drawGlobalPlayerIcons(m_map_height);
if(world->getTrack()->isSoccer()) drawScores();
} // renderGlobal
@ -221,8 +207,6 @@ void RaceGUI::renderPlayerView(const Camera *camera, float dt)
if(!World::getWorld()->isRacePhase()) return;
drawPowerupIcons (kart, viewport, scaling);
if (UserConfigParams::m_minimal_race_gui == false)
drawSpeedAndEnergy (kart, viewport, scaling);
if (!m_is_tutorial)

1
src/states_screens/race_gui_base.cpp
View File

@ -299,7 +299,6 @@ void RaceGUIBase::drawAllMessages(const AbstractKart* kart,
// Draw less important messages first, at the very bottom of the screen
// unimportant messages are skipped in multiplayer, they take too much screen space
if (race_manager->getNumLocalPlayers() < 2 &&
UserConfigParams::m_minimal_race_gui == false &&
!m_ignore_unimportant_messages)
{
for (AllMessageType::const_iterator i = m_messages.begin();