Correct files to comply with xr_ini

src/Layers/xrRender/ModelPool.cpp

@@ -396,7 +396,7 @@ void CModelPool::Prefetch()
     string256 section;
     strconcat(sizeof(section), section, "prefetch_visuals_", g_pGamePersistent->m_game_params.m_game_type);
     CInifile::Sect& sect = pSettings->r_section(section);
-    for (CInifile::SectCIt I = sect.Data.begin(); I != sect.Data.end(); I++)
+    for (auto I = sect.Data.cbegin(); I != sect.Data.cend(); I++)
     {
         const CInifile::Item& item = *I;
         dxRender_Visual* V = Create(item.first.c_str());

src/Layers/xrRender/Texture.cpp

@@ -30,11 +30,11 @@ bool is_enough_address_space_available() { return true; }
 int get_texture_load_lod(LPCSTR fn)
 {
     CInifile::Sect& sect = pSettings->r_section("reduce_lod_texture_list");
-    CInifile::SectCIt it_ = sect.Data.begin();
-    CInifile::SectCIt it_e_ = sect.Data.end();
+    auto it_ = sect.Data.cbegin();
+    auto it_e_ = sect.Data.cend();
 
-    CInifile::SectCIt it = it_;
-    CInifile::SectCIt it_e = it_e_;
+    auto it = it_;
+    auto it_e = it_e_;
 
     static bool enough_address_space_available = is_enough_address_space_available();
 

src/Layers/xrRenderDX10/dx10Texture.cpp

@@ -21,14 +21,14 @@ void fix_texture_name(LPSTR fn)
 int get_texture_load_lod(LPCSTR fn)
 {
     CInifile::Sect& sect = pSettings->r_section("reduce_lod_texture_list");
-    CInifile::SectCIt it_ = sect.Data.begin();
-    CInifile::SectCIt it_e_ = sect.Data.end();
+    auto it_ = sect.Data.cbegin();
+    auto it_e_ = sect.Data.cend();
 
     ENGINE_API bool is_enough_address_space_available();
     static bool enough_address_space_available = is_enough_address_space_available();
 
-    CInifile::SectCIt it = it_;
-    CInifile::SectCIt it_e = it_e_;
+    auto it = it_;
+    auto it_e = it_e_;
 
     for (; it != it_e; ++it)
     {

src/utils/mp_configs_verifyer/configs_dump_verifyer.cpp

@@ -37,7 +37,7 @@ static char* search_info_section(u8* buffer, u32 buffer_size)
         --rbegin;
         --r_size;
     } while (r_size > 0);
-    return NULL;
+    return nullptr;
 }
 
 bool const configs_verifyer::verify_dsign(u8* data, u32 data_size, sha_checksum_t& sha_checksum)
@@ -64,7 +64,7 @@ bool const configs_verifyer::verify_dsign(u8* data, u32 data_size, sha_checksum_
     u32 dst_size = static_cast<u32>((data + data_size) - (u8*)dst_buffer);
     u32 src_data_size = data_size - dst_size;
 
-    LPCSTR add_str = NULL;
+    LPCSTR add_str = nullptr;
     STRCONCAT(add_str, tmp_ini.r_string(cd_info_secion, cd_player_name_key),
         tmp_ini.r_string(cd_info_secion, cd_player_digest_key), tmp_ini.r_string(cd_info_secion, cd_creation_date));
 
@@ -84,14 +84,14 @@ bool const configs_verifyer::verify_dsign(u8* data, u32 data_size, sha_checksum_
 
 LPCSTR configs_verifyer::get_section_diff(CInifile::Sect* sect_ptr, CInifile& active_params, string256& dst_diff)
 {
-    LPCSTR diff_str = NULL;
+    pcstr diff_str = nullptr;
     bool tmp_active_param = false;
     if (!strncmp(sect_ptr->Name.c_str(), "ap_", 3))
     {
         tmp_active_param = true;
     }
 
-    for (CInifile::SectCIt cit = sect_ptr->Data.begin(), ciet = sect_ptr->Data.end(); cit != ciet; ++cit)
+    for (auto cit = sect_ptr->Data.cbegin(), ciet = sect_ptr->Data.cend(); cit != ciet; ++cit)
     {
         shared_str const& tmp_value = cit->second;
         shared_str real_value;
@@ -102,7 +102,7 @@ LPCSTR configs_verifyer::get_section_diff(CInifile::Sect* sect_ptr, CInifile& ac
                 real_value = active_params.r_string(sect_ptr->Name.c_str(), cit->first.c_str());
                 if (tmp_value != real_value)
                 {
-                    LPCSTR tmp_key_str = NULL;
+                    pcstr tmp_key_str = nullptr;
                     STRCONCAT(tmp_key_str, sect_ptr->Name.c_str(), "::", cit->first.c_str());
                     STRCONCAT(diff_str, tmp_key_str, " = ", tmp_value.c_str(), ",right = ", real_value.c_str());
                     strncpy_s(dst_diff, diff_str, sizeof(dst_diff) - 1);
@@ -122,21 +122,21 @@ LPCSTR configs_verifyer::get_section_diff(CInifile::Sect* sect_ptr, CInifile& ac
         real_value = pSettings->r_string(sect_ptr->Name.c_str(), cit->first.c_str());
         if (tmp_value != real_value)
         {
-            LPCSTR tmp_key_str = NULL;
+            pcstr tmp_key_str = nullptr;
             STRCONCAT(tmp_key_str, sect_ptr->Name.c_str(), "::", cit->first.c_str());
             STRCONCAT(diff_str, tmp_key_str, " = ", tmp_value.c_str(), ",right = ", real_value.c_str());
             strncpy_s(dst_diff, diff_str, sizeof(dst_diff) - 1);
             dst_diff[sizeof(dst_diff) - 1] = 0;
             return dst_diff;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 LPCSTR configs_verifyer::get_diff(CInifile& received, CInifile& active_params, string256& dst_diff)
 {
-    LPCSTR diff_str = NULL;
-    for (CInifile::RootIt sit = received.sections().begin(), siet = received.sections().end(); sit != siet; ++sit)
+    pcstr diff_str = nullptr;
+    for (auto sit = received.sections().begin(), siet = received.sections().end(); sit != siet; ++sit)
     {
         CInifile::Sect* tmp_sect = *sit;
         if (tmp_sect->Name == cd_info_secion)
@@ -163,7 +163,7 @@ bool const configs_verifyer::verify(u8* data, u32 data_size, string256& diff)
     }
     IReader tmp_reader(data, data_size);
     CInifile tmp_ini(&tmp_reader);
-    CInifile tmp_active_params(NULL, FALSE, FALSE, FALSE);
+    CInifile tmp_active_params(nullptr, FALSE, FALSE, FALSE);
 
     string16 tmp_digit;
     u32 ap_index = 1;
@@ -189,7 +189,7 @@ bool const configs_verifyer::verify(u8* data, u32 data_size, string256& diff)
         return false;
     }
 
-    LPCSTR add_str = NULL;
+    LPCSTR add_str = nullptr;
     STRCONCAT(add_str, tmp_ini.r_string(cd_info_secion, cd_player_name_key),
         tmp_ini.r_string(cd_info_secion, cd_player_digest_key), tmp_ini.r_string(cd_info_secion, cd_creation_date));
 

src/utils/xrCompress/xrCompress.cpp

@@ -353,8 +353,8 @@ void xrCompressor::OpenPack(LPCSTR tgt_folder, int num)
     {
         CMemoryWriter W;
         CInifile::Sect& S = config_ltx->r_section("header");
-        CInifile::SectCIt it = S.Data.begin();
-        CInifile::SectCIt it_e = S.Data.end();
+        auto it = S.Data.cbegin();
+        auto it_e = S.Data.cend();
         string4096 buff;
         xr_sprintf(buff, "[%s]", S.Name.c_str());
         W.w_string(buff);
@@ -507,9 +507,9 @@ bool xrCompressor::IsFolderAccepted(CInifile& ltx, LPCSTR path, BOOL& recurse)
     if (ltx.section_exist("exclude_folders"))
     {
         CInifile::Sect& ef_sect = ltx.r_section("exclude_folders");
-        for (CInifile::SectCIt ef_it = ef_sect.Data.begin(); ef_it != ef_sect.Data.end(); ef_it++)
+        for (auto ef_it = ef_sect.Data.cbegin(); ef_it != ef_sect.Data.cend(); ef_it++)
         {
-            recurse = CInifile::IsBOOL(ef_it->second.c_str());
+            recurse = CInifile::isBool(ef_it->second.c_str());
             if (recurse)
             {
                 if (path == strstr(path, ef_it->first.c_str()))
@@ -539,9 +539,9 @@ void xrCompressor::ProcessLTX(CInifile& ltx)
     {
         CInifile::Sect& if_sect = ltx.r_section("include_folders");
 
-        for (CInifile::SectCIt if_it = if_sect.Data.begin(); if_it != if_sect.Data.end(); ++if_it)
+        for (auto if_it = if_sect.Data.cbegin(); if_it != if_sect.Data.cend(); ++if_it)
         {
-            BOOL ifRecurse = CInifile::IsBOOL(if_it->second.c_str());
+            BOOL ifRecurse = CInifile::isBool(if_it->second.c_str());
             u32 folder_mask = FS_ListFolders | (ifRecurse ? 0 : FS_RootOnly);
 
             string_path path;
@@ -598,7 +598,7 @@ void xrCompressor::ProcessLTX(CInifile& ltx)
     if (ltx.section_exist("include_files"))
     {
         CInifile::Sect& if_sect = ltx.r_section("include_files");
-        for (CInifile::SectCIt if_it = if_sect.Data.begin(); if_it != if_sect.Data.end(); ++if_it)
+        for (auto if_it = if_sect.Data.cbegin(); if_it != if_sect.Data.cend(); ++if_it)
         {
             files_list->push_back(xr_strdup(if_it->first.c_str()));
         }

src/xrCore/Animation/SkeletonMotions.cpp

@@ -43,8 +43,8 @@ void CPartition::load(IKinematics* V, LPCSTR model_name)
         xr_sprintf(buff, sizeof(buff), "part_%d", i);
 
         CInifile::Sect S = ini.r_section(buff);
-        CInifile::SectCIt it = S.Data.begin();
-        CInifile::SectCIt it_e = S.Data.end();
+        auto it = S.Data.cbegin();
+        auto it_e = S.Data.cend();
         if (S.Data.size())
         {
             P[i].bones.clear_not_free();

src/xrCore/LocatorAPI.cpp

@@ -729,11 +729,11 @@ void CLocatorAPI::_initialize(u32 flags, pcstr target_folder, pcstr fs_name)
             u32 fl = 0;
             _GetItem(temp, 0, b_v, _delimiter);
 
-            if (CInifile::IsBOOL(b_v))
+            if (CInifile::isBool(b_v))
                 fl |= FS_Path::flRecurse;
 
             _GetItem(temp, 1, b_v, _delimiter);
-            if (CInifile::IsBOOL(b_v))
+            if (CInifile::isBool(b_v))
                 fl |= FS_Path::flNotif;
 
             _GetItem(temp, 2, root, _delimiter);

src/xrEngine/IGame_ObjectPool.cpp

@@ -18,9 +18,8 @@ void IGame_ObjectPool::prefetch()
     // prefetch objects
     strconcat(sizeof(section), section, "prefetch_objects_", g_pGamePersistent->m_game_params.m_game_type);
     CInifile::Sect const& sect = pSettings->r_section(section);
-    for (CInifile::SectCIt I = sect.Data.begin(); I != sect.Data.end(); I++)
+    for (const auto& item : sect.Data)
     {
-        const CInifile::Item& item = *I;
         CLASS_ID CLS = pSettings->r_clsid(item.first.c_str(), "class");
         p_count++;
         IGameObject* pObject = smart_cast<IGameObject*>(NEW_INSTANCE(CLS));

src/xrEngine/xr_efflensflare.cpp

@@ -100,7 +100,7 @@ void CLensFlareDescriptor::load(CInifile* pIni, LPCSTR sect)
             AddFlare(r, o, p, name, S);
         }
     }
-    m_Flags.set(flGradient, CInifile::IsBOOL(pIni->r_string(sect, "gradient")));
+    m_Flags.set(flGradient, CInifile::isBool(pIni->r_string(sect, "gradient")));
     if (m_Flags.is(flGradient))
     {
         LPCSTR S = pIni->r_string(sect, "gradient_shader");

src/xrGame/ActorHelmet.cpp

@@ -156,7 +156,7 @@ bool CHelmet::install_upgrade_impl(LPCSTR section, bool test)
     result |= process_if_exists(
         section, "telepatic_protection", &CInifile::r_float, m_HitTypeProtection[ALife::eHitTypeTelepatic], test);
     result |= process_if_exists(section, "chemical_burn_protection", &CInifile::r_float,
-        m_HitTypeProtection[ALife::eHitTypeChemicalBurn], test);
+                                m_HitTypeProtection[ALife::eHitTypeChemicalBurn], test);
     result |= process_if_exists(
         section, "explosion_protection", &CInifile::r_float, m_HitTypeProtection[ALife::eHitTypeExplosion], test);
     result |= process_if_exists(

src/xrGame/BoneProtections.cpp

@@ -43,15 +43,15 @@ void SBoneProtections::reload(const shared_str& bone_sect, IKinematics* kinemati
     m_default.BonePassBullet = FALSE;
 
     CInifile::Sect& protections = pSettings->r_section(bone_sect);
-    for (CInifile::SectCIt i = protections.Data.begin(); protections.Data.end() != i; ++i)
+    for (auto i = protections.Data.cbegin(); protections.Data.cend() != i; ++i)
     {
         string256 buffer;
 
         BoneProtection BP;
 
         BP.koeff = (float)atof(_GetItem(i->second.c_str(), 0, buffer));
         BP.armor = (float)atof(_GetItem(i->second.c_str(), 1, buffer));
-        BP.BonePassBullet = (BOOL)(atof(_GetItem(i->second.c_str(), 2, buffer)) > 0.5f);
+        BP.BonePassBullet = (bool)(atof(_GetItem(i->second.c_str(), 2, buffer)) > 0.5f);
 
         if (!xr_strcmp(i->first.c_str(), "default"))
         {
@@ -78,7 +78,7 @@ void SBoneProtections::add(const shared_str& bone_sect, IKinematics* kinematics)
     m_fHitFracNpc += READ_IF_EXISTS(pSettings, r_float, bone_sect.c_str(), "hit_fraction_npc", 0.0f);
 
     CInifile::Sect& protections = pSettings->r_section(bone_sect);
-    for (CInifile::SectCIt i = protections.Data.begin(); protections.Data.end() != i; ++i)
+    for (auto i = protections.Data.cbegin(); protections.Data.cend() != i; ++i)
     {
         if (!xr_strcmp(i->first.c_str(), "hit_fraction"))
             continue;

src/xrGame/Car.cpp

@@ -941,7 +941,7 @@ void CCar::Init()
     if (ini->section_exist("damage_items"))
     {
         CInifile::Sect& data = ini->r_section("damage_items");
-        for (CInifile::SectCIt I = data.Data.begin(); I != data.Data.end(); I++)
+        for (auto I = data.Data.cbegin(); I != data.Data.cend(); I++)
         {
             const CInifile::Item& item = *I;
             u16 index = pKinematics->LL_BoneID(*item.first);

src/xrGame/CustomOutfit.cpp

@@ -287,7 +287,7 @@ bool CCustomOutfit::install_upgrade_impl(LPCSTR section, bool test)
     result |= process_if_exists(
         section, "telepatic_protection", &CInifile::r_float, m_HitTypeProtection[ALife::eHitTypeTelepatic], test);
     result |= process_if_exists(section, "chemical_burn_protection", &CInifile::r_float,
-        m_HitTypeProtection[ALife::eHitTypeChemicalBurn], test);
+                                m_HitTypeProtection[ALife::eHitTypeChemicalBurn], test);
     result |= process_if_exists(
         section, "explosion_protection", &CInifile::r_float, m_HitTypeProtection[ALife::eHitTypeExplosion], test);
     result |= process_if_exists(

src/xrGame/Level_load.cpp

@@ -106,7 +106,7 @@ bool CLevel::Load_GameSpecific_After()
         {
             CInifile::Sect& S = pSettings->r_section("sounds_random");
             Sounds_Random.reserve(S.Data.size());
-            for (CInifile::SectCIt I = S.Data.begin(); S.Data.end() != I; ++I)
+            for (auto I = S.Data.cbegin(); S.Data.cend() != I; ++I)
             {
                 Sounds_Random.push_back(ref_sound());
                 Sound->create(Sounds_Random.back(), *I->first, st_Effect, sg_SourceType);

src/xrGame/PHCollisionDamageReceiver.cpp

@@ -21,7 +21,7 @@ void CPHCollisionDamageReceiver::Init()
     if (ini->section_exist("collision_damage"))
     {
         CInifile::Sect& data = ini->r_section("collision_damage");
-        for (CInifile::SectCIt I = data.Data.begin(); I != data.Data.end(); I++)
+        for (auto I = data.Data.cbegin(); I != data.Data.cend(); I++)
         {
             const CInifile::Item& item = *I;
             u16 index = K->LL_BoneID(*item.first);

src/xrGame/PHDestroyable.cpp

@@ -43,7 +43,7 @@ av_transition_factor   =1       ; коэффициент передачи угл
 CPHDestroyable::CPHDestroyable()
 {
     m_flags.flags = 0;
-    m_flags.set(fl_released, TRUE);
+    m_flags.set(fl_released, true);
     m_depended_objects = 0;
 }
 /////////spawn object representing destroyed
@@ -145,7 +145,7 @@ void CPHDestroyable::Destroy(u16 source_id /*=u16(-1)*/, LPCSTR section /*="ph_s
     obj->processing_activate();
     if (source_id == obj->ID())
     {
-        m_flags.set(fl_released, FALSE);
+        m_flags.set(fl_released, false);
     }
     xr_vector<shared_str>::iterator i = m_destroyed_obj_visual_names.begin(), e = m_destroyed_obj_visual_names.end();
 
@@ -155,44 +155,43 @@ void CPHDestroyable::Destroy(u16 source_id /*=u16(-1)*/, LPCSTR section /*="ph_s
             GenSpawnReplace(source_id, section, *i);
     };
     ///////////////////////////////////////////////////////////////////////////
-    m_flags.set(fl_destroyed, TRUE);
-    return;
+    m_flags.set(fl_destroyed, true);
 }
 
 void CPHDestroyable::Load(CInifile* ini, LPCSTR section)
 {
-    m_flags.set(fl_destroyable, FALSE);
+    m_flags.set(fl_destroyable, false);
     if (ini->line_exist(section, "destroyed_vis_name"))
     {
-        m_flags.set(fl_destroyable, TRUE);
+        m_flags.set(fl_destroyable, true);
         m_destroyed_obj_visual_names.push_back(ini->r_string(section, "destroyed_vis_name"));
     }
     else
     {
         CInifile::Sect& data = ini->r_section(section);
         if (data.Data.size() > 0)
-            m_flags.set(fl_destroyable, TRUE);
-        for (CInifile::SectCIt I = data.Data.begin(); I != data.Data.end(); I++)
+            m_flags.set(fl_destroyable, true);
+        for (auto I = data.Data.cbegin(); I != data.Data.cend(); I++)
             if (I->first.size())
                 m_destroyed_obj_visual_names.push_back(I->first);
     }
 }
 void CPHDestroyable::Load(LPCSTR section)
 {
-    m_flags.set(fl_destroyable, FALSE);
+    m_flags.set(fl_destroyable, false);
 
     if (pSettings->line_exist(section, "destroyed_vis_name"))
     {
-        m_flags.set(fl_destroyable, TRUE);
+        m_flags.set(fl_destroyable, true);
         m_destroyed_obj_visual_names.push_back(pSettings->r_string(section, "destroyed_vis_name"));
     }
 }
 
 void CPHDestroyable::Init() { m_depended_objects = 0; }
 void CPHDestroyable::RespawnInit()
 {
-    m_flags.set(fl_destroyed, FALSE);
-    m_flags.set(fl_released, TRUE);
+    m_flags.set(fl_destroyed, false);
+    m_flags.set(fl_released, true);
     m_destroyed_obj_visual_names.clear();
     m_notificate_objects.clear();
     m_depended_objects = 0;
@@ -349,7 +348,7 @@ void CPHDestroyable::NotificateDestroy(CPHDestroyableNotificate* dn)
             NotificatePart(*i);
         PhysicallyRemoveSelf();
         m_notificate_objects.clear();
-        m_flags.set(fl_released, TRUE);
+        m_flags.set(fl_released, true);
     }
 }
 

src/xrGame/ParticlesPlayer.cpp

@@ -82,7 +82,7 @@ void CParticlesPlayer::LoadParticles(IKinematics* K)
     {
         bone_mask = 0;
         CInifile::Sect& data = ini->r_section("particle_bones");
-        for (CInifile::SectCIt I = data.Data.begin(); I != data.Data.end(); I++)
+        for (auto I = data.Data.cbegin(); I != data.Data.cend(); I++)
         {
             const CInifile::Item& item = *I;
             u16 index = K->LL_BoneID(*item.first);

src/xrGame/ShootingObject.h

@@ -175,7 +175,7 @@ class CShootingObject : public IAnticheatDumpable
     Fvector vLoadedShellPoint;
     float m_fPredBulletTime;
     float m_fTimeToAim;
-    BOOL m_bUseAimBullet;
+    bool m_bUseAimBullet;
 
 protected:
     //имя пратиклов для огня