fly/flightgear
1
0
Fork 0
Code Activity

Melchior:

Browse source 
Don't overwrite user settings from config files.

fgfs had in any case set bump-mapping to false, no matter if this
node did already exist (because it was defined in a config file).
This commit is contained in:
ehofman 2004-10-20 08:18:29 +00:00
parent dbbad3cdf2
commit 96e24a3e8d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Main/fg_init.cxx
View file

@ -1610,8 +1610,7 @@ bool fgInitSubsystems() {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Initialize the 2D cloud subsystem. // Initialize the 2D cloud subsystem.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
fgGetNode("/sim/rendering/bump-mapping", true); fgGetBool("/sim/rendering/bump-mapping", false);
fgSetBool("/sim/rendering/bump-mapping", false);
#ifdef FG_USE_CLOUDS_3D #ifdef FG_USE_CLOUDS_3D
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
src/Main/main.cxx
View file

@ -216,7 +216,7 @@ static void fgMainLoop( void ) {
// static const SGPropertyNode *replay_master // static const SGPropertyNode *replay_master
// = fgGetNode("/sim/freeze/replay", true); // = fgGetNode("/sim/freeze/replay", true);
SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping",true); SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
// Update the elapsed time. // Update the elapsed time.
static bool first_time = true; static bool first_time = true;