Merge remote-tracking branch 'upstream/xd_dev' into linux

Author: q4a

src/Layers/xrRenderDX10/dx10Texture.cpp

@@ -452,14 +452,16 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize, bool bStag
 #else
     D3DX10_IMAGE_LOAD_INFO LoadInfo;
 #endif
-    // LoadInfo.FirstMipLevel = img_loaded_lod;
     LoadInfo.Width = IMG.Width;
     LoadInfo.Height = IMG.Height;
 
+    // x64 crash workaround
+#ifdef XR_X64
+    LoadInfo.FirstMipLevel = img_loaded_lod;
+#else
     if (img_loaded_lod)
-    {
         Reduce(LoadInfo.Width, LoadInfo.Height, IMG.MipLevels, img_loaded_lod);
-    }
+#endif
 
     // LoadInfo.Usage = D3D_USAGE_IMMUTABLE;
     if (bStaging)

src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp

@@ -28,7 +28,7 @@ CRenderTarget::CRenderTarget()
     param_color_map_influence = 0.0f;
     param_color_map_interpolate = 0.0f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

src/Layers/xrRenderPC_R2/r2_rendertarget.cpp

@@ -196,7 +196,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

src/Layers/xrRenderPC_R3/r3_rendertarget.cpp

@@ -292,7 +292,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

src/Layers/xrRenderPC_R4/r4_rendertarget.cpp

@@ -294,7 +294,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

src/xrCDB/ISpatial.cpp

@@ -153,12 +153,13 @@ void ISpatial_NODE::_remove(ISpatial* S)
 
 ISpatial_DB::ISpatial_DB(const char* name) :
 #ifdef CONFIG_PROFILE_LOCKS
-    pcs(new Lock(MUTEX_PROFILE_ID(ISpatial_DB)))
+    pcs(new Lock(MUTEX_PROFILE_ID(ISpatial_DB))),
 #else
-    pcs(new Lock)
+    pcs(new Lock),
 #endif // CONFIG_PROFILE_LOCKS
+    rt_insert_object(nullptr), m_root(nullptr),
+    m_bounds(0), q_result(nullptr)
 {
-    m_root = NULL;
     xr_strcpy(Name, name);
 }
 

src/xrEngine/EffectorPP.h

@@ -13,7 +13,7 @@ class ENGINE_API CEffectorPP : public SBaseEffector
 
 public:
     CEffectorPP(EEffectorPPType type, f32 lifeTime, bool free_on_remove = true);
-    CEffectorPP() : bFreeOnRemove(true), fLifeTime(0.0f), bOverlap(true){};
+    CEffectorPP() : bFreeOnRemove(true), fLifeTime(0.0f), bOverlap(true) {};
     virtual ~CEffectorPP();
     BENCH_SEC_SCRAMBLEVTBL1
     virtual BOOL Process(SPPInfo& PPInfo);

src/xrEngine/Stats.cpp

@@ -163,6 +163,7 @@ void CStats::Show()
     {
         font.SetColor(color_rgba(255, 16, 16, 191));
         font.OutSet(400, 0);
+
         for (u32 it = (u32)_max(int(0), (int)errors.size() - g_ErrorLineCount); it < errors.size(); it++)
             font.OutNext("%s", errors[it].c_str());
     }

src/xrEngine/device.h

@@ -332,6 +332,7 @@ class ENGINE_API CLoadScreenRenderer : public pureRender
     void start(bool b_user_input);
     void stop();
     virtual void OnRender();
+    bool IsActive() const { return b_registered; }
 
     bool b_registered;
     bool b_need_user_input;

src/xrGame/ActorEffector.cpp

@@ -266,12 +266,12 @@ CCameraEffectorControlled::~CCameraEffectorControlled() { m_controller->SetCam(N
 BOOL CCameraEffectorControlled::Valid() { return m_controller->Valid(); }
 #define SND_MIN_VOLUME_FACTOR (0.1f)
 
-SndShockEffector::SndShockEffector()
+SndShockEffector::SndShockEffector() : m_end_time(0), m_life_time(0)
 {
     m_snd_length = 0.0f;
     m_cur_length = 0.0f;
     m_stored_volume = -1.0f;
-    m_actor = NULL;
+    m_actor = nullptr;
 }
 
 SndShockEffector::~SndShockEffector()