Allowed config-defined sun movement

Just set dynamic_sun_dir to false

res/gamedata/configs/system.ltx

@@ -62,6 +62,8 @@
 #include "localization.ltx"
 #include "smart_cover.ltx"
 
+[openxray]
+dynamic_sun_dir = true
 
 [zone_pick_dof]
 near    = -1500.0

src/Common/Config.hpp

@@ -26,7 +26,5 @@
 //#define FP_DEATH // first person death view
 #define DEAD_BODY_COLLISION // restore collision with dead bodies (thanks malandrinus)
 
-//#define CONFIG_SUN_MOVEMENT // With this defined sun will move as configured in weather ltx files
-
 /* Debug: */
 //#define USE_LOG_TIMING

src/xrCore/xr_ini.h

@@ -12,6 +12,8 @@
 #include "xrCore/clsid.h"
 #include "xrCommon/xr_vector.h"
 
+constexpr pcstr OPENXRAY_INI_SECTION = "openxray";
+
 // refs
 class CInifile;
 struct xr_token;

src/xrEngine/Environment.cpp

@@ -103,6 +103,9 @@ CEnvironment::CEnvironment() : CurrentEnv(0), m_ambients_config(0)
 
     CInifile* config =
         new CInifile(FS.update_path(file_name, "$game_config$", "environment" DELIMITER "environment.ltx"), TRUE, TRUE, FALSE);
+
+    useDynamicSunDir = READ_IF_EXISTS(pSettings, r_bool, OPENXRAY_INI_SECTION, "dynamic_sun_dir", true);
+
     // params
     p_var_alt = deg2rad(config->r_float("environment", "altitude"));
     p_var_long = deg2rad(config->r_float("environment", "delta_longitude"));
@@ -473,13 +476,9 @@ void CEnvironment::OnFrame()
     float current_weight;
     lerp(current_weight);
 
-    //AVO: allow sun to move as defined in configs
-#ifndef CONFIG_SUN_MOVEMENT
     // Igor. Dynamic sun position.
-    if (!GEnv.Render->is_sun_static())
+    if (!GEnv.Render->is_sun_static() && useDynamicSunDir)
         calculate_dynamic_sun_dir();
-#endif
-    //-AVO
 
 #ifndef MASTER_GOLD
     if (CurrentEnv->sun_dir.y > 0)

src/xrEngine/Environment.h

@@ -349,6 +349,8 @@ class ENGINE_API CEnvironment
     bool m_paused;
 #endif // #ifdef _EDITOR
 
+    bool useDynamicSunDir;
+
     CInifile* m_ambients_config;
     CInifile* m_sound_channels_config;
     CInifile* m_effects_config;