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

GP: not-reverse default, check if reversible

Browse Source 
* Make it default to a track not being in reverse to not break
  older .grandprix files.
* Make sure a track really _is_ reversible to not give the .grandprix editor
  possible extra issues.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11020 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
wardje
2012-03-25 22:51:39 +00:00
parent cb890d4f32
commit c4ae2d12f4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/race/grand_prix_data.cpp
View File

@@ -24,6 +24,7 @@
#include "io/file_manager.hpp"
#include "tracks/track_manager.hpp"
#include "tracks/track.hpp"
#include "utils/string_utils.hpp"
#include "utils/translation.hpp"
@@ -73,21 +74,29 @@ GrandPrixData::GrandPrixData(const std::string filename) throw(std::logic_error)
{
std::string trackID;
int numLaps;
bool reversed;
bool reversed = false;
const int idFound = node->get("id", &trackID );
const int lapFound = node->get("laps", &numLaps );
const int reverseFound = node->get("reverse", &reversed );
// Will stay false if not found
node->get("reverse", &reversed );
if (!idFound || !lapFound || !reverseFound)
if (!idFound || !lapFound)
{
fprintf(stderr, "/!\\ Error while trying to read grandprix file '%s' : "
"<track> tag does not have id, laps and reverse attributes. \n",
"<track> tag does not have idi and laps reverse attributes. \n",
filename.c_str());
delete root;
throw std::logic_error("File contents are incomplete or corrupt");
}
// Make sure the track really is reversible
Track* t = track_manager->getTrack(trackID);
if (t != NULL && reversed)
{
reversed = t->reverseAvailable();
}
m_tracks.push_back(trackID);
m_laps.push_back(numLaps);
m_reversed.push_back(reversed);