1. The Tux Tollway head to head challenge is now a time trial race

rather than a quick race.
2. Bugfix: a win is now required to complete all gp challenges and the 
tux tollway head to head.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
scifly 2008-05-14 21:01:04 +00:00
parent f640d64467
commit 8793721aaf
3 changed files with 10 additions and 4 deletions

View File

@ -54,7 +54,7 @@ bool MoonAndBackGP::grandPrixFinished()
for(int i=0; i<(int)race_manager->getNumKarts(); i++)
{
const Kart* k=world->getKart(i);
if(k->isPlayerKart() && !k->isEliminated()) return k->getPosition()<4;
if(k->isPlayerKart() && !k->isEliminated()) return k->getPosition()==1;
}
return false;

View File

@ -52,7 +52,7 @@ bool PenguinPlaygroundGP::grandPrixFinished()
for(int i=0; i<(int)race_manager->getNumKarts(); i++)
{
const Kart* k=world->getKart(i);
if(k->isPlayerKart() && !k->isEliminated()) return k->getPosition()<4;
if(k->isPlayerKart() && !k->isEliminated()) return k->getPosition()==1;
}
return false;

View File

@ -30,7 +30,7 @@ TollwayHead2Head::TollwayHead2Head() : Challenge("tollwayhead", _("Win a Head to
//-----------------------------------------------------------------------------
void TollwayHead2Head::setRace() const {
race_manager->setRaceMode(RaceManager::RM_QUICK_RACE);
race_manager->setRaceMode(RaceManager::RM_TIME_TRIAL);
race_manager->setTrack("tuxtrack");
race_manager->setDifficulty(RaceManager::RD_HARD);
race_manager->setNumLaps(1);
@ -46,5 +46,11 @@ bool TollwayHead2Head::raceFinished()
Kart* kart=world->getPlayerKart(0);
if(kart->getLap()!=1 ) return false; // wrong number of laps
if(race_manager->getNumKarts()!=2 ) return false; //wrong number of AI karts
return true;
// Check if the player was first:
for(int i=0; i<(int)race_manager->getNumKarts(); i++)
{
const Kart* k=world->getKart(i);
if(k->isPlayerKart() && !k->isEliminated()) return k->getPosition()==1;
}
return false;
} // raceFinished