[Supertuxkart-commit] SF.net SVN: supertuxkart:[7128] main/trunk/src/challenges/challenge_data. cpp

[<hik...@us...>]

Revision: 7128
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7128&view=rev
Author:   hikerstk
Date:     2010-12-21 06:10:28 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
Bugfix: difficulty was not tested in non GP challenges.
Also accept higher difficulties in challenges.

Modified Paths:
--------------
    main/trunk/src/challenges/challenge_data.cpp

Modified: main/trunk/src/challenges/challenge_data.cpp
===================================================================
--- main/trunk/src/challenges/challenge_data.cpp	2010-12-21 04:54:16 UTC (rev 7127)
+++ main/trunk/src/challenges/challenge_data.cpp	2010-12-21 06:10:28 UTC (rev 7128)
@@ -292,12 +292,12 @@
     // ------------
     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 @@
     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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.