From: <au...@us...> - 2011-01-05 20:07:45
|
Revision: 7277 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7277&view=rev Author: auria Date: 2011-01-05 20:07:39 +0000 (Wed, 05 Jan 2011) Log Message: ----------- Fixed minor glitches caused by reading value from RaceManager before it was set Modified Paths: -------------- main/trunk/src/states_screens/race_setup_screen.cpp Modified: main/trunk/src/states_screens/race_setup_screen.cpp =================================================================== --- main/trunk/src/states_screens/race_setup_screen.cpp 2011-01-05 18:56:34 UTC (rev 7276) +++ main/trunk/src/states_screens/race_setup_screen.cpp 2011-01-05 20:07:39 UTC (rev 7277) @@ -125,7 +125,7 @@ { race_manager->setMinorMode(RaceManager::MINOR_MODE_3_STRIKES); UserConfigParams::m_game_mode = CONFIG_CODE_3STRIKES; - race_manager->setNumKarts( race_manager->getNumPlayers() ); // no AI karts; + race_manager->setNumKarts( race_manager->getNumLocalPlayers() ); // no AI karts; StateManager::get()->pushScreen( ArenasScreen::getInstance() ); } else if (selectedMode == "locked") @@ -136,8 +136,7 @@ else if (name == "aikartamount") { SpinnerWidget* w = dynamic_cast<SpinnerWidget*>(widget); - - race_manager->setNumKarts( race_manager->getNumPlayers() + w->getValue() ); + race_manager->setNumKarts( race_manager->getNumLocalPlayers() + w->getValue() ); } } @@ -174,13 +173,13 @@ SpinnerWidget* kartamount = getWidget<SpinnerWidget>("aikartamount"); kartamount->setActivated(); - + // Avoid negative numbers (which can happen if e.g. the number of karts // in a previous race was lower than the number of players now. - int num_ai = race_manager->getNumberOfKarts()-race_manager->getNumPlayers(); + int num_ai = race_manager->getNumberOfKarts()-race_manager->getNumLocalPlayers(); if(num_ai<0) num_ai = 0; kartamount->setValue(num_ai); - kartamount->setMax(stk_config->m_max_karts - race_manager->getNumPlayers() ); + kartamount->setMax(stk_config->m_max_karts - race_manager->getNumLocalPlayers() ); DynamicRibbonWidget* w2 = getWidget<DynamicRibbonWidget>("gamemode"); assert( w2 != NULL ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |