xrGame: fixed some compiler warnings

Also added some comments

Author: Xottab-DUTY

src/xrGame/PhysicsShellHolder.cpp

@@ -75,7 +75,7 @@ void CPhysicsShellHolder::net_Destroy()
     xr_delete(m_pPhysicsShell);
 }
 
-static enum EEnableState { stEnable = 0, stDisable, stNotDefitnite };
+enum EEnableState { stEnable = 0, stDisable, stNotDefitnite }; // stNotDefitnite? Possibly mistaken name
 static u8 st_enable_state = (u8)stNotDefitnite;
 BOOL CPhysicsShellHolder::net_Spawn(CSE_Abstract* DC)
 {

src/xrGame/WeaponBinocularsVision.cpp

@@ -73,7 +73,7 @@ void SBinocVisibleObj::Draw()
 
 void SBinocVisibleObj::Update()
 {
-    m_flags.set(flVisObjNotValid, TRUE);
+    m_flags.set(flVisObjNotValid, true);
 
     if (!m_object->Visual())
         return;
@@ -131,11 +131,11 @@ void SBinocVisibleObj::Update()
         if (mn.similar(cur_rect.lt, 2.f) && mx.similar(cur_rect.rb, 2.f))
         {
             // target locked
-            m_flags.set(flTargetLocked, TRUE);
+            m_flags.set(flTargetLocked, true);
             u32 clr = subst_alpha(m_lt.GetTextureColor(), 255);
 
             //-----------------------------------------------------
-            CActor* pActor = NULL;
+            CActor* pActor = nullptr;
             if (IsGameTypeSingle())
                 pActor = Actor();
             else
@@ -191,7 +191,7 @@ void SBinocVisibleObj::Update()
     m_rt.SetWndPos(Fvector2().set((cur_rect.rb.x), (cur_rect.lt.y)));
     m_rb.SetWndPos(Fvector2().set((cur_rect.rb.x), (cur_rect.rb.y)));
 
-    m_flags.set(flVisObjNotValid, FALSE);
+    m_flags.set(flVisObjNotValid, false);
 }
 
 CBinocularsVision::CBinocularsVision(const shared_str& sect) { Load(sect); }
@@ -201,7 +201,7 @@ void CBinocularsVision::Update()
     if (GEnv.isDedicatedServer)
         return;
     //-----------------------------------------------------
-    const CActor* pActor = NULL;
+    const CActor* pActor = nullptr;
     if (IsGameTypeSingle())
         pActor = Actor();
     else
@@ -218,7 +218,7 @@ void CBinocularsVision::Update()
 
     VIS_OBJECTS_IT it = m_active_objects.begin();
     for (; it != m_active_objects.end(); ++it)
-        (*it)->m_flags.set(flVisObjNotValid, TRUE);
+        (*it)->m_flags.set(flVisObjNotValid, true);
 
     CVisualMemoryManager::VISIBLES::const_iterator v_it = vVisibles.begin();
     for (; v_it != vVisibles.end(); ++v_it)
@@ -239,18 +239,18 @@ void CBinocularsVision::Update()
 
         if (found != m_active_objects.end())
         {
-            (*found)->m_flags.set(flVisObjNotValid, FALSE);
+            (*found)->m_flags.set(flVisObjNotValid, false);
         }
         else
         {
             m_active_objects.push_back(new SBinocVisibleObj());
             SBinocVisibleObj* new_vis_obj = m_active_objects.back();
-            new_vis_obj->m_flags.set(flVisObjNotValid, FALSE);
+            new_vis_obj->m_flags.set(flVisObjNotValid, false);
             new_vis_obj->m_object = object_;
             new_vis_obj->create_default(m_frame_color.get());
             new_vis_obj->m_upd_speed = m_rotating_speed;
 
-            m_sounds.PlaySound("found_snd", Fvector().set(0, 0, 0), NULL, true);
+            m_sounds.PlaySound("found_snd", Fvector().set(0, 0, 0), nullptr, true);
         }
     }
     std::sort(m_active_objects.begin(), m_active_objects.end());
@@ -266,12 +266,12 @@ void CBinocularsVision::Update()
     {
         SBinocVisibleObj* visObj = (*it);
 
-        BOOL bLocked = visObj->m_flags.test(flTargetLocked);
+        const bool bLocked = visObj->m_flags.test(flTargetLocked);
 
         (*it)->Update();
 
         if (bLocked != visObj->m_flags.test(flTargetLocked))
-            m_sounds.PlaySound("catch_snd", Fvector().set(0, 0, 0), NULL, true);
+            m_sounds.PlaySound("catch_snd", Fvector().set(0, 0, 0), nullptr, true);
     }
 }
 

src/xrGame/console_commands_mp.cpp

@@ -1010,6 +1010,7 @@ class CCC_UnBanPlayerByIndex : public IConsole_Command
         }
         else
         {
+            // size_t ????? u32 maybe?
             size_t player_index = 0;
             if (sscanf_s(args_, "%u", &player_index) != 1)
             {

src/xrGame/inventory_item.h

@@ -104,7 +104,7 @@ class CInventoryItem : public CAttachableItem,
     virtual void OnEvent(NET_Packet& P, u16 type);
 
     virtual bool Useful() const; // !!! Переопределить. (см. в Inventory.cpp)
-    virtual bool IsUsingCondition() const { return (m_flags.test(FUsingCondition) > 0); }
+    virtual bool IsUsingCondition() const { return m_flags.test(FUsingCondition); }
     virtual bool Attach(PIItem pIItem, bool b_send_event) { return false; }
     virtual bool Detach(PIItem pIItem) { return false; }
     //при детаче спаунится новая вещь при заданно названии секции

src/xrGame/script_game_object3.cpp

@@ -1427,7 +1427,7 @@ bool CScriptGameObject::IsBoneVisible(pcstr bone_name)
     if (bone_id == BI_NONE)
         return false;
 
-    return k->LL_GetBoneVisible(bone_id) == true ? true : false;
+    return k->LL_GetBoneVisible(bone_id);
 }
 
 float CScriptGameObject::GetLuminocityHemi()

src/xrGame/script_sound.cpp

@@ -27,6 +27,7 @@ CScriptSound::CScriptSound(LPCSTR caSoundName, ESoundTypes sound_type)
 
 CScriptSound::~CScriptSound()
 {
+    // Compiler warning C4297: function assumed not to throw an exception but does.
     THROW3(!m_sound._feedback(), "playing sound is not completed, but is destroying",
         m_sound._handle() ? m_sound._handle()->file_name() : "unknown");
     m_sound.destroy();

src/xrPhysics/PHCharacter.h

@@ -7,7 +7,7 @@
 #include "xrServerEntities/PHSynchronize.h"
 #include "PHDisabling.h"
 
-#include "xrEngine/iphysicsshell.h"
+#include "xrEngine/IPhysicsShell.h"
 
 class IPhysicsShellHolder;
 class IClimableObject;
@@ -19,19 +19,17 @@ class CPHAICharacter;
 namespace ALife
 {
 enum EHitType;
-};
-static enum EEnvironment { peOnGround, peAtWall, peInAir };
+}
+enum EEnvironment { peOnGround, peAtWall, peInAir };
 
 class CPHCharacter :
     public CPHObject,
     public CPHSynchronize,
     public CPHDisablingTranslational,
     public IPhysicsElement
-#if 0
-#ifdef DEBUG
+#if 0//def DEBUG
     ,public pureRender
 #endif
-#endif
 {
 public:
     u64 m_creation_step;