Fix various minor issues

src/Common/PlatformLinux.inl

@@ -150,7 +150,7 @@ typedef unsigned char* LPBYTE;
 typedef unsigned int UINT;
 typedef int INT;
 typedef unsigned long ULONG;
-typedef unsigned long& ULONG_PTR;
+typedef unsigned long* ULONG_PTR;
 typedef long long int LARGE_INTEGER;
 typedef unsigned long long int ULARGE_INTEGER;
 
@@ -208,7 +208,7 @@ typedef unsigned int UINT_PTR;
 typedef long LONG_PTR;
 #endif // XR_X64
 
-typedef int HANDLE;
+typedef void* HANDLE;
 typedef void* HMODULE;
 typedef void* PVOID;
 typedef void* LPVOID;

src/xrGame/MainMenu.cpp

@@ -761,7 +761,7 @@ bool CMainMenu::IsCDKeyIsValid()
     for (int i = 0; i < 4; i++)
     {
         GetGameID(&GameID, i);
-        if (VerifyClientCheck(CDKey, unsigned short(GameID)) == 1)
+        if (VerifyClientCheck(CDKey, (unsigned short)(GameID)) == 1)
             return true;
     };
     return false;

src/xrGame/PHSkeleton.cpp

@@ -388,7 +388,7 @@ void CPHSkeleton::RecursiveBonesCheck(u16 id)
     Flags64 mask;
     mask.assign(K->LL_GetBonesVisible());
     ///////////////////////////////////////////
-    if (mask.is(1ui64 << (u64)id) && !(BD.shape.flags.is(SBoneShape::sfRemoveAfterBreak)))
+    if (mask.is(u64(1) << (u64)id) && !(BD.shape.flags.is(SBoneShape::sfRemoveAfterBreak)))
     {
         removable = false;
         return;

src/xrGame/ai/monsters/state.h

@@ -8,6 +8,8 @@
 #include "debug_text_tree.h"
 #endif
 
+inline TTime current_time() { return Device.dwTimeGlobal; }
+
 template <typename _Object>
 class CState
 {

src/xrGame/ai/monsters/state_inline.h

@@ -205,8 +205,8 @@ EMonsterState CStateAbstract::get_state_type()
 TEMPLATE_SPECIALIZATION
 void CStateAbstract::remove_links(IGameObject* object)
 {
-    SubStates::iterator i = substates.begin();
-    SubStates::iterator e = substates.end();
+    auto i = substates.begin();
+    auto e = substates.end();
     for (; i != e; ++i)
         (*i).second->remove_links(object);
 }

src/xrGame/ai/monsters/states/monster_state_attack_on_run.h

@@ -5,7 +5,6 @@
 
 #include "ai/weighted_random.h"
 
-inline TTime current_time() { return Device.dwTimeGlobal; }
 template <typename _Object>
 class CStateMonsterAttackOnRun : public CState<_Object>
 {

src/xrGame/ai/monsters/states/monster_state_squad_rest_follow_inline.h

@@ -2,6 +2,7 @@
 
 #include "state_custom_action.h"
 #include "state_move_to_point.h"
+#include "ai_monster_squad.h"
 
 #define TEMPLATE_SPECIALIZATION \
     template <typename _Object\

src/xrGame/attachable_item.cpp

@@ -125,7 +125,7 @@ void CAttachableItem::afterDetach()
     object().processing_deactivate();
 }
 
-virtual bool CAttachableItem::use_parent_ai_locations() const
+bool CAttachableItem::use_parent_ai_locations() const
 {
     return !enabled();
 }

src/xrGame/entity_alive.cpp

@@ -690,7 +690,7 @@ ICollisionHitCallback* CEntityAlive::get_collision_hit_callback()
     if (cs)
         return cs->get_collision_hit_callback();
     else
-        return false;
+        return nullptr;
 }
 
 void CEntityAlive::set_collision_hit_callback(ICollisionHitCallback* cc)

src/xrGame/game_sv_mp.cpp

@@ -229,6 +229,7 @@ struct real_sender
         P = Packet;
         flags_to_send = flags;
     }
+
     void operator()(IClient* client)
     {
         xrClientData* tmp_client = static_cast<xrClientData*>(client);

src/xrGame/level_location_selector_inline.h

@@ -15,7 +15,7 @@
 #define CLevelLocationSelector CBaseLocationSelector<CLevelGraph, _VertexEvaluator, _vertex_id_type>
 
 TEMPLATE_SPECIALIZATION
-IC CLevelLocationSelector::CBaseLocationSelector(CRestrictedObject* object) : inherited(object, selector_manager) {}
+IC CLevelLocationSelector::CBaseLocationSelector(CRestrictedObject* object) : inherited(object) {}
 TEMPLATE_SPECIALIZATION
 IC void CLevelLocationSelector::before_search(_vertex_id_type& vertex_id)
 {

src/xrGame/login_manager.cpp

@@ -350,7 +350,7 @@ void login_manager::save_password_to_registry(char const* password)
         return;
     }
 
-    key_t pass_key;
+    secure_messaging::key_t pass_key;
     generate_key(pass_key_seed, pass_key);
     u32 buffer_size = xr_strlen(password) + 1;
     u8* buffer = static_cast<u8*>(_alloca(buffer_size));
@@ -370,7 +370,7 @@ char const* login_manager::get_password_from_registry()
 
     if (pass_size)
     {
-        key_t pass_key;
+        secure_messaging::key_t pass_key;
         generate_key(pass_key_seed, pass_key);
         decrypt(tmp_password_dest, pass_size, pass_key);
         xr_strcpy(m_reg_password, (char*)tmp_password_dest);

src/xrGame/memory_manager.cpp

@@ -152,8 +152,8 @@ template <typename T>
 void CMemoryManager::update(const xr_vector<T>& objects, bool add_enemies)
 {
     squad_mask_type mask = m_stalker ? m_stalker->agent_manager().member().mask(m_stalker) : 0;
-    xr_vector<T>::const_iterator I = objects.begin();
-    xr_vector<T>::const_iterator E = objects.end();
+    auto I = objects.cbegin();
+    auto E = objects.cend();
     for (; I != E; ++I)
     {
         if (!(*I).m_enabled)

src/xrGame/object_actions_inline.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "object_handler.h"
+#include "object_handler_space.h"
 
 //////////////////////////////////////////////////////////////////////////
 // CObjectActionBase

src/xrGame/script_game_object_inventory_owner.cpp

@@ -1509,7 +1509,7 @@ LPCSTR CScriptGameObject::aim_bone_id() const
     if (!stalker)
     {
         GEnv.ScriptEngine->script_log(LuaMessageType::Error, "CAI_Stalker : cannot access class member aim_bone_id!");
-        return (false);
+        return nullptr;
     }
 
     return (stalker->aim_bone_id().c_str());

src/xrGame/setup_manager.h

@@ -13,7 +13,7 @@
 template <typename _action_type, typename _object_type, typename _action_id_type>
 class CSetupManager
 {
-private:
+protected:
     typedef std::pair<_action_id_type, _action_type*> setup_pair;
     typedef xr_vector<setup_pair> setup_actions;
 

src/xrGame/smart_cover_description.cpp

@@ -199,20 +199,20 @@ IC void delete_data(const CGraphAbstract<_data_type, _edge_weight_type, _vertex_
 
     Graph& graph = const_cast<Graph&>(graph_);
 
-    typedef Graph::VERTICES Vertices;
-    typedef Graph::EDGES Edges;
+    using Vertices = typename Graph::VERTICES;
+    using Edges = typename Graph::EDGES;
 
     Vertices& verts = graph.vertices();
 
     for (auto vi = verts.begin(); vi != verts.end(); ++vi)
     {
-        Graph::CVertex* vert = (*vi).second;
+        typename Graph::CVertex* vert = (*vi).second;
         delete_data(vert->data());
 
         Edges& edges = const_cast<Edges&>(vert->edges());
         for (auto ei = edges.begin(); ei != edges.end(); ++ei)
         {
-            Graph::CEdge& edge = (*ei);
+            typename Graph::CEdge& edge = (*ei);
             delete_data(edge.data());
         }
     }

src/xrGame/state_arguments_functions.cpp

@@ -4,11 +4,14 @@
 namespace award_system
 {
 // definitions of static members of functions_cf
-
+template<>
 ge_function<float> functions_cf<float>::ge_function;
+template<>
 le_function<float> functions_cf<float>::le_function;
 
+template<>
 ge_function<u32> functions_cf<u32>::ge_function;
+template<>
 le_function<u32> functions_cf<u32>::le_function;
 
 } // namespace award_system

src/xrGame/ui/uiscriptwnd_script.h

@@ -8,16 +8,16 @@ struct CWrapperBase : public T, public luabind::wrap_base
 
     virtual bool OnKeyboardAction(int dik, EUIMessages keyboard_action)
     {
-        return call_member<bool>(this, "OnKeyboard", dik, keyboard_action);
+        return luabind::call_member<bool>(this, "OnKeyboard", dik, keyboard_action);
     }
     static bool OnKeyboard_static(inherited* ptr, int dik, EUIMessages keyboard_action)
     {
         return ptr->self_type::inherited::OnKeyboardAction(dik, keyboard_action);
     }
 
-    virtual void Update() { call_member<void>(this, "Update"); }
+    virtual void Update() { luabind::call_member<void>(this, "Update"); }
     static void Update_static(inherited* ptr) { ptr->self_type::inherited::Update(); }
-    virtual bool Dispatch(int cmd, int param) { return call_member<bool>(this, "Dispatch", cmd, param); }
+    virtual bool Dispatch(int cmd, int param) { return luabind::call_member<bool>(this, "Dispatch", cmd, param); }
     static bool Dispatch_static(inherited* ptr, int cmd, int param)
     {
         return ptr->self_type::inherited::Dispatch(cmd, param);