Rename screen dump to snap shot.

Updated view enums.

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index e3386dae90bd026931b99ba34219924b5959a486..308a3230115cb77f467a72e48f2419cb0d35bb36 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -582,8 +582,8 @@ void printScreen ( puObject *obj ) {
 #endif // #ifdef WIN32
 
 
-// do a screen dump
-void dumpScreen ( puObject *obj ) {
+// do a screen snap shot
+void dumpSnapShot ( puObject *obj ) {
     bool show_pu_cursor = false;
 
     mainMenuBar->hide();
@@ -606,7 +606,7 @@ void dumpScreen ( puObject *obj ) {
                     current_options.get_xsize(), 
                     current_options.get_ysize() );
     
-    mkDialog ("Screen dump saved to fgfs-screen.ppm");
+    mkDialog ("Snap shot saved to fgfs-screen.ppm");
 
     if ( show_pu_cursor ) {
        puShowCursor();
@@ -835,7 +835,7 @@ char *fileSubmenu               [] = {
 #ifdef WIN32
     "Print",
 #endif
-    "Screen Dump",
+    "Snap Shot",
     /* "---------", "Save", */ 
     "Reset", NULL
 };
@@ -845,7 +845,7 @@ puCallback fileSubmenuCb        [] = {
     printScreen, 
 #endif
     /* NULL, notCb, */
-    dumpScreen,
+    dumpSnapShot,
     reInit, NULL
 };
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index f9c5922a85fa22200aee4a7cacccb299ea19bda4..18aa9120f62163e93e6bcac0fcf8d6f0ee8dda23 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -384,7 +384,7 @@ void fgRenderFrame( void ) {
        }
 
        if ( current_options.get_view_mode() == 
-            fgOPTIONS::FG_VIEW_FIRST_PERSON )
+            fgOPTIONS::FG_VIEW_PILOT )
         {
            // disable TuX
            penguin_sel->select(0);
@@ -491,7 +491,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
        fdm_list.pop_front();
     }
 
-    if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FIRST_PERSON ) {
+    if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_PILOT ) {
        cur_view_fdm = *cur_fdm_state;
        // do nothing
     } else if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FOLLOW ) {

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 81ccfd085b8dcc7b2b47d7a555951ff77f2423a9..c90e1b96215d423cf6add0eef14fec5f854bd0f3 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -175,7 +175,7 @@ fgOPTIONS::fgOPTIONS() :
     wireframe(0),
     xsize(640),
     ysize(480),
-    view_mode(FG_VIEW_FIRST_PERSON),
+    view_mode(FG_VIEW_PILOT),
 
     // Scenery options
     tile_diameter(5),

diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 0253f6d2c41a52158bbdcfc02903a7c47a8c094b..82c64af878000eb300f2be0a1314e89cc506997c 100644 (file)
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -106,8 +106,14 @@ public:
 
     enum fgViewMode
     {
-       FG_VIEW_FIRST_PERSON = 0,
-       FG_VIEW_FOLLOW  = 1
+       FG_VIEW_PILOT = 0,      // Pilot perspective
+       FG_VIEW_FOLLOW  = 1,    // Following in the "foot steps" so to speak
+       FG_VIEW_CHASE = 2,      // Chase
+       FG_VIEW_CIRCLING = 3,   // Circling
+       FG_VIEW_SATELLITE = 4,  // From high above
+       FG_VIEW_ANCHOR = 5,     // Drop an anchor and watch from there
+       FG_VIEW_TOWER = 6,      // From nearest tower?
+       FG_VIEW_SPOTTER = 7     // Fron a ground spotter
     };
 
     enum fgAutoCoordMode
@@ -287,10 +293,10 @@ public:
     inline void set_xsize( int x ) { xsize = x; }
     inline void set_ysize( int y ) { ysize = y; }
     inline void cycle_view_mode() { 
-       if ( view_mode == FG_VIEW_FIRST_PERSON ) {
+       if ( view_mode == FG_VIEW_PILOT ) {
            view_mode = FG_VIEW_FOLLOW;
        } else if ( view_mode == FG_VIEW_FOLLOW ) {
-           view_mode = FG_VIEW_FIRST_PERSON;
+           view_mode = FG_VIEW_PILOT;
        }
     }