xrGame/Actor.cpp: use range-based for instead of iterators

Xottab-DUTY · Xottab-DUTY · commit 21686b866683 · 2017-12-19T23:35:13.000+05:00
* use auto types
* code formatting
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -785,27 +785,26 @@ void CActor::Die(IGameObject* who)
         if (!IsGameTypeSingle())
         {
             // if we are on server and actor has PDA - destroy PDA
-            TIItemContainer& l_rlist = inventory().m_ruck;
-            for (TIItemContainer::iterator l_it = l_rlist.begin(); l_rlist.end() != l_it; ++l_it)
+            for (auto& l_it : inventory().m_ruck)
             {
                 if (GameID() == eGameIDArtefactHunt)
                 {
-                    CArtefact* pArtefact = smart_cast<CArtefact*>(*l_it);
+                    auto pArtefact = smart_cast<CArtefact*>(l_it);
                     if (pArtefact)
                     {
-                        (*l_it)->SetDropManual(TRUE);
+                        l_it->SetDropManual(true);
                         continue;
-                    };
-                };
+                    }
+                }
 
-                if ((*l_it)->object().CLS_ID == CLSID_OBJECT_PLAYERS_BAG)
+                if (l_it->object().CLS_ID == CLSID_OBJECT_PLAYERS_BAG)
                 {
-                    (*l_it)->SetDropManual(TRUE);
+                    l_it->SetDropManual(true);
                     continue;
-                };
-            };
-        };
-    };
+                }
+            }
+        }
+    }
 
     if (!GEnv.isDedicatedServer)
     {
@@ -958,13 +957,14 @@ void CActor::UpdateCL()
 
     if (m_feel_touch_characters > 0)
     {
-        for (xr_vector<IGameObject*>::iterator it = feel_touch.begin(); it != feel_touch.end(); it++)
+        for (auto& it : feel_touch)
         {
-            CPhysicsShellHolder* sh = smart_cast<CPhysicsShellHolder*>(*it);
-            if (sh && sh->character_physics_support())
+            auto sh = smart_cast<CPhysicsShellHolder*>(it);
+            if (sh)
             {
-                sh->character_physics_support()->movement()->UpdateObjectBox(
-                    character_physics_support()->movement()->PHCharacter());
+                auto shcps = sh->character_physics_support();
+                if (shcps)
+                    shcps->movement()->UpdateObjectBox(shcps->movement()->PHCharacter());
             }
         }
     }
@@ -1705,12 +1705,9 @@ void CActor::OnItemDropUpdate()
 {
     CInventoryOwner::OnItemDropUpdate();
 
-    TIItemContainer::iterator I = inventory().m_all.begin();
-    TIItemContainer::iterator E = inventory().m_all.end();
-
-    for (; I != E; ++I)
-        if (!(*I)->IsInvalid() && !attached(*I))
-            attach(*I);
+    for (auto& it : inventory().m_all)
+        if (it->IsInvalid() && !attached(it))
+            attach(it);
 }
 
 void CActor::OnItemRuck(CInventoryItem* inventory_item, const SInvItemPlace& previous_place)
@@ -1742,9 +1739,9 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()
         update_time = 0.0f;
     }
 
-    for (TIItemContainer::iterator it = inventory().m_belt.begin(); inventory().m_belt.end() != it; ++it)
+    for (auto& it : inventory().m_belt)
     {
-        CArtefact* artefact = smart_cast<CArtefact*>(*it);
+        const auto artefact = smart_cast<CArtefact*>(it);
         if (artefact)
         {
             conditions().ChangeBleeding(artefact->m_fBleedingRestoreSpeed * f_update_time);
@@ -1761,6 +1758,7 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()
                 conditions().ChangeRadiation(artefact->m_fRadiationRestoreSpeed * f_update_time);
         }
     }
+
     CCustomOutfit* outfit = GetOutfit();
     if (outfit)
     {
@@ -1786,15 +1784,11 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()
 
 float CActor::HitArtefactsOnBelt(float hit_power, ALife::EHitType hit_type)
 {
-    TIItemContainer::iterator it = inventory().m_belt.begin();
-    TIItemContainer::iterator ite = inventory().m_belt.end();
-    for (; it != ite; ++it)
+    for (auto& it : inventory().m_belt)
     {
-        CArtefact* artefact = smart_cast<CArtefact*>(*it);
+        const auto artefact = smart_cast<CArtefact*>(it);
         if (artefact)
-        {
             hit_power -= artefact->m_ArtefactHitImmunities.AffectHit(1.0f, hit_type);
-        }
     }
     clamp(hit_power, 0.0f, flt_max);
 
@@ -1804,15 +1798,11 @@ float CActor::HitArtefactsOnBelt(float hit_power, ALife::EHitType hit_type)
 float CActor::GetProtection_ArtefactsOnBelt(ALife::EHitType hit_type)
 {
     float sum = 0.0f;
-    TIItemContainer::iterator it = inventory().m_belt.begin();
-    TIItemContainer::iterator ite = inventory().m_belt.end();
-    for (; it != ite; ++it)
+    for (auto& it : inventory().m_belt)
     {
-        CArtefact* artefact = smart_cast<CArtefact*>(*it);
+        const auto artefact = smart_cast<CArtefact*>(it);
         if (artefact)
-        {
             sum += artefact->m_ArtefactHitImmunities.AffectHit(1.0f, hit_type);
-        }
     }
     return sum;
 }
@@ -1917,7 +1907,7 @@ bool CActor::can_attach(const CInventoryItem* inventory_item) const
         std::find(m_attach_item_sections.begin(), m_attach_item_sections.end(), inventory_item->object().cNameSect()))
         return false;
 
-    //если уже есть присоединненый объет такого типа
+    //если уже есть присоединённый объект такого типа
     if (attached(inventory_item->object().cNameSect()))
         return false;
 
@@ -1928,7 +1918,7 @@ void CActor::OnDifficultyChanged()
 {
     // immunities
     VERIFY(g_SingleGameDifficulty >= egdNovice && g_SingleGameDifficulty <= egdMaster);
-    LPCSTR diff_name = get_token_name(difficulty_type_token, g_SingleGameDifficulty);
+    pcstr diff_name = get_token_name(difficulty_type_token, g_SingleGameDifficulty);
     string128 tmp;
     strconcat(sizeof(tmp), tmp, "actor_immunities_", diff_name);
     conditions().LoadImmunities(tmp, pSettings);
@@ -1940,7 +1930,7 @@ void CActor::OnDifficultyChanged()
     conditions().LoadTwoHitsDeathParams(tmp);
 }
 
-CVisualMemoryManager* CActor::visual_memory() const { return (&memory().visual()); }
+CVisualMemoryManager* CActor::visual_memory() const { return &memory().visual(); }
 float CActor::GetMass()
 {
     return g_Alive() ? character_physics_support()->movement()->GetMass() :
@@ -1949,12 +1939,12 @@ float CActor::GetMass()
 
 bool CActor::is_on_ground()
 {
-    return (character_physics_support()->movement()->Environment() != CPHMovementControl::peInAir);
+    return character_physics_support()->movement()->Environment() != CPHMovementControl::peInAir;
 }
 
 bool CActor::is_ai_obstacle() const
 {
-    return (false); // true);
+    return false; // true);
 }
 
 float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)
@@ -1965,80 +1955,64 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)
     case ALife::eHealthRestoreSpeed:
     {
         res = conditions().change_v().m_fV_HealthRestore;
-        res += conditions().V_SatietyHealth() * ((conditions().GetSatiety() > 0.0f) ? 1.0f : -1.0f);
+        res += conditions().V_SatietyHealth() * (conditions().GetSatiety() > 0.0f ? 1.0f : -1.0f);
 
-        TIItemContainer::iterator itb = inventory().m_belt.begin();
-        TIItemContainer::iterator ite = inventory().m_belt.end();
-        for (; itb != ite; ++itb)
+        for (auto& it : inventory().m_belt)
         {
-            CArtefact* artefact = smart_cast<CArtefact*>(*itb);
+            const auto artefact = smart_cast<CArtefact*>(it);
             if (artefact)
-            {
                 res += artefact->m_fHealthRestoreSpeed;
-            }
         }
-        CCustomOutfit* outfit = GetOutfit();
+
+        const auto outfit = GetOutfit();
         if (outfit)
-        {
             res += outfit->m_fHealthRestoreSpeed;
-        }
+
         break;
     }
     case ALife::eRadiationRestoreSpeed:
     {
-        TIItemContainer::iterator itb = inventory().m_belt.begin();
-        TIItemContainer::iterator ite = inventory().m_belt.end();
-        for (; itb != ite; ++itb)
+        for (auto& it : inventory().m_belt)
         {
-            CArtefact* artefact = smart_cast<CArtefact*>(*itb);
+            const auto artefact = smart_cast<CArtefact*>(it);
             if (artefact)
-            {
                 res += artefact->m_fRadiationRestoreSpeed;
-            }
         }
-        CCustomOutfit* outfit = GetOutfit();
+
+        const auto outfit = GetOutfit();
         if (outfit)
-        {
             res += outfit->m_fRadiationRestoreSpeed;
-        }
+
         break;
     }
     case ALife::eSatietyRestoreSpeed:
     {
         res = conditions().V_Satiety();
 
-        TIItemContainer::iterator itb = inventory().m_belt.begin();
-        TIItemContainer::iterator ite = inventory().m_belt.end();
-        for (; itb != ite; ++itb)
+        for (auto& it : inventory().m_belt)
         {
-            CArtefact* artefact = smart_cast<CArtefact*>(*itb);
+            const auto artefact = smart_cast<CArtefact*>(it);
             if (artefact)
-            {
                 res += artefact->m_fSatietyRestoreSpeed;
-            }
         }
-        CCustomOutfit* outfit = GetOutfit();
+
+        const auto outfit = GetOutfit();
         if (outfit)
-        {
             res += outfit->m_fSatietyRestoreSpeed;
-        }
+
         break;
     }
     case ALife::ePowerRestoreSpeed:
     {
         res = conditions().GetSatietyPower();
 
-        TIItemContainer::iterator itb = inventory().m_belt.begin();
-        TIItemContainer::iterator ite = inventory().m_belt.end();
-        for (; itb != ite; ++itb)
+        for (auto& it : inventory().m_belt)
         {
-            CArtefact* artefact = smart_cast<CArtefact*>(*itb);
+            const auto artefact = smart_cast<CArtefact*>(it);
             if (artefact)
-            {
                 res += artefact->m_fPowerRestoreSpeed;
-            }
         }
-        CCustomOutfit* outfit = GetOutfit();
+        auto outfit = GetOutfit();
         if (outfit)
         {
             res += outfit->m_fPowerRestoreSpeed;
@@ -2047,27 +2021,24 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)
         }
         else
             res /= 0.5f;
+
         break;
     }
     case ALife::eBleedingRestoreSpeed:
     {
         res = conditions().change_v().m_fV_WoundIncarnation;
 
-        TIItemContainer::iterator itb = inventory().m_belt.begin();
-        TIItemContainer::iterator ite = inventory().m_belt.end();
-        for (; itb != ite; ++itb)
+        for (auto& it : inventory().m_belt)
         {
-            CArtefact* artefact = smart_cast<CArtefact*>(*itb);
+            const auto artefact = smart_cast<CArtefact*>(it);
             if (artefact)
-            {
                 res += artefact->m_fBleedingRestoreSpeed;
-            }
         }
-        CCustomOutfit* outfit = GetOutfit();
+
+        const auto outfit = GetOutfit();
         if (outfit)
-        {
             res += outfit->m_fBleedingRestoreSpeed;
-        }
+
         break;
     }
     } // switch
@@ -2077,7 +2048,7 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)
 
 void CActor::On_SetEntity()
 {
-    CCustomOutfit* pOutfit = GetOutfit();
+    auto pOutfit = GetOutfit();
     if (!pOutfit)
         g_player_hud->load_default();
     else

Original file line number	Diff line number	Diff line change
`@@ -785,27 +785,26 @@ void CActor::Die(IGameObject* who)`
`785`	`785`	`if (!IsGameTypeSingle())`
`786`	`786`	`{`
`787`	`787`	`// if we are on server and actor has PDA - destroy PDA`
`788`		`- TIItemContainer& l_rlist = inventory().m_ruck;`
`789`		`- for (TIItemContainer::iterator l_it = l_rlist.begin(); l_rlist.end() != l_it; ++l_it)`
	`788`	`+ for (auto& l_it : inventory().m_ruck)`
`790`	`789`	`{`
`791`	`790`	`if (GameID() == eGameIDArtefactHunt)`
`792`	`791`	`{`
`793`		`- CArtefact* pArtefact = smart_cast<CArtefact>(l_it);`
	`792`	`+ auto pArtefact = smart_cast<CArtefact*>(l_it);`
`794`	`793`	`if (pArtefact)`
`795`	`794`	`{`
`796`		`- (*l_it)->SetDropManual(TRUE);`
	`795`	`+ l_it->SetDropManual(true);`
`797`	`796`	`continue;`
`798`		`- };`
`799`		`- };`
	`797`	`+ }`
	`798`	`+ }`
`800`	`799`
`801`		`- if ((*l_it)->object().CLS_ID == CLSID_OBJECT_PLAYERS_BAG)`
	`800`	`+ if (l_it->object().CLS_ID == CLSID_OBJECT_PLAYERS_BAG)`
`802`	`801`	`{`
`803`		`- (*l_it)->SetDropManual(TRUE);`
	`802`	`+ l_it->SetDropManual(true);`
`804`	`803`	`continue;`
`805`		`- };`
`806`		`- };`
`807`		`- };`
`808`		`- };`
	`804`	`+ }`
	`805`	`+ }`
	`806`	`+ }`
	`807`	`+ }`
`809`	`808`
`810`	`809`	`if (!GEnv.isDedicatedServer)`
`811`	`810`	`{`
`@@ -958,13 +957,14 @@ void CActor::UpdateCL()`
`958`	`957`
`959`	`958`	`if (m_feel_touch_characters > 0)`
`960`	`959`	`{`
`961`		`- for (xr_vector<IGameObject*>::iterator it = feel_touch.begin(); it != feel_touch.end(); it++)`
	`960`	`+ for (auto& it : feel_touch)`
`962`	`961`	`{`
`963`		`- CPhysicsShellHolder* sh = smart_cast<CPhysicsShellHolder>(it);`
`964`		`- if (sh && sh->character_physics_support())`
	`962`	`+ auto sh = smart_cast<CPhysicsShellHolder*>(it);`
	`963`	`+ if (sh)`
`965`	`964`	`{`
`966`		`- sh->character_physics_support()->movement()->UpdateObjectBox(`
`967`		`- character_physics_support()->movement()->PHCharacter());`
	`965`	`+ auto shcps = sh->character_physics_support();`
	`966`	`+ if (shcps)`
	`967`	`+ shcps->movement()->UpdateObjectBox(shcps->movement()->PHCharacter());`
`968`	`968`	`}`
`969`	`969`	`}`
`970`	`970`	`}`
`@@ -1705,12 +1705,9 @@ void CActor::OnItemDropUpdate()`
`1705`	`1705`	`{`
`1706`	`1706`	`CInventoryOwner::OnItemDropUpdate();`
`1707`	`1707`
`1708`		`- TIItemContainer::iterator I = inventory().m_all.begin();`
`1709`		`- TIItemContainer::iterator E = inventory().m_all.end();`
`1710`		`-`
`1711`		`- for (; I != E; ++I)`
`1712`		`- if (!(I)->IsInvalid() && !attached(I))`
`1713`		`- attach(*I);`
	`1708`	`+ for (auto& it : inventory().m_all)`
	`1709`	`+ if (it->IsInvalid() && !attached(it))`
	`1710`	`+ attach(it);`
`1714`	`1711`	`}`
`1715`	`1712`
`1716`	`1713`	`void CActor::OnItemRuck(CInventoryItem* inventory_item, const SInvItemPlace& previous_place)`
`@@ -1742,9 +1739,9 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()`
`1742`	`1739`	`update_time = 0.0f;`
`1743`	`1740`	`}`
`1744`	`1741`
`1745`		`- for (TIItemContainer::iterator it = inventory().m_belt.begin(); inventory().m_belt.end() != it; ++it)`
	`1742`	`+ for (auto& it : inventory().m_belt)`
`1746`	`1743`	`{`
`1747`		`- CArtefact* artefact = smart_cast<CArtefact>(it);`
	`1744`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`1748`	`1745`	`if (artefact)`
`1749`	`1746`	`{`
`1750`	`1747`	`conditions().ChangeBleeding(artefact->m_fBleedingRestoreSpeed * f_update_time);`
`@@ -1761,6 +1758,7 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()`
`1761`	`1758`	`conditions().ChangeRadiation(artefact->m_fRadiationRestoreSpeed * f_update_time);`
`1762`	`1759`	`}`
`1763`	`1760`	`}`
	`1761`	`+`
`1764`	`1762`	`CCustomOutfit* outfit = GetOutfit();`
`1765`	`1763`	`if (outfit)`
`1766`	`1764`	`{`
`@@ -1786,15 +1784,11 @@ void CActor::UpdateArtefactsOnBeltAndOutfit()`
`1786`	`1784`
`1787`	`1785`	`float CActor::HitArtefactsOnBelt(float hit_power, ALife::EHitType hit_type)`
`1788`	`1786`	`{`
`1789`		`- TIItemContainer::iterator it = inventory().m_belt.begin();`
`1790`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`1791`		`- for (; it != ite; ++it)`
	`1787`	`+ for (auto& it : inventory().m_belt)`
`1792`	`1788`	`{`
`1793`		`- CArtefact* artefact = smart_cast<CArtefact>(it);`
	`1789`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`1794`	`1790`	`if (artefact)`
`1795`		`- {`
`1796`	`1791`	`hit_power -= artefact->m_ArtefactHitImmunities.AffectHit(1.0f, hit_type);`
`1797`		`- }`
`1798`	`1792`	`}`
`1799`	`1793`	`clamp(hit_power, 0.0f, flt_max);`
`1800`	`1794`
`@@ -1804,15 +1798,11 @@ float CActor::HitArtefactsOnBelt(float hit_power, ALife::EHitType hit_type)`
`1804`	`1798`	`float CActor::GetProtection_ArtefactsOnBelt(ALife::EHitType hit_type)`
`1805`	`1799`	`{`
`1806`	`1800`	`float sum = 0.0f;`
`1807`		`- TIItemContainer::iterator it = inventory().m_belt.begin();`
`1808`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`1809`		`- for (; it != ite; ++it)`
	`1801`	`+ for (auto& it : inventory().m_belt)`
`1810`	`1802`	`{`
`1811`		`- CArtefact* artefact = smart_cast<CArtefact>(it);`
	`1803`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`1812`	`1804`	`if (artefact)`
`1813`		`- {`
`1814`	`1805`	`sum += artefact->m_ArtefactHitImmunities.AffectHit(1.0f, hit_type);`
`1815`		`- }`
`1816`	`1806`	`}`
`1817`	`1807`	`return sum;`
`1818`	`1808`	`}`
`@@ -1917,7 +1907,7 @@ bool CActor::can_attach(const CInventoryItem* inventory_item) const`
`1917`	`1907`	`std::find(m_attach_item_sections.begin(), m_attach_item_sections.end(), inventory_item->object().cNameSect()))`
`1918`	`1908`	`return false;`
`1919`	`1909`
`1920`		`- //если уже есть присоединненый объет такого типа`
	`1910`	`+ //если уже есть присоединённый объект такого типа`
`1921`	`1911`	`if (attached(inventory_item->object().cNameSect()))`
`1922`	`1912`	`return false;`
`1923`	`1913`
`@@ -1928,7 +1918,7 @@ void CActor::OnDifficultyChanged()`
`1928`	`1918`	`{`
`1929`	`1919`	`// immunities`
`1930`	`1920`	`VERIFY(g_SingleGameDifficulty >= egdNovice && g_SingleGameDifficulty <= egdMaster);`
`1931`		`- LPCSTR diff_name = get_token_name(difficulty_type_token, g_SingleGameDifficulty);`
	`1921`	`+ pcstr diff_name = get_token_name(difficulty_type_token, g_SingleGameDifficulty);`
`1932`	`1922`	`string128 tmp;`
`1933`	`1923`	`strconcat(sizeof(tmp), tmp, "actor_immunities_", diff_name);`
`1934`	`1924`	`conditions().LoadImmunities(tmp, pSettings);`
`@@ -1940,7 +1930,7 @@ void CActor::OnDifficultyChanged()`
`1940`	`1930`	`conditions().LoadTwoHitsDeathParams(tmp);`
`1941`	`1931`	`}`
`1942`	`1932`
`1943`		`-CVisualMemoryManager* CActor::visual_memory() const { return (&memory().visual()); }`
	`1933`	`+CVisualMemoryManager* CActor::visual_memory() const { return &memory().visual(); }`
`1944`	`1934`	`float CActor::GetMass()`
`1945`	`1935`	`{`
`1946`	`1936`	`return g_Alive() ? character_physics_support()->movement()->GetMass() :`
`@@ -1949,12 +1939,12 @@ float CActor::GetMass()`
`1949`	`1939`
`1950`	`1940`	`bool CActor::is_on_ground()`
`1951`	`1941`	`{`
`1952`		`- return (character_physics_support()->movement()->Environment() != CPHMovementControl::peInAir);`
	`1942`	`+ return character_physics_support()->movement()->Environment() != CPHMovementControl::peInAir;`
`1953`	`1943`	`}`
`1954`	`1944`
`1955`	`1945`	`bool CActor::is_ai_obstacle() const`
`1956`	`1946`	`{`
`1957`		`- return (false); // true);`
	`1947`	`+ return false; // true);`
`1958`	`1948`	`}`
`1959`	`1949`
`1960`	`1950`	`float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)`
`@@ -1965,80 +1955,64 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)`
`1965`	`1955`	`case ALife::eHealthRestoreSpeed:`
`1966`	`1956`	`{`
`1967`	`1957`	`res = conditions().change_v().m_fV_HealthRestore;`
`1968`		`- res += conditions().V_SatietyHealth() * ((conditions().GetSatiety() > 0.0f) ? 1.0f : -1.0f);`
	`1958`	`+ res += conditions().V_SatietyHealth() * (conditions().GetSatiety() > 0.0f ? 1.0f : -1.0f);`
`1969`	`1959`
`1970`		`- TIItemContainer::iterator itb = inventory().m_belt.begin();`
`1971`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`1972`		`- for (; itb != ite; ++itb)`
	`1960`	`+ for (auto& it : inventory().m_belt)`
`1973`	`1961`	`{`
`1974`		`- CArtefact* artefact = smart_cast<CArtefact>(itb);`
	`1962`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`1975`	`1963`	`if (artefact)`
`1976`		`- {`
`1977`	`1964`	`res += artefact->m_fHealthRestoreSpeed;`
`1978`		`- }`
`1979`	`1965`	`}`
`1980`		`- CCustomOutfit* outfit = GetOutfit();`
	`1966`	`+`
	`1967`	`+ const auto outfit = GetOutfit();`
`1981`	`1968`	`if (outfit)`
`1982`		`- {`
`1983`	`1969`	`res += outfit->m_fHealthRestoreSpeed;`
`1984`		`- }`
	`1970`	`+`
`1985`	`1971`	`break;`
`1986`	`1972`	`}`
`1987`	`1973`	`case ALife::eRadiationRestoreSpeed:`
`1988`	`1974`	`{`
`1989`		`- TIItemContainer::iterator itb = inventory().m_belt.begin();`
`1990`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`1991`		`- for (; itb != ite; ++itb)`
	`1975`	`+ for (auto& it : inventory().m_belt)`
`1992`	`1976`	`{`
`1993`		`- CArtefact* artefact = smart_cast<CArtefact>(itb);`
	`1977`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`1994`	`1978`	`if (artefact)`
`1995`		`- {`
`1996`	`1979`	`res += artefact->m_fRadiationRestoreSpeed;`
`1997`		`- }`
`1998`	`1980`	`}`
`1999`		`- CCustomOutfit* outfit = GetOutfit();`
	`1981`	`+`
	`1982`	`+ const auto outfit = GetOutfit();`
`2000`	`1983`	`if (outfit)`
`2001`		`- {`
`2002`	`1984`	`res += outfit->m_fRadiationRestoreSpeed;`
`2003`		`- }`
	`1985`	`+`
`2004`	`1986`	`break;`
`2005`	`1987`	`}`
`2006`	`1988`	`case ALife::eSatietyRestoreSpeed:`
`2007`	`1989`	`{`
`2008`	`1990`	`res = conditions().V_Satiety();`
`2009`	`1991`
`2010`		`- TIItemContainer::iterator itb = inventory().m_belt.begin();`
`2011`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`2012`		`- for (; itb != ite; ++itb)`
	`1992`	`+ for (auto& it : inventory().m_belt)`
`2013`	`1993`	`{`
`2014`		`- CArtefact* artefact = smart_cast<CArtefact>(itb);`
	`1994`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`2015`	`1995`	`if (artefact)`
`2016`		`- {`
`2017`	`1996`	`res += artefact->m_fSatietyRestoreSpeed;`
`2018`		`- }`
`2019`	`1997`	`}`
`2020`		`- CCustomOutfit* outfit = GetOutfit();`
	`1998`	`+`
	`1999`	`+ const auto outfit = GetOutfit();`
`2021`	`2000`	`if (outfit)`
`2022`		`- {`
`2023`	`2001`	`res += outfit->m_fSatietyRestoreSpeed;`
`2024`		`- }`
	`2002`	`+`
`2025`	`2003`	`break;`
`2026`	`2004`	`}`
`2027`	`2005`	`case ALife::ePowerRestoreSpeed:`
`2028`	`2006`	`{`
`2029`	`2007`	`res = conditions().GetSatietyPower();`
`2030`	`2008`
`2031`		`- TIItemContainer::iterator itb = inventory().m_belt.begin();`
`2032`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`2033`		`- for (; itb != ite; ++itb)`
	`2009`	`+ for (auto& it : inventory().m_belt)`
`2034`	`2010`	`{`
`2035`		`- CArtefact* artefact = smart_cast<CArtefact>(itb);`
	`2011`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`2036`	`2012`	`if (artefact)`
`2037`		`- {`
`2038`	`2013`	`res += artefact->m_fPowerRestoreSpeed;`
`2039`		`- }`
`2040`	`2014`	`}`
`2041`		`- CCustomOutfit* outfit = GetOutfit();`
	`2015`	`+ auto outfit = GetOutfit();`
`2042`	`2016`	`if (outfit)`
`2043`	`2017`	`{`
`2044`	`2018`	`res += outfit->m_fPowerRestoreSpeed;`
`@@ -2047,27 +2021,24 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)`
`2047`	`2021`	`}`
`2048`	`2022`	`else`
`2049`	`2023`	`res /= 0.5f;`
	`2024`	`+`
`2050`	`2025`	`break;`
`2051`	`2026`	`}`
`2052`	`2027`	`case ALife::eBleedingRestoreSpeed:`
`2053`	`2028`	`{`
`2054`	`2029`	`res = conditions().change_v().m_fV_WoundIncarnation;`
`2055`	`2030`
`2056`		`- TIItemContainer::iterator itb = inventory().m_belt.begin();`
`2057`		`- TIItemContainer::iterator ite = inventory().m_belt.end();`
`2058`		`- for (; itb != ite; ++itb)`
	`2031`	`+ for (auto& it : inventory().m_belt)`
`2059`	`2032`	`{`
`2060`		`- CArtefact* artefact = smart_cast<CArtefact>(itb);`
	`2033`	`+ const auto artefact = smart_cast<CArtefact*>(it);`
`2061`	`2034`	`if (artefact)`
`2062`		`- {`
`2063`	`2035`	`res += artefact->m_fBleedingRestoreSpeed;`
`2064`		`- }`
`2065`	`2036`	`}`
`2066`		`- CCustomOutfit* outfit = GetOutfit();`
	`2037`	`+`
	`2038`	`+ const auto outfit = GetOutfit();`
`2067`	`2039`	`if (outfit)`
`2068`		`- {`
`2069`	`2040`	`res += outfit->m_fBleedingRestoreSpeed;`
`2070`		`- }`
	`2041`	`+`
`2071`	`2042`	`break;`
`2072`	`2043`	`}`
`2073`	`2044`	`} // switch`
`@@ -2077,7 +2048,7 @@ float CActor::GetRestoreSpeed(ALife::EConditionRestoreType const& type)`
`2077`	`2048`
`2078`	`2049`	`void CActor::On_SetEntity()`
`2079`	`2050`	`{`
`2080`		`- CCustomOutfit* pOutfit = GetOutfit();`
	`2051`	`+ auto pOutfit = GetOutfit();`
`2081`	`2052`	`if (!pOutfit)`
`2082`	`2053`	`g_player_hud->load_default();`
`2083`	`2054`	`else`