From b76d255d824d434a042aa1f3aab7a855ff0e1341 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Fri, 21 Feb 2014 07:56:24 -0800
Subject: [PATCH] Remove pre-OSG 'enable/disable-textures' option.

These have been non-functional for a long time, remove
to avoid further confusion.
---
 man/fgfs.1.in           | 18 ------------------
 src/Main/options.cxx    |  3 ---
 src/Viewer/renderer.cxx |  7 ++-----
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/man/fgfs.1.in b/man/fgfs.1.in
index 464212afe..cdb65eb78 100644
--- a/man/fgfs.1.in
+++ b/man/fgfs.1.in
@@ -112,9 +112,6 @@ Disable fuel freeze (enabling fuel consumption).
 .B "--disable-fullscreen"
 Disable fullscreen mode.
 .TP
-.B "--disable-game-mode"
-Disable fullscreen game mode.
-.TP
 .B "--disable-horizon-effect"
 Disable celestial body growth illusion near the horizon..
 .TP
@@ -124,9 +121,6 @@ Disable 2D HUD.
 .B "--disable-hud-3d"
 Disable 3D HUD.
 .TP
-.B "--disable-intro-music"
-Disable introduction music.
-.TP
 .B "--disable-mouse-pointer"
 Disable extra mouse pointer.
 .TP
@@ -145,9 +139,6 @@ Disable specular reflections on textured objects.
 .B "--disable-splash-screen"
 Disable splash screen.
 .TP
-.B "--disable-textures"
-Disable textures.
-.TP
 .B "--disable-wireframe"
 Disable wireframe drawing mode.
 .TP
@@ -178,9 +169,6 @@ Enable fuel freeze (disabling fuel consumption).
 .B "--enable-fullscreen"
 Enable fullscreen mode.
 .TP
-.B "--enable-game-mode"
-Enable fullscreen game mode.
-.TP
 .B "--enable-horizon-effect"
 Enable celestial body growth illusion near the horizon.
 .TP
@@ -190,9 +178,6 @@ Enable 2D HUD.
 .B "--enable-hud-3d"
 Enable 3D HUD.
 .TP
-.B "--enable-intro-music"
-Enable introduction music.
-.TP
 .B "--enable-mouse-pointer"
 Enable extra mouse pointer (i.e. for full screen voodoo/voodoo-II
 based cards.)
@@ -212,9 +197,6 @@ Enable specular reflections on textured objects.
 .B "--enable-splash-screen"
 Enable splash screen.
 .TP
-.B "--enable-textures"
-Enable textures.
-.TP
 .B "--enable-wireframe"
 Enable wireframe drawing mode.
 .TP
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index a9de344b6..c1996bbef 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -185,7 +185,6 @@ void fgSetDefaults ()
     fgSetBool("/environment/clouds/status", true);
     fgSetBool("/sim/startup/fullscreen", false);
     fgSetBool("/sim/rendering/shading", true);
-    fgSetBool("/sim/rendering/textures", true);
     fgTie( "/sim/rendering/filtering", SGGetTextureFilter, SGSetTextureFilter, false);
     fgSetInt("/sim/rendering/filtering", 1);
     fgSetBool("/sim/rendering/wireframe", false);
@@ -1532,8 +1531,6 @@ struct OptionDesc {
     {"restore-defaults",             false, OPTION_BOOL,   "/sim/startup/restore-defaults", true, "", 0 },
     {"shading-flat",                 false, OPTION_BOOL,   "/sim/rendering/shading", false, "", 0 },
     {"shading-smooth",               false, OPTION_BOOL,   "/sim/rendering/shading", true, "", 0 },
-    {"disable-textures",             false, OPTION_BOOL,   "/sim/rendering/textures", false, "", 0 },
-    {"enable-textures",              false, OPTION_BOOL,   "/sim/rendering/textures", true, "", 0 },
     {"texture-filtering",            false, OPTION_INT,    "/sim/rendering/filtering", 1, "", 0 },
     {"disable-wireframe",            false, OPTION_BOOL,   "/sim/rendering/wireframe", false, "", 0 },
     {"enable-wireframe",             false, OPTION_BOOL,   "/sim/rendering/wireframe", true, "", 0 },
diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx
index 52e84bfc1..944d598b5 100644
--- a/src/Viewer/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -551,7 +551,6 @@ FGRenderer::init( void )
     _enhanced_lighting    = fgGetNode("/sim/rendering/enhanced-lighting", true);
     _distance_attenuation = fgGetNode("/sim/rendering/distance-attenuation", true);
     _horizon_effect       = fgGetNode("/sim/rendering/horizon-effect", true);
-    _textures             = fgGetNode("/sim/rendering/textures", true);
 
     _altitude_ft = fgGetNode("/position/altitude-ft", true);
 
@@ -1618,10 +1617,8 @@ FGRenderer::update( ) {
   
     osg::Camera *camera = viewer->getCamera();
 
-    if ( _textures->getBoolValue() ) {
-        SGVec4f clearColor(l->adj_fog_color());
-        camera->setClearColor(toOsg(clearColor));
-    }
+    SGVec4f clearColor(l->adj_fog_color());
+    camera->setClearColor(toOsg(clearColor));
 
     updateSky();
     
-- 
2.39.5