Fix some includes, template issues and other stuff when DEBUG is on

Zegeri · q4a · commit d6ee7a1da64b · 2018-09-28T00:37:57.000+03:00
diff --git a/src/xrAICore/Components/problem_solver_inline.h b/src/xrAICore/Components/problem_solver_inline.h
@@ -90,14 +90,12 @@ IC void CProblemSolverAbstract::add_operator(const _operator_id_type& operator_i
 TEMPLATE_SPECIALIZATION
 IC void CProblemSolverAbstract::validate_properties(const CState& conditions) const
 {
-    xr_vector<_operator_condition>::const_iterator I = conditions.conditions().begin();
-    xr_vector<_operator_condition>::const_iterator E = conditions.conditions().end();
-    for (; I != E; ++I)
+    for (const auto& cond : conditions.conditions())
     {
-        if (evaluators().find((*I).condition()) == evaluators().end())
+        if (evaluators().find(cond.condition()) == evaluators().end())
         {
-            Msg("! cannot find corresponding evaluator to the property with id %d", (*I).condition());
-            THROW(evaluators().find((*I).condition()) != evaluators().end());
+            Msg("! cannot find corresponding evaluator to the property with id %d", cond.condition());
+            THROW(evaluators().find(cond.condition()) != evaluators().end());
         }
     }
 }
diff --git a/src/xrCDB/ISpatial.cpp b/src/xrCDB/ISpatial.cpp
@@ -4,7 +4,7 @@
 #include "xrEngine/Render.h"
 #ifdef DEBUG
 #include "xrEngine/xr_object.h"
-#include "xrEngine/PS_Instance.h"
+#include "xrEngine/PS_instance.h"
 #endif
 #include "xrEngine/device.h"
 #include "xrEngine/GameFont.h"
diff --git a/src/xrCore/LocatorAPI_auth.cpp b/src/xrCore/LocatorAPI_auth.cpp
@@ -107,7 +107,7 @@ void CLocatorAPI::auth_runtime(void* params)
     {
         string64 c_auth_code;
         sscanf(strstr(Core.Params, "asdf ") + 5, "%[^ ] ", c_auth_code);
-        m_auth_code = _atoi64(c_auth_code);
+        m_auth_code = atoll(c_auth_code);
     }
 #endif // DEBUG
     xr_delete(_o);
diff --git a/src/xrEngine/xr_collide_form.cpp b/src/xrEngine/xr_collide_form.cpp
@@ -16,7 +16,7 @@ IC float DET(const Fmatrix& a)
     return ((a._11 * (a._22 * a._33 - a._23 * a._32) - a._12 * (a._21 * a._33 - a._23 * a._31) +
         a._13 * (a._21 * a._32 - a._22 * a._31)));
 }
-#include "objectdump.h"
+#include "ObjectDump.h"
 #endif
 using namespace collide;
 //----------------------------------------------------------------------
diff --git a/src/xrGame/ElevatorState.cpp b/src/xrGame/ElevatorState.cpp
@@ -5,7 +5,7 @@
 #include "MathUtils.h"
 #include "xrPhysics/PHWorld.h"
 #ifdef DEBUG
-#include "../xrEngine/Statgraph.h"
+#include "../xrEngine/StatGraph.h"
 #include "PHDebug.h"
 #endif
 static const float getting_on_dist = 0.3f;
diff --git a/src/xrGame/PHDebug.cpp b/src/xrGame/PHDebug.cpp
@@ -18,7 +18,7 @@
 #include "Include/xrRender/Kinematics.h"
 #include "Include/xrRender/KinematicsAnimated.h"
 #include "xrCore/Animation/Bone.hpp"
-#include "xrEngine/iphdebug.h"
+#include "xrEngine/IPHdebug.h"
 #include "xrCore/xr_token.h"
 #include "xrEngine/GameFont.h"
 
@@ -707,8 +707,8 @@ static LPCSTR name_bool(BOOL v)
 
 static LPCSTR name_blend_type(CBlend::ECurvature blend)
 {
-    static xr_token token_blend[] = {{"eFREE_SLOT", CBlend::eFREE_SLOT}, {"eAccrue", CBlend::eAccrue},
-        {"eFalloff", CBlend::eFalloff}, {"eFORCEDWORD", CBlend::eFORCEDWORD}};
+    static xr_token token_blend[] = {{"eFREE_SLOT", int(CBlend::eFREE_SLOT)}, {"eAccrue", int(CBlend::eAccrue)},
+        {"eFalloff", int(CBlend::eFalloff)}, {"eFORCEDWORD", int(CBlend::eFORCEDWORD)}};
     return get_token_name(token_blend, blend);
 }
 /*
diff --git a/src/xrGame/PhysicObject.cpp b/src/xrGame/PhysicObject.cpp
@@ -15,7 +15,7 @@
 #include "xrPhysics/ExtendedGeom.h"
 #ifdef DEBUG
 #include "PHDebug.h"
-#include "xrEngine/objectdump.h"
+#include "xrEngine/ObjectDump.h"
 #endif
 BOOL dbg_draw_doors = false;
 CPhysicObject::CPhysicObject(void)
diff --git a/src/xrGame/PhysicsShellHolder.cpp b/src/xrGame/PhysicsShellHolder.cpp
@@ -20,7 +20,7 @@
 #include "PHCollisionDamageReceiver.h"
 #include "xrEngine/IPhysicsShell.h"
 #ifdef DEBUG
-#include "xrEngine/objectdump.h"
+#include "xrEngine/ObjectDump.h"
 #endif
 CPhysicsShellHolder::CPhysicsShellHolder() { init(); }
 CPhysicsShellHolder::~CPhysicsShellHolder()
diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
@@ -695,7 +695,7 @@ void CWeaponMagazined::switch2_Idle()
 }
 
 #ifdef DEBUG
-#include "ai\stalker\ai_stalker.h"
+#include "ai/stalker/ai_stalker.h"
 #include "object_handler_planner.h"
 #endif
 void CWeaponMagazined::switch2_Fire()
diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.h b/src/xrGame/ai/monsters/basemonster/base_monster.h
@@ -427,7 +427,7 @@ class CBaseMonster : public CCustomMonster, public CStepManager
 #ifdef DEBUG
 
     template <class Type>
-    bool get_debug_var(pcstr var_name, OUT Type& result);
+    bool get_debug_var(pcstr var_name, Type& result);
 
 public:
     struct SDebugInfo
@@ -593,7 +593,7 @@ class CBaseMonster : public CCustomMonster, public CStepManager
 
 #ifdef DEBUG
 template <class Type>
-bool CBaseMonster::get_debug_var(pcstr var_name, OUT Type& result)
+bool CBaseMonster::get_debug_var(pcstr var_name, Type& result)
 {
     char* full_var_name;
     STRCONCAT(full_var_name, get_monster_class_name(), "_", var_name);
diff --git a/src/xrGame/ai/monsters/state_inline.h b/src/xrGame/ai/monsters/state_inline.h
@@ -161,14 +161,14 @@ void CStateAbstract::add_debug_info(debug::text_tree& root_s)
     }
     else
     {
-        for (SubStates::const_iterator i = substates.begin(), e = substates.end(); i != e; ++i)
+        for (const auto& [id, substate] : substates)
         {
-            TextTree& current_state_s = root_s.add_line(EMonsterState((*i).first));
-            if (current_substate == (*i).first)
+            TextTree& current_state_s = root_s.add_line(EMonsterState(id));
+            if (current_substate == id)
             {
-                if ((*i).second)
+                if (substate)
                 {
-                    (*i).second->add_debug_info(current_state_s);
+                    substate->add_debug_info(current_state_s);
                 }
                 else
                 {
diff --git a/src/xrGame/ai/stalker/ai_stalker_debug.cpp b/src/xrGame/ai/stalker/ai_stalker_debug.cpp
@@ -43,13 +43,13 @@
 #include "cover_point.h"
 #include "xrEngine/CameraBase.h"
 #include "mt_config.h"
-#include "weaponmagazined.h"
+#include "WeaponMagazined.h"
 #include "object_handler_space.h"
 #include "debug_renderer.h"
 #include "CharacterPhysicsSupport.h"
 #include "smart_cover_animation_selector.h"
 #include "animation_movement_controller.h"
-#include "phdebug.h"
+#include "PHDebug.h"
 #include "game_object_space.h"
 #include "aimers_weapon.h"
 #include "aimers_bone.h"
@@ -166,7 +166,7 @@ void draw_planner(const planner_type& brain, LPCSTR start_indent, LPCSTR indent,
     for (; I != E; ++I)
     {
         const auto J = std::lower_bound(brain.current_state().conditions().cbegin(), brain.current_state().conditions().cend(),
-                planner_type::CWorldProperty((*I).first, false));
+            typename planner_type::CWorldProperty((*I).first, false));
         char temp = '?';
         if ((J != brain.current_state().conditions().end()) && ((*J).condition() == (*I).first))
         {
@@ -181,7 +181,7 @@ void draw_planner(const planner_type& brain, LPCSTR start_indent, LPCSTR indent,
     for (; I != E; ++I)
     {
         const auto J = std::lower_bound(brain.target_state().conditions().cbegin(), brain.target_state().conditions().cend(),
-                planner_type::CWorldProperty((*I).first, false));
+            typename planner_type::CWorldProperty((*I).first, false));
         char temp = '?';
         if ((J != brain.target_state().conditions().end()) && ((*J).condition() == (*I).first))
         {
diff --git a/src/xrGame/debug_text_tree.h b/src/xrGame/debug_text_tree.h
@@ -100,4 +100,5 @@ void log_text_tree(text_tree& tree);
 #include "debug_text_tree_inline.h"
 
 } // namespace debug
+
 #endif // defined(AI_DEBUG_TEXT_TREE_H_INCLUDED)
diff --git a/src/xrGame/level_debug.h b/src/xrGame/level_debug.h
@@ -62,8 +62,8 @@ class CLevelDebug
             std::sort(m_data.begin(), m_data.end(), sort_id_pred());
         }
         IC void clear() { m_data.clear(); }
-        template <class T>
-        IC void process(T& process_pred)
+        template <class H>
+        IC void process(H& process_pred)
         {
             for (ITEM_STORAGE_VEC_IT it = m_data.begin(); it != m_data.end(); ++it)
             {
diff --git a/src/xrGame/static_cast_checked.hpp b/src/xrGame/static_cast_checked.hpp
@@ -36,15 +36,11 @@ struct value
 template <typename source_type, typename destination_type>
 struct helper
 {
-    template <bool is_polymrphic>
+    template <bool is_polymorphic>
     inline static void check(source_type source)
     {
-        value<destination_type>::check(source);
-    }
-
-    template <>
-    inline static void check<false>(source_type source)
-    {
+        if constexpr (is_polymorphic)
+            value<destination_type>::check(source);
     }
 };
 
@@ -55,23 +51,23 @@ struct helper
 template <typename destination_type, typename source_type>
 inline destination_type static_cast_checked(source_type const& source)
 {
-    typedef object_type_traits::remove_pointer<source_type>::type pointerless_type;
-    typedef object_type_traits::remove_reference<pointerless_type>::type pure_source_type;
+    using pointerless_type = typename object_type_traits::remove_pointer<source_type>::type;
+    using pure_source_type = typename object_type_traits::remove_reference<pointerless_type>::type;
 
     debug::detail::static_cast_checked::helper<source_type const&,
-        destination_type>::check<std::is_polymorphic<pure_source_type>::value>(source);
+        destination_type>::template check<std::is_polymorphic<pure_source_type>::value>(source);
 
     return (static_cast<destination_type>(source));
 }
 
 template <typename destination_type, typename source_type>
 inline destination_type static_cast_checked(source_type& source)
 {
-    typedef object_type_traits::remove_pointer<source_type>::type pointerless_type;
-    typedef object_type_traits::remove_reference<pointerless_type>::type pure_source_type;
+    using pointerless_type = typename object_type_traits::remove_pointer<source_type>::type;
+    using pure_source_type = typename object_type_traits::remove_reference<pointerless_type>::type;
 
     debug::detail::static_cast_checked::helper<source_type&,
-        destination_type>::check<std::is_polymorphic<pure_source_type>::value>(source);
+        destination_type>::template check<std::is_polymorphic<pure_source_type>::value>(source);
 
     return (static_cast<destination_type>(source));
 }
diff --git a/src/xrGame/ui/UIKeyBinding.cpp b/src/xrGame/ui/UIKeyBinding.cpp
@@ -104,7 +104,7 @@ void CUIKeyBinding::FillUpList(CUIXml& xml_doc_ui, LPCSTR path_ui)
 void CUIKeyBinding::CheckStructure(CUIXml& xml_doc)
 {
     bool first = true;
-    CUITextWnd* pItem = false;
+    CUITextWnd* pItem = nullptr;
 
     for (int i = 0; true; i++)
     {
diff --git a/src/xrPhysics/ElevatorState.cpp b/src/xrPhysics/ElevatorState.cpp
@@ -6,7 +6,7 @@
 #include "PHWorld.h"
 #include "xrEngine/device.h"
 #ifdef DEBUG
-#include "xrEngine/Statgraph.h"
+#include "xrEngine/StatGraph.h"
 #include "debug_output.h"
 #endif
 static const float getting_on_dist = 0.3f;
diff --git a/src/xrPhysics/stdafx.h b/src/xrPhysics/stdafx.h
@@ -16,7 +16,7 @@
 
 #include "xrPhysics.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(WINDOWS)
 #include <d3d9types.h>
 #endif
 
diff --git a/src/xrScriptEngine/LuaStudio/Defines.hpp b/src/xrScriptEngine/LuaStudio/Defines.hpp
@@ -22,8 +22,7 @@
 STATIC_CHECK(false, CS_STRING_CONCAT_or_CS_STRING_CONCAT_HELPER_or_CS_STRING_CONCAT4_macro_already_defined);
 #endif // #if defined(CS_STRING_CONCAT) || defined(CS_STRING_CONCAT_HELPER)
 
-#define CS_STRING_CONCAT_HELPER(a, b) a##b
-#define CS_STRING_CONCAT(a, b) CS_STRING_CONCAT_HELPER(a, b)
+#define CS_STRING_CONCAT(a, b) (a"" b)
 
 // CS_MAKE_STRING macro
 #if defined(CS_MAKE_STRING) || defined(CS_MAKE_STRING_HELPER)

Original file line number	Diff line number	Diff line change
`@@ -90,14 +90,12 @@ IC void CProblemSolverAbstract::add_operator(const _operator_id_type& operator_i`
`90`	`90`	`TEMPLATE_SPECIALIZATION`
`91`	`91`	`IC void CProblemSolverAbstract::validate_properties(const CState& conditions) const`
`92`	`92`	`{`
`93`		`- xr_vector<_operator_condition>::const_iterator I = conditions.conditions().begin();`
`94`		`- xr_vector<_operator_condition>::const_iterator E = conditions.conditions().end();`
`95`		`- for (; I != E; ++I)`
	`93`	`+ for (const auto& cond : conditions.conditions())`
`96`	`94`	`{`
`97`		`- if (evaluators().find((*I).condition()) == evaluators().end())`
	`95`	`+ if (evaluators().find(cond.condition()) == evaluators().end())`
`98`	`96`	`{`
`99`		`- Msg("! cannot find corresponding evaluator to the property with id %d", (*I).condition());`
`100`		`- THROW(evaluators().find((*I).condition()) != evaluators().end());`
	`97`	`+ Msg("! cannot find corresponding evaluator to the property with id %d", cond.condition());`
	`98`	`+ THROW(evaluators().find(cond.condition()) != evaluators().end());`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void CLocatorAPI::auth_runtime(void* params)`
`107`	`107`	`{`
`108`	`108`	`string64 c_auth_code;`
`109`	`109`	`sscanf(strstr(Core.Params, "asdf ") + 5, "%[^ ] ", c_auth_code);`
`110`		`- m_auth_code = _atoi64(c_auth_code);`
	`110`	`+ m_auth_code = atoll(c_auth_code);`
`111`	`111`	`}`
`112`	`112`	`#endif // DEBUG`
`113`	`113`	`xr_delete(_o);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ IC float DET(const Fmatrix& a)`
`16`	`16`	`return ((a._11 * (a._22 * a._33 - a._23 * a._32) - a._12 * (a._21 * a._33 - a._23 * a._31) +`
`17`	`17`	`a._13 * (a._21 * a._32 - a._22 * a._31)));`
`18`	`18`	`}`
`19`		`-#include "objectdump.h"`
	`19`	`+#include "ObjectDump.h"`
`20`	`20`	`#endif`
`21`	`21`	`using namespace collide;`
`22`	`22`	`//----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ void CWeaponMagazined::switch2_Idle()`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`#ifdef DEBUG`
`698`		`-#include "ai\stalker\ai_stalker.h"`
	`698`	`+#include "ai/stalker/ai_stalker.h"`
`699`	`699`	`#include "object_handler_planner.h"`
`700`	`700`	`#endif`
`701`	`701`	`void CWeaponMagazined::switch2_Fire()`