Preparations for first v0.9.10 prerelease.

diff --git a/configure.ac b/configure.ac
index 7af936d5eafc11e3a5342024cb17025ec4617356..70dd32516776b935614ff181f7f52a671392affd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.9)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.10-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -376,7 +376,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.9 or newer])
+AC_MSG_CHECKING([for simgear 0.3.10 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -387,7 +387,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 9
+#define MIN_MICRO 10
 
 int main() {
     int major, minor, micro;

diff --git a/src/Aircraft/replay.cxx b/src/Aircraft/replay.cxx
index 1794decb615fd9cb2c89421cbf4bf6e41430c440..b835709b4bc68dd73b2b42c0ac9b6c06d5c143e7 100644 (file)
--- a/src/Aircraft/replay.cxx
+++ b/src/Aircraft/replay.cxx
@@ -278,6 +278,8 @@ static FGReplayData interpolate( double time, FGReplayData f1, FGReplayData f2 )
         result.fdm.rpm[i] = weight( fdm1.rpm[i], fdm2.rpm[i], ratio );
         result.fdm.fuel_flow[i]
             = weight( fdm1.fuel_flow[i], fdm2.fuel_flow[i], ratio );
+        result.fdm.fuel_px[i]
+            = weight( fdm1.fuel_px[i], fdm2.fuel_px[i], ratio );
         result.fdm.egt[i] = weight( fdm1.egt[i], fdm2.egt[i], ratio );
         result.fdm.cht[i] = weight( fdm1.cht[i], fdm2.cht[i], ratio );
         result.fdm.mp_osi[i] = weight( fdm1.mp_osi[i], fdm2.mp_osi[i], ratio );

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 9a22c48a91eae9c799658f46220396982cd26eb2..b484917af4b6003f3ae067620277cdd39577d64a 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -974,7 +974,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.9";
+    static char required_version[] = "0.9.10";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application