From: <au...@us...> - 2012-12-09 22:14:37
|
Revision: 12220 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=12220&view=rev Author: auria Date: 2012-12-09 22:14:27 +0000 (Sun, 09 Dec 2012) Log Message: ----------- Don't hardcode player ID Modified Paths: -------------- main/trunk/src/modes/overworld.cpp main/trunk/src/tinygettext/language.cpp Modified: main/trunk/src/modes/overworld.cpp =================================================================== --- main/trunk/src/modes/overworld.cpp 2012-12-09 21:57:40 UTC (rev 12219) +++ main/trunk/src/modes/overworld.cpp 2012-12-09 22:14:27 UTC (rev 12220) @@ -47,10 +47,10 @@ // Use keyboard 0 by default (FIXME: let player choose?) InputDevice* device = input_manager->getDeviceList()->getKeyboard(0); - + // Create player and associate player with keyboard - StateManager::get()->createActivePlayer( - UserConfigParams::m_all_players.get(0), device ); + StateManager::get()->createActivePlayer(unlock_manager->getCurrentPlayer(), + device); if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL) { Modified: main/trunk/src/tinygettext/language.cpp =================================================================== --- main/trunk/src/tinygettext/language.cpp 2012-12-09 21:57:40 UTC (rev 12219) +++ main/trunk/src/tinygettext/language.cpp 2012-12-09 22:14:27 UTC (rev 12220) @@ -191,7 +191,7 @@ { "my", 0, 0, "Burmese" }, { "my", "MM", 0, "Burmese (Myanmar)" }, { "nb", 0, 0, "Norwegian Bokmal" }, - { "nb", "NO", 0, "Norwegian Bokm\xE5l (Norway)" }, + { "nb", "NO", 0, "Norwegian Bokmål (Norway)" }, { "ne", 0, 0, "Nepali" }, { "nl", 0, 0, "Dutch" }, { "nl", "BE", 0, "Dutch (Belgium)" }, @@ -206,6 +206,7 @@ { "oc", 0, 0, "Occitan post 1500" }, { "om", 0, 0, "Oromo" }, { "or", 0, 0, "Oriya" }, + { "os", 0, 0, "Ossetian" }, { "pa", 0, 0, "Punjabi" }, { "pl", 0, 0, "Polish" }, { "pl", "PL", 0, "Polish (Poland)" }, @@ -296,7 +297,7 @@ // Aliases taken from /etc/locale.alias language_aliases["bokmal"] = "nb_NO.ISO-8859-1"; - language_aliases["bokm\xE5l"] = "nb_NO.ISO-8859-1"; + language_aliases["bokmål"] = "nb_NO.ISO-8859-1"; language_aliases["catalan"] = "ca_ES.ISO-8859-1"; language_aliases["croatian"] = "hr_HR.ISO-8859-2"; language_aliases["czech"] = "cs_CZ.ISO-8859-2"; @@ -307,7 +308,7 @@ language_aliases["eesti"] = "et_EE.ISO-8859-1"; language_aliases["estonian"] = "et_EE.ISO-8859-1"; language_aliases["finnish"] = "fi_FI.ISO-8859-1"; - language_aliases["fran\xE7ais"] = "fr_FR.ISO-8859-1"; + language_aliases["français"] = "fr_FR.ISO-8859-1"; language_aliases["french"] = "fr_FR.ISO-8859-1"; language_aliases["galego"] = "gl_ES.ISO-8859-1"; language_aliases["galician"] = "gl_ES.ISO-8859-1"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |