Fixed some PVS-Studio warnings and minor editions

Author: Xottab-DUTY

src/xrGame/CarCameras.cpp

@@ -47,13 +47,9 @@ void CCar::OnCameraChange(int type)
     if (Owner())
     {
         if (type == ectFirst)
-        {
             Owner()->setVisible(FALSE);
-        }
-        else if (active_camera->tag == ectFirst)
-        {
+        else if (active_camera && active_camera->tag == ectFirst)
             Owner()->setVisible(TRUE);
-        }
     }
 
     if (!active_camera || active_camera->tag != type)

src/xrGame/ai/monsters/basemonster/base_monster_script.cpp

@@ -455,8 +455,6 @@ void CBaseMonster::ProcessScripts()
     m_script_state_must_execute = false;
     inherited::ProcessScripts();
 
-    Device.dwTimeGlobal = Device.dwTimeGlobal;
-
     // обновить мир (память, враги, объекты)
     UpdateMemory();
 

src/xrGame/ai/monsters/monster_enemy_memory.cpp

@@ -32,10 +32,8 @@ void CMonsterEnemyMemory::update()
     VERIFY(monster->g_Alive());
 
     CMonsterHitMemory& monster_hit_memory = monster->HitMemory;
-
-    typedef CObjectManager<const CEntityAlive>::OBJECTS objects_list;
-
-    objects_list const& objects = monster->memory().enemy().objects();
+    
+    auto const& objects = monster->memory().enemy().objects();
 
     if (monster_hit_memory.is_hit() && time() < monster_hit_memory.get_last_hit_time() + 1000)
     {
@@ -86,17 +84,18 @@ void CMonsterEnemyMemory::update()
         }
     }
 
-    for (objects_list::const_iterator I = objects.begin(); I != objects.end(); ++I)
+    float const feel_enemy_max_distance = monster->get_feel_enemy_max_distance();
+
+    for (auto I = objects.cbegin(); I != objects.cend(); ++I)
     {
         const CEntityAlive* enemy = *I;
         const bool feel_enemy =
-            monster->Position().distance_to(enemy->Position()) < monster->get_feel_enemy_max_distance();
+            monster->Position().distance_to(enemy->Position()) < feel_enemy_max_distance;
 
         if (feel_enemy || monster->memory().visual().visible_now(*I))
             add_enemy(*I);
     }
 
-    float const feel_enemy_max_distance = monster->get_feel_enemy_max_distance();
     if (g_actor)
     {
         float const xz_dist = monster->Position().distance_to_xz(g_actor->Position());
@@ -129,6 +128,7 @@ void CMonsterEnemyMemory::add_enemy(const CEntityAlive* enemy)
     enemy_info.time = Device.dwTimeGlobal;
     enemy_info.danger = 0.f;
 
+    // XXX: review
     ENEMIES_MAP_IT it = m_objects.find(enemy);
     if (it != m_objects.end())
     {
@@ -185,18 +185,18 @@ void CMonsterEnemyMemory::remove_non_actual()
 
 const CEntityAlive* CMonsterEnemyMemory::get_enemy()
 {
-    ENEMIES_MAP_IT it = find_best_enemy();
+    const auto it = find_best_enemy();
     if (it != m_objects.end())
         return it->first;
-    return (0);
+    return nullptr;
 }
 
 SMonsterEnemy CMonsterEnemyMemory::get_enemy_info()
 {
     SMonsterEnemy ret_val;
     ret_val.time = 0;
 
-    ENEMIES_MAP_IT it = find_best_enemy();
+    const auto it = find_best_enemy();
     if (it != m_objects.end())
         ret_val = it->second;
 
@@ -241,9 +241,7 @@ ENEMIES_MAP_IT CMonsterEnemyMemory::find_best_enemy()
 void CMonsterEnemyMemory::remove_links(IGameObject* O)
 {
     if (monster)
-    {
         monster->EnemyMan.remove_links(O);
-    }
 
     for (ENEMIES_MAP_IT I = m_objects.begin(); I != m_objects.end(); ++I)
     {

src/xrGame/detail_path_manager_smooth.cpp

@@ -752,6 +752,8 @@ void CDetailPathManager::postprocess_key_points(const xr_vector<u32>& level_path
             compute_better_key_point(m_key_points[i - 1], m_key_points[i], m_key_points[i + 1], false);
         STravelPoint key_point1 =
             compute_better_key_point(m_key_points[i + 1], m_key_points[i], m_key_points[i - 1], true);
+
+        // XXX: check out what is this
         {
             u32 vertex_id = ai().level_graph().check_position_in_direction(
                 m_key_points[i - 1].vertex_id, m_key_points[i - 1].position, key_point0.position);

src/xrGame/ui/UIGameTutorialSimpleItem.cpp

@@ -250,6 +250,12 @@ void CUISequenceSimpleItem::Start()
         bool bShowPda = false;
         CUIGameSP* ui_game_sp = smart_cast<CUIGameSP*>(CurrentGameUI());
 
+        if (!ui_game_sp)
+        {
+            Msg("!%s:: failed to get ui_game_sp", __FUNCTION__);
+            return;
+        }
+
         if (!xr_stricmp(m_pda_section, "pda_tasks"))
         {
             ui_game_sp->GetPdaMenu().SetActiveSubdialog("eptTasks");
@@ -271,13 +277,8 @@ void CUISequenceSimpleItem::Start()
             bShowPda = true;
         }
 
-        if (ui_game_sp)
-        {
-            if ((!ui_game_sp->GetPdaMenu().IsShown() && bShowPda) || (ui_game_sp->GetPdaMenu().IsShown() && !bShowPda))
-            {
-                ui_game_sp->GetPdaMenu().HideDialog();
-            }
-        }
+        if ((!ui_game_sp->GetPdaMenu().IsShown() && bShowPda) || (ui_game_sp->GetPdaMenu().IsShown() && !bShowPda))
+            ui_game_sp->GetPdaMenu().HideDialog();
     }
 }
 

src/xrGame/ui/UILines.cpp

@@ -454,9 +454,9 @@ u32 CUILines::GetColorFromText(const xr_string& str) const
     }
 
     // try parse values separated by commas
-    comma1_pos = str.find(",", begin);
-    comma2_pos = str.find(",", comma1_pos + 1);
-    comma3_pos = str.find(",", comma2_pos + 1);
+    comma1_pos = str.find(',', begin);
+    comma2_pos = str.find(',', comma1_pos + 1);
+    comma3_pos = str.find(',', comma2_pos + 1);
     if (comma1_pos == npos || comma2_pos == npos || comma3_pos == npos)
         return m_dwTextColor;
 

src/xrGame/ui/UIMessageBox.cpp

@@ -390,7 +390,7 @@ LPCSTR CUIMessageBox::GetHost()
     {
         m_ret_val.clear();
         xr_string tmp = m_UIEditHost->GetText();
-        xr_string::size_type pos = tmp.find(":");
+        xr_string::size_type pos = tmp.find(':');
 
         if (xr_string::npos != pos)
         {