From 6529381acd8f3edb02d308ceb0c243d03ea4eb0c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 10 Aug 2015 19:01:58 -0400
Subject: [PATCH] Fix rescue code in tutorial mode, fixes #2279

---
 src/modes/tutorial_world.cpp | 26 ++++++++++++++++++++++++++
 src/modes/tutorial_world.hpp |  9 +++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/modes/tutorial_world.cpp b/src/modes/tutorial_world.cpp
index 8bf0eec48..27def25a0 100644
--- a/src/modes/tutorial_world.cpp
+++ b/src/modes/tutorial_world.cpp
@@ -26,3 +26,29 @@ TutorialWorld::TutorialWorld()
 {
     m_stop_music_when_dialog_open = false;
 }   // TutorialWorld
+
+unsigned int TutorialWorld::getRescuePositionIndex(AbstractKart *kart)
+{
+    const int start_spots_amount = getTrack()->getNumberOfStartPositions();
+    assert(start_spots_amount > 0);
+
+    float closest_distance = 999999.0f;
+    int   closest_id_found = 0;
+
+    Vec3 kart_pos = kart->getFrontXYZ();
+
+    for (int n = 0; n<start_spots_amount; n++)
+    {
+        const btTransform &s = getStartTransform(n);
+        const Vec3 &v = s.getOrigin();
+        float distance = (v - kart_pos).length2_2d();
+
+        if (n == 0 || distance < closest_distance)
+        {
+            closest_id_found = n;
+            closest_distance = distance;
+        }
+    }
+
+    return closest_id_found;
+}
diff --git a/src/modes/tutorial_world.hpp b/src/modes/tutorial_world.hpp
index a62f74637..863f28581 100644
--- a/src/modes/tutorial_world.hpp
+++ b/src/modes/tutorial_world.hpp
@@ -35,12 +35,7 @@ public:
     }
     // ------------------------------------------------------------------------
     /** Determines the rescue position index of the specified kart. */
-    virtual unsigned int getRescuePositionIndex(AbstractKart *kart) OVERRIDE
-    {
-        // Don't use LinearWorld's function, but WorldWithRank, since the
-        // latter is based on rescuing to start positions
-        return WorldWithRank::getRescuePositionIndex(kart);
-    }
+    virtual unsigned int getRescuePositionIndex(AbstractKart *kart) OVERRIDE;
     // ------------------------------------------------------------------------
     /** Returns the bullet transformation for the specified rescue index. */
     virtual btTransform getRescueTransform(unsigned int index) const OVERRIDE
@@ -50,6 +45,8 @@ public:
         return WorldWithRank::getRescueTransform(index);
     }
 
+
+
 };   // class TutorialWorld
 
 #endif