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

Minor cleanup: remove useless ArenasScreen::setUsedForSoccer()

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66
2013-01-02 12:16:44 +00:00
parent fa7c3cffb3
commit 9824370beb
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/states_screens/arenas_screen.cpp
View File

@@ -42,7 +42,7 @@ const char* ALL_ARENA_GROUPS_ID = "all";
// -----------------------------------------------------------------------------
ArenasScreen::ArenasScreen() : Screen("arenas.stkgui"), m_used_for_soccer(false)
ArenasScreen::ArenasScreen() : Screen("arenas.stkgui")
{
}
@@ -90,7 +90,7 @@ void ArenasScreen::beforeAddingWidget()
for (unsigned int n=0; n<track_manager->getNumberOfTracks(); n++) //iterate through tracks to find how many are arenas
{
Track* temp = track_manager->getTrack(n);
if (m_used_for_soccer)
if (race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)
{
if(temp->isSoccer())
num_of_arenas++;
@@ -220,7 +220,7 @@ void ArenasScreen::buildTrackList()
for (int n=0; n<trackAmount; n++)
{
Track* curr = track_manager->getTrack(n);
if (m_used_for_soccer)
if (race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)
{
if(!curr->isSoccer()) continue;
}
@@ -250,7 +250,7 @@ void ArenasScreen::buildTrackList()
for (int n=0; n<trackAmount; n++)
{
Track* curr = track_manager->getTrack(currArenas[n]);
if (m_used_for_soccer)
if (race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)
{
if(!curr->isSoccer()) continue;
}

4
src/states_screens/arenas_screen.hpp
View File

@@ -31,8 +31,6 @@ class ArenasScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
{
friend class GUIEngine::ScreenSingleton<ArenasScreen>;
bool m_used_for_soccer; // List soccer arenas instead of battle arenas
ArenasScreen();
void buildTrackList();
@@ -52,8 +50,6 @@ public:
const int playerID) OVERRIDE;
void setFocusOnTrack(const std::string& trackName);
void setUsedForSoccer(bool used_for_soccer) { m_used_for_soccer=used_for_soccer; }
};
#endif

4
src/states_screens/race_setup_screen.cpp
View File

@@ -127,7 +127,6 @@ void RaceSetupScreen::eventCallback(Widget* widget, const std::string& name, con
race_manager->setMinorMode(RaceManager::MINOR_MODE_3_STRIKES);
UserConfigParams::m_game_mode = CONFIG_CODE_3STRIKES;
race_manager->setNumKarts( race_manager->getNumLocalPlayers() ); // no AI karts;
ArenasScreen::getInstance()->setUsedForSoccer(false);
StateManager::get()->pushScreen( ArenasScreen::getInstance() );
}
else if (selectedMode == IDENT_SOCCER)
@@ -137,10 +136,7 @@ void RaceSetupScreen::eventCallback(Widget* widget, const std::string& name, con
race_manager->setNumKarts( race_manager->getNumLocalPlayers() ); // no AI karts;
// 1 player -> no need to choose a team or determine when the match ends
if(race_manager->getNumLocalPlayers() <= 1)
{
ArenasScreen::getInstance()->setUsedForSoccer(true);
StateManager::get()->pushScreen( ArenasScreen::getInstance() );
}
else
StateManager::get()->pushScreen( SoccerSetupScreen::getInstance() );
}

1
src/states_screens/soccer_setup_screen.cpp
View File

@@ -40,7 +40,6 @@ void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name, c
{
if(name == "continue")
{
ArenasScreen::getInstance()->setUsedForSoccer(true);
StateManager::get()->pushScreen( ArenasScreen::getInstance() );
}
else if (name == "back")