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

Bugfix: difficulty was not tested in non GP challenges.

Browse Source 
Also accept higher difficulties in challenges.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-12-21 06:10:28 +00:00
parent cdf6b91780
commit 83a9993f68
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/challenges/challenge_data.cpp
View File

@ -292,12 +292,12 @@ bool ChallengeData::raceFinished()
// ------------
World *world = World::getWorld();
std::string track_name = world->getTrack()->getIdent();
if(track_name!=m_track_name ) return false; // wrong track
if((int)world->getNumKarts()<m_num_karts ) return false; // not enough AI karts
if(track_name!=m_track_name ) return false;
if((int)world->getNumKarts()<m_num_karts ) return false;
Kart* kart = world->getPlayerKart(0);
if(m_energy>0 && kart->getEnergy() <m_energy ) return false; // not enough energy
if(m_position>0 && kart->getPosition()>m_position) return false; // too far behind
if(m_energy>0 && kart->getEnergy() < m_energy ) return false;
if(m_position>0 && kart->getPosition()> m_position ) return false;
if(race_manager->getDifficulty() < m_difficulty) return false;
// Follow the leader
// -----------------
@ -327,7 +327,7 @@ bool ChallengeData::grandPrixFinished()
if (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX ||
race_manager->getMinorMode() != m_minor ||
race_manager->getGrandPrix()->getId() != m_gp_id ||
race_manager->getDifficulty()!= m_difficulty ||
race_manager->getDifficulty() < m_difficulty ||
race_manager->getNumberOfKarts() < (unsigned int)m_num_karts ||
race_manager->getNumPlayers() > 1) return false;