More cleaning/decoupling. Some 'override' added. Fixed up stricmp -> _stricmp & co.

Replace _stricmp & co. to instead use xr_-prepended function names in the code, and select impl. from a header depending on compiler used.
Tagged up CKinematics with 'override' where appropriate.
Removed a bunch of compiler warnings (unused function arguments, re-defining variable name in function (sometimes with different type even)).
Moved a few Lock instances in a class to be Lock* (compile-time complexity reduction).
Xottab_DUTY: removed some include guards

Author: tamlin-mike

src/Common/Compiler.inl

@@ -31,3 +31,21 @@
 #define XR_NOEXCEPT noexcept
 #define XR_NOEXCEPT_OP(x) noexcept(x)
 #endif
+
+#ifdef _MSC_VER
+// We use xr_* instead of defining e.g. strupr => _strupr, since the macro definition could
+// come before the std. header file declaring it, and thereby renaming that one too.
+#define xr_strupr _strupr
+#define xr_strlwr _strlwr
+#define xr_stricmp _stricmp
+#define xr_strcmpi _strcmpi
+#define xr_unlink _unlink
+#define xr_itoa _itoa
+#else
+#define xr_strupr strupr
+#define xr_strlwr strlwr
+#define xr_stricmp stricmp
+#define xr_strcmpi strcmpi
+#define xr_unlink unlink
+#define xr_itoa itoa
+#endif

src/Layers/xrRender/AnimationKeyCalculate.h

@@ -89,8 +89,8 @@ IC void Dequantize(CKey& K, const CBlend& BD, const CMotion& M)
     // rotation
     if (M.test_flag(flRKeyAbsent))
     {
-        const CKeyQR* K = &M._keysR[0];
-        QR2Quat(*K, D->Q);
+        const CKeyQR* K2 = &M._keysR[0];
+        QR2Quat(*K2, D->Q);
     }
     else
     {
@@ -394,7 +394,7 @@ IC void MixAdd(CKey& Result, const CKey* R, const float* BA, int b_count)
     MixinAdd(Result, R, BA, b_count);
 }
 IC void process_single_channel(
-    CKey& Result, const animation::channel_def& ch, const CKey* R, const CBlend* const BA[MAX_BLENDED], int b_count)
+    CKey& Result, const animation::channel_def& /*ch*/, const CKey* R, const CBlend* const BA[MAX_BLENDED], int b_count)
 {
     MixInterlerp(Result, R, BA, b_count);
     VERIFY(_valid(Result.T));

src/Layers/xrRender/Blender_Recorder_R2.cpp

@@ -40,7 +40,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest, BO
     ctable.merge(&vs->constants);
 
     // Last Stage - disable
-    if (0 == _stricmp(_ps, "null"))
+    if (0 == xr_stricmp(_ps, "null"))
     {
         RS.SetTSS(0, D3DTSS_COLOROP, D3DTOP_DISABLE);
         RS.SetTSS(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

src/Layers/xrRender/D3DUtils.cpp

@@ -396,17 +396,19 @@ void CDrawUtilities::DrawEntity(u32 clr, ref_shader s)
     // fill VB
     _VertexStream* Stream = &RCache.Vertex;
     u32 vBase;
-    FVF::L* pv = (FVF::L*)Stream->Lock(5, vs_L->vb_stride, vBase);
-    pv->set(0.f, 0.f, 0.f, clr);
-    pv++;
-    pv->set(0.f, 1.f, 0.f, clr);
-    pv++;
-    pv->set(0.f, 1.f, .5f, clr);
-    pv++;
-    pv->set(0.f, .5f, .5f, clr);
-    pv++;
-    pv->set(0.f, .5f, 0.f, clr);
-    pv++;
+    {
+        FVF::L* pv = (FVF::L*)Stream->Lock(5, vs_L->vb_stride, vBase);
+        pv->set(0.f, 0.f, 0.f, clr);
+        pv++;
+        pv->set(0.f, 1.f, 0.f, clr);
+        pv++;
+        pv->set(0.f, 1.f, .5f, clr);
+        pv++;
+        pv->set(0.f, .5f, .5f, clr);
+        pv++;
+        pv->set(0.f, .5f, 0.f, clr);
+        pv++;
+    }
     Stream->Unlock(5, vs_L->vb_stride);
     // render flagshtok
     DU_DRAW_SH(RImplementation.m_WireShader);
@@ -441,11 +443,13 @@ void CDrawUtilities::DrawFlag(
     // fill VB
     _VertexStream* Stream = &RCache.Vertex;
     u32 vBase;
-    FVF::L* pv = (FVF::L*)Stream->Lock(2, vs_L->vb_stride, vBase);
-    pv->set(p, clr);
-    pv++;
-    pv->set(p.x, p.y + height, p.z, clr);
-    pv++;
+    {
+        FVF::L* pv = (FVF::L*)Stream->Lock(2, vs_L->vb_stride, vBase);
+        pv->set(p, clr);
+        pv++;
+        pv->set(p.x, p.y + height, p.z, clr);
+        pv++;
+    }
     Stream->Unlock(2, vs_L->vb_stride);
     // and Render it as triangle list
     DU_DRAW_DP(D3DPT_LINELIST, vs_L, vBase, 1);

src/Layers/xrRender/DetailManager_VS.cpp

@@ -232,7 +232,7 @@ void CDetailManager::hw_Render()
     hw_Render_dump(&*hwc_s_array, 0, 1, c_hdr);
 }
 
-void CDetailManager::hw_Render_dump(ref_constant x_array, u32 var_id, u32 lod_id, u32 c_offset)
+void CDetailManager::hw_Render_dump(ref_constant x_array, u32 var_id, u32 lod_id, u32 /*c_offset*/)
 {
     RImplementation.BasicStats.DetailCount = 0;
 

src/Layers/xrRender/FHierrarhyVisual.cpp

@@ -71,7 +71,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
                     xr_strcpy(short_name, N);
                     if (strext(short_name))
                         *strext(short_name) = 0;
-                    strconcat(sizeof(name_load), name_load, short_name, ":", _itoa(count, num, 10));
+                    strconcat(sizeof(name_load), name_load, short_name, ":", xr_itoa(count, num, 10));
                     children.push_back((dxRender_Visual*)GEnv.Render->model_CreateChild(name_load, O));
                     O->close();
                     O = OBJ->open_chunk(count);

src/Layers/xrRender/HOM.cpp

@@ -217,11 +217,11 @@ void CHOM::Render_DB(CFrustum& base)
         stats.VisibleTriangleCount++;
         u32 pixels = 0;
         int limit = int(P->size()) - 1;
-        for (int v = 1; v < limit; v++)
+        for (int v2 = 1; v2 < limit; v2++)
         {
             m_xform.transform(T.raster[0], (*P)[0]);
-            m_xform.transform(T.raster[1], (*P)[v + 0]);
-            m_xform.transform(T.raster[2], (*P)[v + 1]);
+            m_xform.transform(T.raster[1], (*P)[v2 + 0]);
+            m_xform.transform(T.raster[2], (*P)[v2 + 1]);
             pixels += Raster.rasterize(&T);
         }
         if (0 == pixels)

src/Layers/xrRender/HW.cpp

@@ -579,7 +579,7 @@ struct _uniq_mode
 {
     _uniq_mode(LPCSTR v) : _val(v) {}
     LPCSTR _val;
-    bool operator()(LPCSTR _other) { return !_stricmp(_val, _other); }
+    bool operator()(LPCSTR _other) { return !xr_stricmp(_val, _other); }
 };
 
 #ifndef _EDITOR

src/Layers/xrRender/ModelPool.cpp

@@ -220,7 +220,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data)
     string_path low_name;
     VERIFY(xr_strlen(name) < sizeof(low_name));
     xr_strcpy(low_name, name);
-    _strlwr(low_name);
+    xd_strlwr(low_name);
     if (strext(low_name))
         *strext(low_name) = 0;
     //	Msg						("-CREATE %s",low_name);
@@ -266,7 +266,7 @@ dxRender_Visual* CModelPool::CreateChild(LPCSTR name, IReader* data)
     string256 low_name;
     VERIFY(xr_strlen(name) < 256);
     xr_strcpy(low_name, name);
-    _strlwr(low_name);
+    xd_strlwr(low_name);
     if (strext(low_name))
         *strext(low_name) = 0;
 

src/Layers/xrRender/NvTriStrip.cpp

@@ -65,8 +65,7 @@ void GenerateStrips(const u16* in_indices, const s32 in_numIndices, xr_vector<Pr
     // put data in format that the stripifier likes
     WordVec tempIndices;
     tempIndices.resize(in_numIndices);
-    int i;
-    for (i = 0; i < in_numIndices; i++)
+    for (int i = 0; i < in_numIndices; i++)
         tempIndices[i] = in_indices[i];
     NvStripInfoVec tempStrips;
     NvFaceInfoVec tempFaces;