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

Added some missing tests for isSoccer()

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66
2012-12-22 23:06:42 +00:00
parent e16c03edf2
commit 8da37e6eb2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/states_screens/race_gui_overworld.cpp
View File

@@ -295,7 +295,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
{
World *world = World::getWorld();
// arenas currently don't have a map.
if(world->getTrack()->isArena()) return;
if(world->getTrack()->isArena() || world->getTrack()->isSoccer()) return;
Track* track = world->getTrack();
const std::vector<OverworldChallenge>& challenges =

2
src/states_screens/tracks_screen.cpp
View File

@@ -286,7 +286,7 @@ void TracksScreen::buildTrackList()
for (int n=0; n<trackAmount; n++)
{
Track* curr = track_manager->getTrack( n );
if (curr->isArena()) continue;
if (curr->isArena() || curr->isSoccer()) continue;
if (curr->isInternal()) continue;
if (unlock_manager->getCurrentSlot()->isLocked(curr->getIdent()))

10
src/tracks/track_manager.cpp
View File

@@ -215,9 +215,9 @@ void TrackManager::removeTrack(const std::string &ident)
int index = it - m_tracks.begin();
// Remove the track from all groups it belongs to
Group2Indices &group_2_indices = track->isArena() ? m_arena_groups
: m_track_groups;
std::vector<std::string> &group_names = track->isArena()
Group2Indices &group_2_indices = (track->isArena()||track->isSoccer()) ? m_arena_groups
: m_track_groups;
std::vector<std::string> &group_names = (track->isArena()||track->isSoccer())
? m_arena_group_names
: m_track_group_names;
const std::vector<std::string>& groups=track->getGroups();
@@ -272,9 +272,9 @@ void TrackManager::updateGroups(const Track* track)
const std::vector<std::string>& new_groups = track->getGroups();
Group2Indices &group_2_indices = track->isArena() ? m_arena_groups
Group2Indices &group_2_indices = (track->isArena()||track->isSoccer()) ? m_arena_groups
: m_track_groups;
std::vector<std::string> &group_names = track->isArena()
std::vector<std::string> &group_names = (track->isArena()||track->isSoccer())
? m_arena_group_names
: m_track_group_names;