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

Author: q4a

src/Layers/xrRender/ParticleEffect.cpp

@@ -428,7 +428,7 @@ __forceinline void magnitude_sse(Fvector& vec, float& res)
     _mm_store_ss((float*)&res, tv);
 }
 
-void ParticleRenderStream(void* lpvParams)
+void ParticleRenderStream(PRS_PARAMS* pParams)
 {
 #ifdef _GPA_ENABLED
     TAL_SCOPED_TASK_NAMED("ParticleRenderStream()");
@@ -442,8 +442,6 @@ void ParticleRenderStream(void* lpvParams)
     // But it must be 0xFFFFFFFF or otherwise some particles won't play
     float angle = 0xFFFFFFFF;
 
-    PRS_PARAMS* pParams = (PRS_PARAMS*)lpvParams;
-
     FVF::LIT* pv = pParams->pv;
     u32 p_from = pParams->p_from;
     u32 p_to = pParams->p_to;
@@ -606,7 +604,7 @@ void CParticleEffect::Render(float)
                 prsParams[i].p_to = (i == (nWorkers - 1)) ? p_cnt : (prsParams[i].p_from + nStep);
                 prsParams[i].particles = particles;
                 prsParams[i].pPE = this;
-                ttapi.threads[i]->addJob([=] { ParticleRenderStream((void*)&prsParams[i]); });
+                ttapi.threads[i]->addJob([=] { ParticleRenderStream(&prsParams[i]); });
             }
 
             ttapi.wait();

src/plugins/Max/Export/Stdafx.h

@@ -3,6 +3,7 @@
 #include <algorithm>
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #pragma warning(push)
 #pragma warning(disable : 4995)
@@ -80,6 +81,5 @@ using std::string;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"
 
 #pragma warning(pop)

src/plugins/Max/Material/Stdafx.h

@@ -3,6 +3,7 @@
 #include <algorithm>
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #pragma warning(push)
 #pragma warning(disable : 4995)
@@ -79,6 +80,5 @@ using std::string;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"
 
 #pragma warning(pop)

src/plugins/Maya/Export/Stdafx.h

@@ -3,6 +3,7 @@
 #include <algorithm>
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #define ENGINE_API
 #include "xrCore/xrCore.h"
@@ -129,6 +130,5 @@ using AStringVec = xr_vector<xr_string>;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"
 
 #pragma comment(lib, "d3dx9.lib")

src/plugins/Maya/Material/Stdafx.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #include "xrCore/xrCore.h"
 
@@ -106,4 +107,3 @@ using AStringVec = xr_vector<std::string>;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"

src/plugins/lw/Export/stdafx.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #include "xrCore/xrCore.h"
 
@@ -63,4 +64,3 @@ using AStringVec = xr_vector<std::string>;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"

src/plugins/lw/Shader/stdafx.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Common/Common.hpp"
+#include "Common/FSMacros.hpp"
 
 #include "xrCore/xrCore.h"
 #include "xrCore/_std_extensions.h"
@@ -57,4 +58,3 @@ using AStringVec = xr_vector<std::string>;
 #endif
 
 #define GAMEMTL_NONE u32(-1)
-#define _game_data_ "$game_data$"

src/xrCDB/ISpatial.h

@@ -157,19 +157,13 @@ class ISpatial_NODE
     bool _empty()
     {
         return items.empty() &&
-            0 == (intptr_t(children[0]) | intptr_t(children[1]) | intptr_t(children[2]) | intptr_t(children[3]) | intptr_t(children[4]) |
-                intptr_t(children[5]) | intptr_t(children[6]) | intptr_t(children[7]));
+            0 == (uintptr_t(children[0]) | uintptr_t(children[1]) |
+                  uintptr_t(children[2]) | uintptr_t(children[3]) |
+                  uintptr_t(children[4]) | uintptr_t(children[5]) |
+                  uintptr_t(children[6]) | uintptr_t(children[7]));
     }
 };
-////////////
 
-// template <class T, int granularity>
-// class poolSS;
-#ifndef DLL_API
-#define DLL_API XR_IMPORT
-#endif // #ifndef DLL_API
-
-//////////////////////////////////////////////////////////////////////////
 class XRCDB_API ISpatial_DB : private Noncopyable
 {
 public:

src/xrParticles/particle_actions_collection.cpp

@@ -1657,7 +1657,7 @@ struct TES_PARAMS
     float magnitude;
 };
 
-void PATurbulenceExecuteStream(LPVOID lpvParams)
+void PATurbulenceExecuteStream(TES_PARAMS* pParams)
 {
 #ifdef _GPA_ENABLED
     TAL_SCOPED_TASK_NAMED("PATurbulenceExecuteStream()");
@@ -1671,8 +1671,6 @@ void PATurbulenceExecuteStream(LPVOID lpvParams)
     pVector vY;
     pVector vZ;
 
-    TES_PARAMS* pParams = (TES_PARAMS*)lpvParams;
-
     u32 p_from = pParams->p_from;
     u32 p_to = pParams->p_to;
     ParticleEffect* effect = pParams->effect;
@@ -1781,7 +1779,7 @@ void PATurbulence::Execute(ParticleEffect* effect, const float dt, float& tm_max
         tesParams[i].frequency = frequency;
         tesParams[i].octaves = octaves;
         tesParams[i].magnitude = magnitude;
-        ttapi.threads[i]->addJob([=] { PATurbulenceExecuteStream((void*)&tesParams[i]); });
+        ttapi.threads[i]->addJob([=] { PATurbulenceExecuteStream(&tesParams[i]); });
     }
 
     ttapi.wait();

src/xrServerEntities/xrServer_Object_Base.cpp

@@ -160,8 +160,9 @@ CInifile& CSE_Abstract::spawn_ini()
     if (!m_ini_file)
 #pragma warning(push)
 #pragma warning(disable : 4238)
+        // XXX: what a casting mess.. Do we need to use shared_str for m_ini_string?
         m_ini_file =
-            new CInifile(&IReader((void*)(*(m_ini_string)), m_ini_string.size()), FS.get_path("$game_config$")->m_Path);
+            new CInifile(&IReader((void*)(*(m_ini_string)), m_ini_string.size()), FS.get_path(_game_config_)->m_Path);
 #pragma warning(pop)
     return (*m_ini_file);
 }