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

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker
2014-04-04 15:39:48 +11:00
parent de694cc5fe 59cbfbab6b
commit c663839d98
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/race/grand_prix_data.cpp
View File

@@ -293,7 +293,9 @@ void GrandPrixData::moveUp(const unsigned int track)
std::swap(m_tracks[track], m_tracks[track - 1]);
std::swap(m_laps[track], m_laps[track - 1]);
m_reversed.swap(m_reversed[track], m_reversed[track - 1]);
bool tmp = m_reversed[track ];
m_reversed[track] = m_reversed[track - 1];
m_reversed[track - 1] = tmp;
}
// ----------------------------------------------------------------------------
@@ -303,7 +305,9 @@ void GrandPrixData::moveDown(const unsigned int track)
std::swap(m_tracks[track], m_tracks[track + 1]);
std::swap(m_laps[track], m_laps[track + 1]);
m_reversed.swap(m_reversed[track], m_reversed[track + 1]);
bool tmp = m_reversed[track ];
m_reversed[track ] = m_reversed[track + 1];
m_reversed[track + 1] = tmp;
}
// ----------------------------------------------------------------------------

2
src/race/race_manager.hpp
View File

@@ -198,7 +198,7 @@ public:
case MINOR_MODE_3_STRIKES: return false;
case MINOR_MODE_EASTER_EGG: return false;
case MINOR_MODE_SOCCER: return false;
default: assert(false); return NULL;
default: assert(false); return false;
}
}