[Freeorion-programmers] SF.net SVN: freeorion:[3177] trunk/FreeOrion/UI/MapWnd.cpp

[<geo...@us...>]

Revision: 3177
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3177&view=rev
Author:   geoffthemedio
Date:     2009-09-20 06:52:14 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Switched to simpler way to find fleet apparent position along starlane in case where starlane endpoints aren't known: use actual fleet position, rather than a complicated calculation that find's... the actual fleet position.

Modified Paths:
--------------
    trunk/FreeOrion/UI/MapWnd.cpp

Modified: trunk/FreeOrion/UI/MapWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/MapWnd.cpp	2009-09-20 06:48:05 UTC (rev 3176)
+++ trunk/FreeOrion/UI/MapWnd.cpp	2009-09-20 06:52:14 UTC (rev 3177)
@@ -2143,12 +2143,7 @@
 
         // return actual position of fleet on starlane - ignore the distance
         // away from the star centre at which starlane endpoints should appear
-        double X1 = obj1->X(), Y1 = obj1->Y(), X2 = obj2->X(), Y2 = obj2->Y(), X = fleet->X(), Y = fleet->Y();
-
-        // get fractional distance along lane that fleet's universe position is
-        double dist = FractionalDistanceBetweenPoints(X1, Y1, X, Y, X2, Y2);
-
-        return PositionFractionalAtDistanceBetweenPoints(X1, Y1, X2, Y2, dist);
+        return std::make_pair<double, double>(fleet->X(), fleet->Y());
     }
 
     // return apparent position of fleet on starlane