Removed libVoronoi.a

Added Ctrl-U key binding to force an instant altitude gain of 1000'.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 4b003869879f12b3489996d204792e8c3da1982b..3d4f54170ee1efab5eba9329ea1a1d38223accd2 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -7,8 +7,7 @@ endif
 if ENABLE_OLD_WEATHER
 WEATHER_LIBS = $(top_builddir)/Simulator/Weather/libWeather.a
 else
-WEATHER_LIBS = $(top_builddir)/Simulator/WeatherCM/libWeatherCM.a \
-               $(top_builddir)/Lib/Voronoi/libVoronoi.a
+WEATHER_LIBS = $(top_builddir)/Simulator/WeatherCM/libWeatherCM.a
 endif
 
 if OLD_AUTOMAKE

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index b7cdf9b5e2e8727ad6153cdf8c3f410cd6bb170a..eb1a081915b0e24e57d4228f27cf44167583295c 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -119,6 +119,15 @@ void GLUTkey(unsigned char k, int x, int y) {
        case 20: // Ctrl-T key
            fgAPToggleTerrainFollow();
            return;
+       case 21: // Ctrl-U key
+           // add 1000' of emergency altitude.  Possibly good for 
+           // unflipping yourself :-)
+           {
+               double alt = cur_fdm_state->get_Altitude() + 1000;
+               fgFDMForceAltitude( current_options.get_flight_model(), 
+                                   alt * FEET_TO_METER );
+           }
+           return;
        case 49: // numeric keypad 1
            v->set_goal_view_offset( FG_PI * 0.75 );
            return;