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

fixed tabs introduced by Robert's patch

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-03-19 15:25:20 +00:00
parent b02992455f
commit 35a157fd74
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/state_manager.cpp
View File

@ -59,7 +59,7 @@ namespace StateManager
w->updateItemDisplay(); w->updateItemDisplay();
GUIEngine::SpinnerWidget* w2 = dynamic_cast<GUIEngine::SpinnerWidget*> GUIEngine::SpinnerWidget* w2 = dynamic_cast<GUIEngine::SpinnerWidget*>
(GUIEngine::getCurrentScreen()->getWidget("player")); (GUIEngine::getCurrentScreen()->getWidget("player"));
assert( w2 != NULL ); assert( w2 != NULL );
w2->addLabel("Hiker"); w2->addLabel("Hiker");
w2->addLabel("Auria"); w2->addLabel("Auria");
@ -67,10 +67,10 @@ namespace StateManager
w2->addLabel("MiniBjorn"); w2->addLabel("MiniBjorn");
GUIEngine::ModelViewWidget* w3 = dynamic_cast<GUIEngine::ModelViewWidget*> GUIEngine::ModelViewWidget* w3 = dynamic_cast<GUIEngine::ModelViewWidget*>
(GUIEngine::getCurrentScreen()->getWidget("modelview")); (GUIEngine::getCurrentScreen()->getWidget("modelview"));
assert( w3 != NULL ); assert( w3 != NULL );
// set kart model // set kart model
IMesh* mesh = kart_properties_manager->getKart("tux")->getKartModel()->getModel(); IMesh* mesh = kart_properties_manager->getKart("tux")->getKartModel()->getModel();
SAnimatedMesh* test = new SAnimatedMesh(); // FIXME - memory management SAnimatedMesh* test = new SAnimatedMesh(); // FIXME - memory management
@ -88,10 +88,10 @@ namespace StateManager
main_loop->abort(); main_loop->abort();
return; return;
} }
else if (selection == "options") else if (selection == "options")
{ {
pushMenu("options.stkgui"); pushMenu("options.stkgui");
} }
} }
// -- kart selection screen // -- kart selection screen
@ -109,7 +109,7 @@ namespace StateManager
showTrackSelectionScreen(); showTrackSelectionScreen();
} }
} }
// -- track seelction screen // -- track seelction screen
if(name == "tracks") if(name == "tracks")
{ {
@ -167,7 +167,7 @@ namespace StateManager
318 race_manager->setCoinTarget(0); 318 race_manager->setCoinTarget(0);
inputDriver->setMode(SDLDriver::INGAME); inputDriver->setMode(SDLDriver::INGAME);
race_manager->setLocalKartInfo(0, argv[i+1]); race_manager->setLocalKartInfo(0, argv[i+1]);
race_manager->setDifficulty(RaceManager::RD_EASY); race_manager->setDifficulty(RaceManager::RD_EASY);
@ -175,10 +175,10 @@ namespace StateManager
race_manager->setDifficulty(RaceManager::RD_HARD); race_manager->setDifficulty(RaceManager::RD_HARD);
race_manager->setTrack(argv[i+1]); race_manager->setTrack(argv[i+1]);
user_config->setDefaultNumKarts(stk_config->m_max_karts); user_config->setDefaultNumKarts(stk_config->m_max_karts);
race_manager->setNumKarts(user_config->getDefaultNumKarts() ); race_manager->setNumKarts(user_config->getDefaultNumKarts() );
user_config->getDefaultNumKarts() user_config->getDefaultNumKarts()
StateManager::enterGameState(); StateManager::enterGameState();