xrEProps/EditorChooseEvents.h: range-based for usage, errors fixes

Xottab-DUTY · Xottab-DUTY · commit 46ea987356de · 2018-03-03T02:09:34.000+05:00
diff --git a/src/editors/xrEProps/ChoseForm.h b/src/editors/xrEProps/ChoseForm.h
@@ -19,7 +19,7 @@
 #include "mxPlacemnt.hpp"
 #include "ElXPThemedControl.hpp"
 #include "Gradient.hpp"
-#include "ChooseTypes.H"
+#include "xrCore/ChooseTypes.H"
 
 //---------------------------------------------------------------------------
 // refs
diff --git a/src/editors/xrEProps/EditorChooseEvents.h b/src/editors/xrEProps/EditorChooseEvents.h
@@ -1,7 +1,7 @@
 #ifndef EditorChooseEventsH
 #define EditorChooseEventsH
 
-#include "ChooseTypes.h"
+#include "xrCore/ChooseTypes.h"
 #include "Layers/xrRender/SkeletonAnimated.h"
 #include "Layers/xrRender/ResourceManager.h"
 
@@ -15,12 +15,11 @@ namespace ChoseEvents
 void __stdcall FillEntity(ChooseItemVec& items, void* param)
 {
     //.    AppendItem	   					(RPOINT_CHOOSE_NAME);
-    CInifile::Root const& data = pSettings->sections();
-    for (CInifile::RootCIt it = data.begin(); it != data.end(); it++)
+    for (auto& it : pSettings->sections())
     {
-        LPCSTR val;
-        if ((*it)->line_exist("$spawn", &val))
-            items.push_back(SChooseItem(*(*it)->Name, ""));
+        pcstr val;
+        if (it->line_exist("$spawn", &val))
+            items.push_back(SChooseItem(it->Name.c_str(), ""));
     }
 }
 //---------------------------------------------------------------------------
@@ -42,10 +41,8 @@ void __stdcall FillSoundSource(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (SndLib->GetGameSounds(lst))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 //---------------------------------------------------------------------------
@@ -54,10 +51,8 @@ void __stdcall FillSoundEnv(ChooseItemVec& items, void* param)
     AStringVec lst;
     if (SndLib->GetSoundEnvs(lst))
     {
-        AStringIt it = lst.begin();
-        AStringIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.c_str(), ""));
     }
 }
 //---------------------------------------------------------------------------
@@ -66,10 +61,8 @@ void __stdcall FillObject(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (Lib.GetObjects(lst))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 void __stdcall SelectObject(SChooseItem* item, PropItemVec& info_items)
@@ -92,10 +85,8 @@ void __stdcall FillGroup(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (FS.file_list(lst, _groups_, FS_ListFiles | FS_ClampExt, "*.group"))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 void __stdcall SelectGroup(SChooseItem* item, PropItemVec& info_items)
@@ -118,10 +109,8 @@ void __stdcall FillVisual(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (FS.file_list(lst, _game_meshes_, FS_ListFiles | FS_ClampExt, "*.ogf"))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 void __stdcall SelectVisual(SChooseItem* item, PropItemVec& info_items)
@@ -155,10 +144,8 @@ void __stdcall FillGameObjectMots(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (FS.file_list(lst, _game_meshes_, FS_ListFiles | FS_ClampExt, "*.omf"))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 void __stdcall SelectGameObjectMots(SChooseItem* item, PropItemVec& info_items) {}
@@ -168,20 +155,16 @@ void __stdcall FillGameAnim(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (FS.file_list(lst, "$game_anims$", FS_ListFiles, "*.anm,*.anms"))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 //---------------------------------------------------------------------------
 void __stdcall FillLAnim(ChooseItemVec& items, void* param)
 {
-    LAItemVec& lst = LALib.Objects();
-    LAItemIt it = lst.begin();
-    LAItemIt _E = lst.end();
-    for (; it != _E; it++)
-        items.push_back(SChooseItem(*(*it)->cName, ""));
+    for (auto& it : LALib.Objects())
+        items.push_back(SChooseItem((*it)->cName.c_str(), ""));
 }
 void __stdcall DrawLAnim(LPCSTR name, HDC hdc, const Irect& r)
 {
@@ -197,33 +180,28 @@ void __stdcall DrawLAnim(LPCSTR name, HDC hdc, const Irect& r)
 //---------------------------------------------------------------------------
 void __stdcall FillEShader(ChooseItemVec& items, void* param)
 {
-    CResourceManager::map_Blender& blenders = EDevice.Resources->_GetBlenders();
-    CResourceManager::map_BlenderIt _S = blenders.begin();
-    CResourceManager::map_BlenderIt _E = blenders.end();
-    for (; _S != _E; _S++)
-        items.push_back(SChooseItem(_S->first, ""));
+    for (auto& it : EDevice.Resources->_GetBlenders())
+        items.push_back(SChooseItem(it.first, ""));
 }
 //---------------------------------------------------------------------------
 void __stdcall FillCShader(ChooseItemVec& items, void* param)
 {
-    Shader_xrLCVec& shaders = EDevice.ShaderXRLC.Library();
-    Shader_xrLCIt _F = shaders.begin();
-    Shader_xrLCIt _E = shaders.end();
-    for (; _F != _E; _F++)
-        items.push_back(SChooseItem(_F->Name, ""));
+    for (auto& it : EDevice.ShaderXRLC.Library())
+        items.push_back(SChooseItem(it.Name, ""));
 }
 //---------------------------------------------------------------------------
 void __stdcall FillPE(ChooseItemVec& items, void* param)
 {
-    for (PS::PEDIt E = ::Render->PSLibrary.FirstPED(); E != ::Render->PSLibrary.LastPED(); E++)
+    for (PS::PEDIt E = GEnv.Render->PSLibrary.FirstPED(); E != GEnv.Render->PSLibrary.LastPED(); ++E)
         items.push_back(SChooseItem(*(*E)->m_Name, "EFFECT"));
 }
 //---------------------------------------------------------------------------
 void __stdcall FillParticles(ChooseItemVec& items, void* param)
 {
-    for (PS::PEDIt E = ::Render->PSLibrary.FirstPED(); E != ::Render->PSLibrary.LastPED(); E++)
+    for (PS::PEDIt E = GEnv.Render->PSLibrary.FirstPED(); E != GEnv.Render->PSLibrary.LastPED(); ++E)
         items.push_back(SChooseItem(*(*E)->m_Name, "EFFECT"));
-    for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); G++)
+
+    for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)
         items.push_back(SChooseItem(*(*G)->m_Name, "GROUP"));
 }
 
@@ -232,14 +210,12 @@ void __stdcall SelectPE(SChooseItem* item, PropItemVec& info_items)
     string64 str;
     u32 i = 0;
     PHelper().CreateCaption(info_items, "", "used in groups");
-    for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); ++G)
+    for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)
     {
         PS::CPGDef* def = (*G);
-        PS::CPGDef::EffectIt pe_it = def->m_Effects.begin();
-        PS::CPGDef::EffectIt pe_it_e = def->m_Effects.end();
-        for (; pe_it != pe_it_e; ++pe_it)
+        for (auto& pe_it : def->m_Effects)
         {
-            if ((*pe_it)->m_EffectName == item->name)
+            if (pe_it->m_EffectName == item->name)
             {
                 xr_sprintf(str, sizeof(str), "%d", ++i);
                 PHelper().CreateCaption(info_items, str, def->m_Name);
@@ -253,17 +229,15 @@ void __stdcall SelectPG(SChooseItem* item, PropItemVec& info_items)
     string64 str;
     u32 i = 0;
     PHelper().CreateCaption(info_items, "", "using effects");
-    for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); G++)
+    for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)
     {
         PS::CPGDef* def = (*G);
         if (def->m_Name == item->name)
         {
-            PS::CPGDef::EffectIt pe_it = def->m_Effects.begin();
-            PS::CPGDef::EffectIt pe_it_e = def->m_Effects.end();
-            for (; pe_it != pe_it_e; ++pe_it)
+            for (auto& pe_it : def->m_Effects)
             {
                 xr_sprintf(str, sizeof(str), "%d", ++i);
-                PHelper().CreateCaption(info_items, str, (*pe_it)->m_EffectName);
+                PHelper().CreateCaption(info_items, str, pe_it->m_EffectName);
             }
             break;
         }
@@ -276,10 +250,9 @@ void __stdcall FillTexture(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (ImageLib.GetTextures(lst))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 
@@ -300,10 +273,9 @@ void __stdcall FillTextureRaw(ChooseItemVec& items, void* param)
     FS_FileSet lst;
     if (ImageLib.GetTexturesRaw(lst))
     {
-        FS_FileSetIt it = lst.begin();
-        FS_FileSetIt _E = lst.end();
-        for (; it != _E; it++)
-            items.push_back(SChooseItem(it->name.c_str(), ""));
+        for (auto& it : lst)
+
+            items.push_back(SChooseItem(it.name.c_str(), ""));
     }
 }
 
@@ -350,54 +322,48 @@ void __stdcall FillGameMaterial(ChooseItemVec& items, void* param)
 
 void __stdcall FillSkeletonAnims(ChooseItemVec& items, void* param)
 {
-    IRenderVisual* V = ::Render->model_Create((LPCSTR)param);
+    IRenderVisual* V = GEnv.Render->model_Create((LPCSTR)param);
     if (PKinematicsAnimated(V))
     {
         u32 cnt = PKinematicsAnimated(V)->LL_MotionsSlotCount();
         for (u32 k = 0; k < cnt; k++)
         {
-            accel_map* ll_motions = PKinematicsAnimated(V)->LL_Motions(k);
-            accel_map::iterator _I, _E;
-            _I = ll_motions->begin();
-            _E = ll_motions->end();
-            for (; _I != _E; ++_I)
+            for (auto& it : PKinematicsAnimated(V)->LL_Motions(k))
             {
-                bool bFound = false;
-                for (ChooseItemVecIt it = items.begin(); it != items.end(); it++)
-                    if (it->name == _I->first)
+                bool found = false;
+                for (auto& it2 : items)
+                {
+                    if (it2.name == it.first)
                     {
-                        bFound = true;
+                        found = true;
                         break;
                     }
-                if (!bFound)
-                    items.push_back(SChooseItem(*_I->first, ""));
+                }
+                if (!found)
+                    items.push_back(SChooseItem(it.first.c_str(), ""));
             }
         }
     }
-    ::Render->model_Delete(V);
+    GEnv.Render->model_Delete(V);
 }
 
 void __stdcall FillSkeletonBones(ChooseItemVec& items, void* param)
 {
-    IRenderVisual* V = ::Render->model_Create((LPCSTR)param);
+    IRenderVisual* V = GEnv.Render->model_Create((LPCSTR)param);
     if (PKinematics(V))
     {
-        CKinematicsAnimated::accel* ll_bones = PKinematics(V)->LL_Bones();
-        CKinematicsAnimated::accel::iterator _I, _E;
-        _I = ll_bones->begin();
-        _E = ll_bones->end();
-        for (; _I != _E; ++_I)
-            items.push_back(SChooseItem(*_I->first, ""));
+        for (auto& it : *PKinematics(V)->LL_Bones())
+            items.push_back(SChooseItem(it.first.c_str(), ""));
     }
-    ::Render->model_Delete(V);
+    GEnv.Render->model_Delete(V);
 }
 
 void __stdcall FillSkeletonBonesObject(ChooseItemVec& items, void* param)
 {
     CEditableObject* eo = (CEditableObject*)param;
 
-    BoneIt _I = eo->FirstBone();
-    BoneIt _E = eo->LastBone();
+    auto _I = eo->FirstBone();
+    auto _E = eo->LastBone();
     for (; _I != _E; ++_I)
     {
         items.push_back(SChooseItem((*_I)->Name().c_str(), ""));

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#ifndef EditorChooseEventsH`
`2`	`2`	`#define EditorChooseEventsH`
`3`	`3`
`4`		`-#include "ChooseTypes.h"`
	`4`	`+#include "xrCore/ChooseTypes.h"`
`5`	`5`	`#include "Layers/xrRender/SkeletonAnimated.h"`
`6`	`6`	`#include "Layers/xrRender/ResourceManager.h"`
`7`	`7`
`@@ -15,12 +15,11 @@ namespace ChoseEvents`
`15`	`15`	`void __stdcall FillEntity(ChooseItemVec& items, void* param)`
`16`	`16`	`{`
`17`	`17`	`//. AppendItem (RPOINT_CHOOSE_NAME);`
`18`		`- CInifile::Root const& data = pSettings->sections();`
`19`		`- for (CInifile::RootCIt it = data.begin(); it != data.end(); it++)`
	`18`	`+ for (auto& it : pSettings->sections())`
`20`	`19`	`{`
`21`		`- LPCSTR val;`
`22`		`- if ((*it)->line_exist("$spawn", &val))`
`23`		`- items.push_back(SChooseItem((it)->Name, ""));`
	`20`	`+ pcstr val;`
	`21`	`+ if (it->line_exist("$spawn", &val))`
	`22`	`+ items.push_back(SChooseItem(it->Name.c_str(), ""));`
`24`	`23`	`}`
`25`	`24`	`}`
`26`	`25`	`//---------------------------------------------------------------------------`
`@@ -42,10 +41,8 @@ void __stdcall FillSoundSource(ChooseItemVec& items, void* param)`
`42`	`41`	`FS_FileSet lst;`
`43`	`42`	`if (SndLib->GetGameSounds(lst))`
`44`	`43`	`{`
`45`		`- FS_FileSetIt it = lst.begin();`
`46`		`- FS_FileSetIt _E = lst.end();`
`47`		`- for (; it != _E; it++)`
`48`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`44`	`+ for (auto& it : lst)`
	`45`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`	`//---------------------------------------------------------------------------`
`@@ -54,10 +51,8 @@ void __stdcall FillSoundEnv(ChooseItemVec& items, void* param)`
`54`	`51`	`AStringVec lst;`
`55`	`52`	`if (SndLib->GetSoundEnvs(lst))`
`56`	`53`	`{`
`57`		`- AStringIt it = lst.begin();`
`58`		`- AStringIt _E = lst.end();`
`59`		`- for (; it != _E; it++)`
`60`		`- items.push_back(SChooseItem(it->c_str(), ""));`
	`54`	`+ for (auto& it : lst)`
	`55`	`+ items.push_back(SChooseItem(it.c_str(), ""));`
`61`	`56`	`}`
`62`	`57`	`}`
`63`	`58`	`//---------------------------------------------------------------------------`
`@@ -66,10 +61,8 @@ void __stdcall FillObject(ChooseItemVec& items, void* param)`
`66`	`61`	`FS_FileSet lst;`
`67`	`62`	`if (Lib.GetObjects(lst))`
`68`	`63`	`{`
`69`		`- FS_FileSetIt it = lst.begin();`
`70`		`- FS_FileSetIt _E = lst.end();`
`71`		`- for (; it != _E; it++)`
`72`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`64`	`+ for (auto& it : lst)`
	`65`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`73`	`66`	`}`
`74`	`67`	`}`
`75`	`68`	`void __stdcall SelectObject(SChooseItem* item, PropItemVec& info_items)`
`@@ -92,10 +85,8 @@ void __stdcall FillGroup(ChooseItemVec& items, void* param)`
`92`	`85`	`FS_FileSet lst;`
`93`	`86`	`if (FS.file_list(lst, _groups_, FS_ListFiles \| FS_ClampExt, "*.group"))`
`94`	`87`	`{`
`95`		`- FS_FileSetIt it = lst.begin();`
`96`		`- FS_FileSetIt _E = lst.end();`
`97`		`- for (; it != _E; it++)`
`98`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`88`	`+ for (auto& it : lst)`
	`89`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`99`	`90`	`}`
`100`	`91`	`}`
`101`	`92`	`void __stdcall SelectGroup(SChooseItem* item, PropItemVec& info_items)`
`@@ -118,10 +109,8 @@ void __stdcall FillVisual(ChooseItemVec& items, void* param)`
`118`	`109`	`FS_FileSet lst;`
`119`	`110`	`if (FS.file_list(lst, _game_meshes_, FS_ListFiles \| FS_ClampExt, "*.ogf"))`
`120`	`111`	`{`
`121`		`- FS_FileSetIt it = lst.begin();`
`122`		`- FS_FileSetIt _E = lst.end();`
`123`		`- for (; it != _E; it++)`
`124`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`112`	`+ for (auto& it : lst)`
	`113`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`125`	`114`	`}`
`126`	`115`	`}`
`127`	`116`	`void __stdcall SelectVisual(SChooseItem* item, PropItemVec& info_items)`
`@@ -155,10 +144,8 @@ void __stdcall FillGameObjectMots(ChooseItemVec& items, void* param)`
`155`	`144`	`FS_FileSet lst;`
`156`	`145`	`if (FS.file_list(lst, _game_meshes_, FS_ListFiles \| FS_ClampExt, "*.omf"))`
`157`	`146`	`{`
`158`		`- FS_FileSetIt it = lst.begin();`
`159`		`- FS_FileSetIt _E = lst.end();`
`160`		`- for (; it != _E; it++)`
`161`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`147`	`+ for (auto& it : lst)`
	`148`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`162`	`149`	`}`
`163`	`150`	`}`
`164`	`151`	`void __stdcall SelectGameObjectMots(SChooseItem* item, PropItemVec& info_items) {}`
`@@ -168,20 +155,16 @@ void __stdcall FillGameAnim(ChooseItemVec& items, void* param)`
`168`	`155`	`FS_FileSet lst;`
`169`	`156`	`if (FS.file_list(lst, "$game_anims$", FS_ListFiles, ".anm,.anms"))`
`170`	`157`	`{`
`171`		`- FS_FileSetIt it = lst.begin();`
`172`		`- FS_FileSetIt _E = lst.end();`
`173`		`- for (; it != _E; it++)`
`174`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`158`	`+ for (auto& it : lst)`
	`159`	`+`
	`160`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`175`	`161`	`}`
`176`	`162`	`}`
`177`	`163`	`//---------------------------------------------------------------------------`
`178`	`164`	`void __stdcall FillLAnim(ChooseItemVec& items, void* param)`
`179`	`165`	`{`
`180`		`- LAItemVec& lst = LALib.Objects();`
`181`		`- LAItemIt it = lst.begin();`
`182`		`- LAItemIt _E = lst.end();`
`183`		`- for (; it != _E; it++)`
`184`		`- items.push_back(SChooseItem((it)->cName, ""));`
	`166`	`+ for (auto& it : LALib.Objects())`
	`167`	`+ items.push_back(SChooseItem((*it)->cName.c_str(), ""));`
`185`	`168`	`}`
`186`	`169`	`void __stdcall DrawLAnim(LPCSTR name, HDC hdc, const Irect& r)`
`187`	`170`	`{`
`@@ -197,33 +180,28 @@ void __stdcall DrawLAnim(LPCSTR name, HDC hdc, const Irect& r)`
`197`	`180`	`//---------------------------------------------------------------------------`
`198`	`181`	`void __stdcall FillEShader(ChooseItemVec& items, void* param)`
`199`	`182`	`{`
`200`		`- CResourceManager::map_Blender& blenders = EDevice.Resources->_GetBlenders();`
`201`		`- CResourceManager::map_BlenderIt _S = blenders.begin();`
`202`		`- CResourceManager::map_BlenderIt _E = blenders.end();`
`203`		`- for (; _S != _E; _S++)`
`204`		`- items.push_back(SChooseItem(_S->first, ""));`
	`183`	`+ for (auto& it : EDevice.Resources->_GetBlenders())`
	`184`	`+ items.push_back(SChooseItem(it.first, ""));`
`205`	`185`	`}`
`206`	`186`	`//---------------------------------------------------------------------------`
`207`	`187`	`void __stdcall FillCShader(ChooseItemVec& items, void* param)`
`208`	`188`	`{`
`209`		`- Shader_xrLCVec& shaders = EDevice.ShaderXRLC.Library();`
`210`		`- Shader_xrLCIt _F = shaders.begin();`
`211`		`- Shader_xrLCIt _E = shaders.end();`
`212`		`- for (; _F != _E; _F++)`
`213`		`- items.push_back(SChooseItem(_F->Name, ""));`
	`189`	`+ for (auto& it : EDevice.ShaderXRLC.Library())`
	`190`	`+ items.push_back(SChooseItem(it.Name, ""));`
`214`	`191`	`}`
`215`	`192`	`//---------------------------------------------------------------------------`
`216`	`193`	`void __stdcall FillPE(ChooseItemVec& items, void* param)`
`217`	`194`	`{`
`218`		`- for (PS::PEDIt E = ::Render->PSLibrary.FirstPED(); E != ::Render->PSLibrary.LastPED(); E++)`
	`195`	`+ for (PS::PEDIt E = GEnv.Render->PSLibrary.FirstPED(); E != GEnv.Render->PSLibrary.LastPED(); ++E)`
`219`	`196`	`items.push_back(SChooseItem((E)->m_Name, "EFFECT"));`
`220`	`197`	`}`
`221`	`198`	`//---------------------------------------------------------------------------`
`222`	`199`	`void __stdcall FillParticles(ChooseItemVec& items, void* param)`
`223`	`200`	`{`
`224`		`- for (PS::PEDIt E = ::Render->PSLibrary.FirstPED(); E != ::Render->PSLibrary.LastPED(); E++)`
	`201`	`+ for (PS::PEDIt E = GEnv.Render->PSLibrary.FirstPED(); E != GEnv.Render->PSLibrary.LastPED(); ++E)`
`225`	`202`	`items.push_back(SChooseItem((E)->m_Name, "EFFECT"));`
`226`		`- for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); G++)`
	`203`	`+`
	`204`	`+ for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)`
`227`	`205`	`items.push_back(SChooseItem((G)->m_Name, "GROUP"));`
`228`	`206`	`}`
`229`	`207`
`@@ -232,14 +210,12 @@ void __stdcall SelectPE(SChooseItem* item, PropItemVec& info_items)`
`232`	`210`	`string64 str;`
`233`	`211`	`u32 i = 0;`
`234`	`212`	`PHelper().CreateCaption(info_items, "", "used in groups");`
`235`		`- for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); ++G)`
	`213`	`+ for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)`
`236`	`214`	`{`
`237`	`215`	`PS::CPGDef* def = (*G);`
`238`		`- PS::CPGDef::EffectIt pe_it = def->m_Effects.begin();`
`239`		`- PS::CPGDef::EffectIt pe_it_e = def->m_Effects.end();`
`240`		`- for (; pe_it != pe_it_e; ++pe_it)`
	`216`	`+ for (auto& pe_it : def->m_Effects)`
`241`	`217`	`{`
`242`		`- if ((*pe_it)->m_EffectName == item->name)`
	`218`	`+ if (pe_it->m_EffectName == item->name)`
`243`	`219`	`{`
`244`	`220`	`xr_sprintf(str, sizeof(str), "%d", ++i);`
`245`	`221`	`PHelper().CreateCaption(info_items, str, def->m_Name);`
`@@ -253,17 +229,15 @@ void __stdcall SelectPG(SChooseItem* item, PropItemVec& info_items)`
`253`	`229`	`string64 str;`
`254`	`230`	`u32 i = 0;`
`255`	`231`	`PHelper().CreateCaption(info_items, "", "using effects");`
`256`		`- for (PS::PGDIt G = ::Render->PSLibrary.FirstPGD(); G != ::Render->PSLibrary.LastPGD(); G++)`
	`232`	`+ for (PS::PGDIt G = GEnv.Render->PSLibrary.FirstPGD(); G != GEnv.Render->PSLibrary.LastPGD(); ++G)`
`257`	`233`	`{`
`258`	`234`	`PS::CPGDef* def = (*G);`
`259`	`235`	`if (def->m_Name == item->name)`
`260`	`236`	`{`
`261`		`- PS::CPGDef::EffectIt pe_it = def->m_Effects.begin();`
`262`		`- PS::CPGDef::EffectIt pe_it_e = def->m_Effects.end();`
`263`		`- for (; pe_it != pe_it_e; ++pe_it)`
	`237`	`+ for (auto& pe_it : def->m_Effects)`
`264`	`238`	`{`
`265`	`239`	`xr_sprintf(str, sizeof(str), "%d", ++i);`
`266`		`- PHelper().CreateCaption(info_items, str, (*pe_it)->m_EffectName);`
	`240`	`+ PHelper().CreateCaption(info_items, str, pe_it->m_EffectName);`
`267`	`241`	`}`
`268`	`242`	`break;`
`269`	`243`	`}`
`@@ -276,10 +250,9 @@ void __stdcall FillTexture(ChooseItemVec& items, void* param)`
`276`	`250`	`FS_FileSet lst;`
`277`	`251`	`if (ImageLib.GetTextures(lst))`
`278`	`252`	`{`
`279`		`- FS_FileSetIt it = lst.begin();`
`280`		`- FS_FileSetIt _E = lst.end();`
`281`		`- for (; it != _E; it++)`
`282`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`253`	`+ for (auto& it : lst)`
	`254`	`+`
	`255`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`283`	`256`	`}`
`284`	`257`	`}`
`285`	`258`
`@@ -300,10 +273,9 @@ void __stdcall FillTextureRaw(ChooseItemVec& items, void* param)`
`300`	`273`	`FS_FileSet lst;`
`301`	`274`	`if (ImageLib.GetTexturesRaw(lst))`
`302`	`275`	`{`
`303`		`- FS_FileSetIt it = lst.begin();`
`304`		`- FS_FileSetIt _E = lst.end();`
`305`		`- for (; it != _E; it++)`
`306`		`- items.push_back(SChooseItem(it->name.c_str(), ""));`
	`276`	`+ for (auto& it : lst)`
	`277`	`+`
	`278`	`+ items.push_back(SChooseItem(it.name.c_str(), ""));`
`307`	`279`	`}`
`308`	`280`	`}`
`309`	`281`
`@@ -350,54 +322,48 @@ void __stdcall FillGameMaterial(ChooseItemVec& items, void* param)`
`350`	`322`
`351`	`323`	`void __stdcall FillSkeletonAnims(ChooseItemVec& items, void* param)`
`352`	`324`	`{`
`353`		`- IRenderVisual* V = ::Render->model_Create((LPCSTR)param);`
	`325`	`+ IRenderVisual* V = GEnv.Render->model_Create((LPCSTR)param);`
`354`	`326`	`if (PKinematicsAnimated(V))`
`355`	`327`	`{`
`356`	`328`	`u32 cnt = PKinematicsAnimated(V)->LL_MotionsSlotCount();`
`357`	`329`	`for (u32 k = 0; k < cnt; k++)`
`358`	`330`	`{`
`359`		`- accel_map* ll_motions = PKinematicsAnimated(V)->LL_Motions(k);`
`360`		`- accel_map::iterator _I, _E;`
`361`		`- _I = ll_motions->begin();`
`362`		`- _E = ll_motions->end();`
`363`		`- for (; _I != _E; ++_I)`
	`331`	`+ for (auto& it : PKinematicsAnimated(V)->LL_Motions(k))`
`364`	`332`	`{`
`365`		`- bool bFound = false;`
`366`		`- for (ChooseItemVecIt it = items.begin(); it != items.end(); it++)`
`367`		`- if (it->name == _I->first)`
	`333`	`+ bool found = false;`
	`334`	`+ for (auto& it2 : items)`
	`335`	`+ {`
	`336`	`+ if (it2.name == it.first)`
`368`	`337`	`{`
`369`		`- bFound = true;`
	`338`	`+ found = true;`
`370`	`339`	`break;`
`371`	`340`	`}`
`372`		`- if (!bFound)`
`373`		`- items.push_back(SChooseItem(*_I->first, ""));`
	`341`	`+ }`
	`342`	`+ if (!found)`
	`343`	`+ items.push_back(SChooseItem(it.first.c_str(), ""));`
`374`	`344`	`}`
`375`	`345`	`}`
`376`	`346`	`}`
`377`		`- ::Render->model_Delete(V);`
	`347`	`+ GEnv.Render->model_Delete(V);`
`378`	`348`	`}`
`379`	`349`
`380`	`350`	`void __stdcall FillSkeletonBones(ChooseItemVec& items, void* param)`
`381`	`351`	`{`
`382`		`- IRenderVisual* V = ::Render->model_Create((LPCSTR)param);`
	`352`	`+ IRenderVisual* V = GEnv.Render->model_Create((LPCSTR)param);`
`383`	`353`	`if (PKinematics(V))`
`384`	`354`	`{`
`385`		`- CKinematicsAnimated::accel* ll_bones = PKinematics(V)->LL_Bones();`
`386`		`- CKinematicsAnimated::accel::iterator _I, _E;`
`387`		`- _I = ll_bones->begin();`
`388`		`- _E = ll_bones->end();`
`389`		`- for (; _I != _E; ++_I)`
`390`		`- items.push_back(SChooseItem(*_I->first, ""));`
	`355`	`+ for (auto& it : *PKinematics(V)->LL_Bones())`
	`356`	`+ items.push_back(SChooseItem(it.first.c_str(), ""));`
`391`	`357`	`}`
`392`		`- ::Render->model_Delete(V);`
	`358`	`+ GEnv.Render->model_Delete(V);`
`393`	`359`	`}`
`394`	`360`
`395`	`361`	`void __stdcall FillSkeletonBonesObject(ChooseItemVec& items, void* param)`
`396`	`362`	`{`
`397`	`363`	`CEditableObject* eo = (CEditableObject*)param;`
`398`	`364`
`399`		`- BoneIt _I = eo->FirstBone();`
`400`		`- BoneIt _E = eo->LastBone();`
	`365`	`+ auto _I = eo->FirstBone();`
	`366`	`+ auto _E = eo->LastBone();`
`401`	`367`	`for (; _I != _E; ++_I)`
`402`	`368`	`{`
`403`	`369`	`items.push_back(SChooseItem((*_I)->Name().c_str(), ""));`