Tweaks so that Jon's FDM stuff get's initialized better.

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2274becd29ef57000931d8347be765af5e2546f8..43c998fba2d32349e69f5d21063c574485e35754 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -407,6 +407,10 @@ static void fgRenderFrame( void ) {
 
        sgMat4 sgVIEW;
 
+       while ( current_view.follow.size() > 400 ) {
+           current_view.follow.pop_front();
+       }
+
        if ( current_view.view_mode == FGView::FG_VIEW_FIRST_PERSON ) {
            // select current view matrix
            sgCopyMat4( sgVIEW, current_view.sgVIEW );
@@ -417,9 +421,6 @@ static void fgRenderFrame( void ) {
            // select view matrix from front of view matrix queue
            FGMat4Wrapper tmp = current_view.follow.front();
            sgCopyMat4( sgVIEW, tmp.m );
-           while ( current_view.follow.size() > 40 ) {
-               current_view.follow.pop_front();
-           }
 
            // enable TuX and set up his position and orientation
            penguin_sel->select(1);
@@ -500,7 +501,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
 
        // printf("updating flight model x %d\n", multi_loop);
        fgFDMUpdate( current_options.get_flight_model(), 
-                    cur_fdm_state, multi_loop, remainder );
+                    cur_fdm_state, multi_loop * 1, remainder );
     } else {
        fgFDMUpdate( current_options.get_flight_model(), 
                     cur_fdm_state, 0, remainder );
@@ -1129,7 +1130,8 @@ int main( int argc, char **argv ) {
     penguin_sel = new ssgSelector;
     penguin_pos = new ssgTransform;
 
-    ssgEntity *tux_obj = ssgLoadAC( "glider.ac" );
+    // ssgEntity *tux_obj = ssgLoadAC( "glider.ac" );
+    ssgEntity *tux_obj = ssgLoadAC( "Tower1x.ac" );
     penguin_pos->addKid( tux_obj );
     penguin_sel->addKid( penguin_pos );
     ssgFlatten( tux_obj );