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

Bugfix: in battle mode no groups were shown.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3169 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-02-18 22:09:24 +00:00
parent af1f9b02a7
commit f4829edc94
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/track_sel.cpp
View File

@ -166,17 +166,16 @@ void TrackSel::updateScrollPosition()
void TrackSel::switchGroup() void TrackSel::switchGroup()
{ {
m_index_avail_tracks.clear(); m_index_avail_tracks.clear();
bool group_available = bool is_battle_mode = RaceManager::isBattleMode(race_manager->getMinorMode());
(RaceManager::isBattleMode( race_manager->getMinorMode() ) bool group_available = is_battle_mode
? track_manager->getArenasInGroup(user_config->m_track_group) ? track_manager->getArenasInGroup(user_config->m_track_group).size()>0
: track_manager->getTracksInGroup(user_config->m_track_group)).size()>0; : track_manager->getTracksInGroup(user_config->m_track_group).size()>0;
if(!group_available) if(!group_available)
user_config->m_track_group = "standard"; user_config->m_track_group = "standard";
const std::vector<int> &tracks = const std::vector<int> &tracks = is_battle_mode
RaceManager::isBattleMode( race_manager->getMinorMode() ) ? ? track_manager->getArenasInGroup(user_config->m_track_group)
track_manager->getArenasInGroup(user_config->m_track_group) : : track_manager->getTracksInGroup(user_config->m_track_group);
track_manager->getTracksInGroup(user_config->m_track_group);
for(unsigned int i=0; i<tracks.size(); i++) for(unsigned int i=0; i<tracks.size(); i++)
{ {
@ -197,7 +196,9 @@ void TrackSel::switchGroup()
// Check if there are any tracks available in this group - i.e. not only locked // Check if there are any tracks available in this group - i.e. not only locked
// tracks, and not only non-arena if arena mode (and vice versa). // tracks, and not only non-arena if arena mode (and vice versa).
const std::vector<int> &tracks_in_group = track_manager->getTracksInGroup(groups[i]); const std::vector<int> &tracks_in_group = is_battle_mode
? track_manager->getArenasInGroup(groups[i])
: track_manager->getTracksInGroup(groups[i]);
bool ignore_group=true; bool ignore_group=true;
for(unsigned int j=0; j<tracks_in_group.size(); j++) for(unsigned int j=0; j<tracks_in_group.size(); j++)
{ {
@ -205,8 +206,7 @@ void TrackSel::switchGroup()
// Locked tracks are not available // Locked tracks are not available
if(unlock_manager->isLocked(track->getIdent())) continue; if(unlock_manager->isLocked(track->getIdent())) continue;
// Tracks of a different type are not available // Tracks of a different type are not available
ignore_group = RaceManager::isBattleMode(race_manager->getMinorMode()) != ignore_group = is_battle_mode != track->isArena();
track->isArena();
if(!ignore_group) break; if(!ignore_group) break;
} }