[Supertuxkart-commit] SF.net SVN: supertuxkart:[5865] main/trunk/src/modes

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

Revision: 5865
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5865&view=rev
Author:   hikerstk
Date:     2010-09-02 13:38:23 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
Moved setting of the position of each kart into 
setKartPosition, some simplifications to ftl.

Modified Paths:
--------------
    main/trunk/src/modes/follow_the_leader.cpp
    main/trunk/src/modes/linear_world.cpp
    main/trunk/src/modes/three_strikes_battle.cpp
    main/trunk/src/modes/world_with_rank.cpp

Modified: main/trunk/src/modes/follow_the_leader.cpp
===================================================================
--- main/trunk/src/modes/follow_the_leader.cpp	2010-09-02 13:14:07 UTC (rev 5864)
+++ main/trunk/src/modes/follow_the_leader.cpp	2010-09-02 13:38:23 UTC (rev 5865)
@@ -76,7 +76,7 @@
     {
         // In case that the kart on position 1 was removed, we have to set
         // the correct position (which equals the remaining number of karts).
-        m_karts[kart_number]->setPosition(getCurrentNumKarts());
+        setKartPosition(kart_number, getCurrentNumKarts());
         removeKart(kart_number);
     }
     
@@ -148,7 +148,6 @@
 
     int *scores       = new int[num_karts];
     double *race_time = new double[num_karts];
-    World *world      = World::getWorld();
 
     // Ignore kart 0, since it was the leader
     (*order)[0] = -1;
@@ -159,9 +158,9 @@
         race_time[kart_id] = race_manager->getOverallTime(kart_id);
         
         // check this kart is not in front of leader. If it is, give a score of 0
-        if(   getLapForKart(kart_id) * world->getTrack()->getTrackLength() 
+        if(   getLapForKart(kart_id) * getTrack()->getTrackLength() 
               + getDistanceDownTrackForKart(kart_id)
-            > getLapForKart(0)       * world->getTrack()->getTrackLength() 
+            > getLapForKart(0)       * getTrack()->getTrackLength() 
               + getDistanceDownTrackForKart(0))
         {
             scores[kart_id] = 0;
@@ -189,7 +188,6 @@
     
     for(unsigned int i=1; i<num_karts; i++)
     {
-        world->getKart((*order)[i])->setPosition(i);
         setKartPosition((*order)[i], i);
     }
     

Modified: main/trunk/src/modes/linear_world.cpp
===================================================================
--- main/trunk/src/modes/linear_world.cpp	2010-09-02 13:14:07 UTC (rev 5864)
+++ main/trunk/src/modes/linear_world.cpp	2010-09-02 13:38:23 UTC (rev 5865)
@@ -689,7 +689,6 @@
         rank_changed |= kart->getPosition()!=p;
 #endif
 
-        kart->setPosition(p);
         setKartPosition(i, p);
         // Switch on faster music if not already done so, if the
         // first kart is doing its last lap, and if the estimated

Modified: main/trunk/src/modes/three_strikes_battle.cpp
===================================================================
--- main/trunk/src/modes/three_strikes_battle.cpp	2010-09-02 13:14:07 UTC (rev 5864)
+++ main/trunk/src/modes/three_strikes_battle.cpp	2010-09-02 13:38:23 UTC (rev 5865)
@@ -162,7 +162,6 @@
     
     for( unsigned int n = 0; n < NUM_KARTS; ++n )
     {
-        m_karts[ karts_list[n] ]->setPosition( n+1 );
         setKartPosition(karts_list[n], n+1);
     }
     delete [] karts_list;

Modified: main/trunk/src/modes/world_with_rank.cpp
===================================================================
--- main/trunk/src/modes/world_with_rank.cpp	2010-09-02 13:14:07 UTC (rev 5864)
+++ main/trunk/src/modes/world_with_rank.cpp	2010-09-02 13:38:23 UTC (rev 5865)
@@ -31,6 +31,7 @@
                                     unsigned int position)
 {
     m_position_index[position-1] = kart_id;
+    m_karts[kart_id]->setPosition(position);
 }   // setKartPosition
 
 // ----------------------------------------------------------------------------


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