Part 6 of the experiment to remove doug_lea_allocator. Small x64 fixes.

Author: intorr

src/Layers/xrRender/r__dsgraph_render_lods.cpp

@@ -39,7 +39,7 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
 
     for (u32 i = 0; i < lstLODs.size(); i++)
     {
-        const u32 iBatchSize = std::min(lstLODs.size() - i, uiImpostersFit);
+        const u32 iBatchSize = std::min(lstLODs.size() - i, (size_t)uiImpostersFit);
         int cur_count = 0;
         u32 vOffset;
         FLOD::_hw* V =

src/Layers/xrRenderPC_R2/r2_R_render.cpp

@@ -337,7 +337,7 @@ void CRender::Render()
     LP_pending.clear();
     {
         // perform tests
-        u32 count = 0;
+        auto count = 0;
         light_Package& LP = Lights.package;
 
         // stats
@@ -349,7 +349,7 @@ void CRender::Render()
         count = _max(count, LP.v_point.size());
         count = _max(count, LP.v_spot.size());
         count = _max(count, LP.v_shadowed.size());
-        for (u32 it = 0; it < count; it++)
+        for (auto it = 0; it < count; it++)
         {
             if (it < LP.v_point.size())
             {

src/Layers/xrRenderPC_R3/r3_R_render.cpp

@@ -357,7 +357,7 @@ void CRender::Render()
     {
         PIX_EVENT(DEFER_TEST_LIGHT_VIS);
         // perform tests
-        u32 count = 0;
+        auto count = 0;
         light_Package& LP = Lights.package;
 
         // stats
@@ -369,7 +369,7 @@ void CRender::Render()
         count = _max(count, LP.v_point.size());
         count = _max(count, LP.v_spot.size());
         count = _max(count, LP.v_shadowed.size());
-        for (u32 it = 0; it < count; it++)
+        for (auto it = 0; it < count; it++)
         {
             if (it < LP.v_point.size())
             {

src/Layers/xrRenderPC_R4/r4_R_render.cpp

@@ -358,7 +358,7 @@ void CRender::Render()
     {
         PIX_EVENT(DEFER_TEST_LIGHT_VIS);
         // perform tests
-        u32 count = 0;
+        auto count = 0;
         light_Package& LP = Lights.package;
 
         // stats
@@ -370,7 +370,7 @@ void CRender::Render()
         count = _max(count, LP.v_point.size());
         count = _max(count, LP.v_spot.size());
         count = _max(count, LP.v_shadowed.size());
-        for (u32 it = 0; it < count; it++)
+        for (auto it = 0; it < count; it++)
         {
             if (it < LP.v_point.size())
             {

src/xrCore/log.cpp

@@ -133,6 +133,15 @@ void Log(const char* msg, u32 dop)
     Log(buf);
 }
 
+void Log(const char* msg, u64 dop)
+{
+    u32 buffer_size = (xr_strlen(msg) + 1 + 64 + 1) * sizeof(char);
+    PSTR buf = (PSTR)_alloca(buffer_size);
+
+    xr_sprintf(buf, buffer_size, "%s %d", msg, dop);
+    Log(buf);
+}
+
 void Log(const char* msg, int dop)
 {
     u32 buffer_size = (xr_strlen(msg) + 1 + 11 + 1) * sizeof(char);

src/xrCore/log.h

@@ -16,6 +16,7 @@ void XRCORE_API Log(LPCSTR msg);
 void XRCORE_API Log(LPCSTR msg);
 void XRCORE_API Log(LPCSTR msg, LPCSTR dop);
 void XRCORE_API Log(LPCSTR msg, u32 dop);
+void XRCORE_API Log(LPCSTR msg, u64 dop);
 void XRCORE_API Log(LPCSTR msg, int dop);
 void XRCORE_API Log(LPCSTR msg, float dop);
 void XRCORE_API Log(LPCSTR msg, const Fvector& dop);

src/xrEngine/XR_IOConsole.cpp

@@ -393,7 +393,7 @@ void CConsole::DrawBackgrounds(bool bGame)
     float list_w = pFont->SizeOf_(max_str) + 2.0f * w1;
 
     float font_h = pFont->CurrentHeight_();
-    float tips_h = std::min(m_tips.size(), (u32)VIEW_TIPS_COUNT) * font_h;
+    float tips_h = std::min(m_tips.size(), (size_t)VIEW_TIPS_COUNT) * font_h;
     tips_h += (m_tips.size() > 0) ? 5.0f : 0.0f;
 
     Frect pr, sr;