[Freeorion-programmers] SF.net SVN: freeorion:[6509] trunk/FreeOrion/universe/Effect.cpp

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

Revision: 6509
          http://sourceforge.net/p/freeorion/code/6509
Author:   geoffthemedio
Date:     2013-11-10 23:14:20 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
Fixed crash with SetEmpireTechProgress when referencing the initial Value in the script when specifying the new progress amount.

Modified Paths:
--------------
    trunk/FreeOrion/universe/Effect.cpp

Modified: trunk/FreeOrion/universe/Effect.cpp
===================================================================
--- trunk/FreeOrion/universe/Effect.cpp	2013-11-10 11:48:42 UTC (rev 6508)
+++ trunk/FreeOrion/universe/Effect.cpp	2013-11-10 23:14:20 UTC (rev 6509)
@@ -2255,6 +2255,7 @@
         return DumpIndent() + "MoveInOrbit";
 }
 
+
 ///////////////////////////////////////////////////////////
 // MoveTowards                                           //
 ///////////////////////////////////////////////////////////
@@ -2565,8 +2566,8 @@
         return;
     }
 
-    double value = m_research_progress->Eval(
-        ScriptingContext(context, empire->ResearchProgress(tech_name)));
+    float initial_progress = empire->ResearchProgress(tech_name);
+    double value = m_research_progress->Eval(ScriptingContext(context, initial_progress));
     empire->SetTechResearchProgress(tech_name, value);
 }