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

Replaced tabs with spaces, fixed windows compilation (though live language

Browse Source 
switch still doesn't work).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-02-04 02:07:39 +00:00
parent ade507a369
commit b84df65e94
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/states_screens/main_menu_screen.cpp
View File

@ -82,19 +82,19 @@ void MainMenuScreen::init()
input_manager->getDeviceList()->setAssignMode(NO_ASSIGN);
input_manager->getDeviceList()->setSinglePlayer( NULL );
input_manager->setMasterPlayerOnly(false);
// Avoid incorrect behaviour in certain race circumstances:
// If a multi-player game is played with two keyboards, the 2nd
// player selects his kart last, and only the keyboard is used
// to select all other settings - then if the next time the kart
// selection screen comes up, the default device will still be
// the 2nd player. So if the first player presses 'select', it
// will instead add a second player (so basically the key
// binding for the second player become the default, so pressing
// select will add a new player). See bug 3090931
// To avoid this, we will clean the last used device, making
// the key bindings for the first player the default again.
input_manager->getDeviceList()->clearLatestUsedDevice();
// Avoid incorrect behaviour in certain race circumstances:
// If a multi-player game is played with two keyboards, the 2nd
// player selects his kart last, and only the keyboard is used
// to select all other settings - then if the next time the kart
// selection screen comes up, the default device will still be
// the 2nd player. So if the first player presses 'select', it
// will instead add a second player (so basically the key
// binding for the second player become the default, so pressing
// select will add a new player). See bug 3090931
// To avoid this, we will clean the last used device, making
// the key bindings for the first player the default again.
input_manager->getDeviceList()->clearLatestUsedDevice();
#ifdef ADDONS_MANAGER
if(!addons_manager->onlineReady())
@ -219,11 +219,19 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
if (selection == "system")
{
setenv( "LANGUAGE=", "", 1);
#ifdef WIN32
SetEnvironmentVariableA("LANGUAGE", "");
#else
setenv( "LANGUAGE=", "", 1);
#endif
}
else
{
setenv("LANGUAGE", selection.c_str(), 1);
#ifdef WIN32
SetEnvironmentVariableA("LANGUAGE", selection.c_str());
#else
setenv("LANGUAGE", selection.c_str(), 1);
#endif
}
translations = new Translations();