Simplify the code.

intorr · intorr · commit c24f2120758c · 2017-12-12T01:26:50.000+05:00
diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -465,36 +465,30 @@ void CRender::add_leafs_Dynamic(dxRender_Visual* pVisual)
         return;
 
     // Visual is 100% visible - simply add it
-    xr_vector<dxRender_Visual *>::iterator I, E; // it may be useful for 'hierrarhy' visual
-
     switch (pVisual->Type)
     {
     case MT_PARTICLE_GROUP:
     {
         // Add all children, doesn't perform any tests
         PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;
-        for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)
+        for (auto &it : pG->items)
         {
-            PS::CParticleGroup::SItem& I = *i_it;
+            PS::CParticleGroup::SItem& I = it;
             if (I._effect)
                 add_leafs_Dynamic(I._effect);
-            for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                 pit != I._children_related.end(); pit++)
-                add_leafs_Dynamic(*pit);
-            for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin(); pit != I._children_free.end();
-                 pit++)
-                add_leafs_Dynamic(*pit);
+            for (auto &pit : I._children_related)
+                add_leafs_Dynamic(pit);
+            for (auto &pit : I._children_free)
+                add_leafs_Dynamic(pit);
         }
     }
         return;
     case MT_HIERRARHY:
     {
         // Add all children, doesn't perform any tests
         FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;
-        I = pV->children.begin();
-        E = pV->children.end();
-        for (; I != E; I++)
-            add_leafs_Dynamic(*I);
+        for (auto &i : pV->children)
+            add_leafs_Dynamic(i);
     }
         return;
     case MT_SKELETON_ANIM:
@@ -520,10 +514,8 @@ void CRender::add_leafs_Dynamic(dxRender_Visual* pVisual)
         {
             pV->CalculateBones(TRUE);
             pV->CalculateWallmarks(); //. bug?
-            I = pV->children.begin();
-            E = pV->children.end();
-            for (; I != E; I++)
-                add_leafs_Dynamic(*I);
+            for (auto &i : pV->children)
+                add_leafs_Dynamic(i);
         }
     }
         return;
@@ -545,36 +537,30 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)
         return;
 
     // Visual is 100% visible - simply add it
-    xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals
-
     switch (pVisual->Type)
     {
     case MT_PARTICLE_GROUP:
     {
         // Add all children, doesn't perform any tests
         PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;
-        for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)
+        for (auto &it : pG->items)
         {
-            PS::CParticleGroup::SItem& I = *i_it;
+            PS::CParticleGroup::SItem& I = it;
             if (I._effect)
                 add_leafs_Dynamic(I._effect);
-            for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                 pit != I._children_related.end(); pit++)
-                add_leafs_Dynamic(*pit);
-            for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin(); pit != I._children_free.end();
-                 pit++)
-                add_leafs_Dynamic(*pit);
+            for (auto &pit : I._children_related)
+                add_leafs_Dynamic(pit);
+            for (auto &pit : I._children_free)
+                add_leafs_Dynamic(pit);
         }
     }
         return;
     case MT_HIERRARHY:
     {
         // Add all children, doesn't perform any tests
         FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;
-        I = pV->children.begin();
-        E = pV->children.end();
-        for (; I != E; I++)
-            add_leafs_Static(*I);
+        for (auto &i : pV->children)
+            add_leafs_Static(i);
     }
         return;
     case MT_SKELETON_ANIM:
@@ -583,10 +569,8 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)
         // Add all children, doesn't perform any tests
         CKinematics* pV = (CKinematics*)pVisual;
         pV->CalculateBones(TRUE);
-        I = pV->children.begin();
-        E = pV->children.end();
-        for (; I != E; I++)
-            add_leafs_Static(*I);
+        for (auto &i : pV->children)
+            add_leafs_Static(i);
     }
         return;
     case MT_LOD:
@@ -610,10 +594,8 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)
 #endif
         {
             // Add all children, doesn't perform any tests
-            I = pV->children.begin();
-            E = pV->children.end();
-            for (; I != E; I++)
-                add_leafs_Static(*I);
+            for (auto &i : pV->children)
+                add_leafs_Static(i);
         }
     }
         return;
@@ -648,38 +630,32 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)
         return FALSE;
 
     // If we get here visual is visible or partially visible
-    xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals
-
     switch (pVisual->Type)
     {
     case MT_PARTICLE_GROUP:
     {
         // Add all children, doesn't perform any tests
         PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;
-        for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)
+        for (auto &it : pG->items)
         {
-            PS::CParticleGroup::SItem& I = *i_it;
+            PS::CParticleGroup::SItem& I = it;
             if (fcvPartial == VIS)
             {
                 if (I._effect)
                     add_Dynamic(I._effect, planes);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                     pit != I._children_related.end(); pit++)
-                    add_Dynamic(*pit, planes);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();
-                     pit != I._children_free.end(); pit++)
-                    add_Dynamic(*pit, planes);
+                for (auto &pit : I._children_related)
+                    add_Dynamic(pit, planes);
+                for (auto &pit : I._children_free)
+                    add_Dynamic(pit, planes);
             }
             else
             {
                 if (I._effect)
                     add_leafs_Dynamic(I._effect);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                     pit != I._children_related.end(); pit++)
-                    add_leafs_Dynamic(*pit);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();
-                     pit != I._children_free.end(); pit++)
-                    add_leafs_Dynamic(*pit);
+                for (auto &pit : I._children_related)
+                    add_leafs_Dynamic(pit);
+                for (auto &pit : I._children_free)
+                    add_leafs_Dynamic(pit);
             }
         }
     }
@@ -688,17 +664,15 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)
     {
         // Add all children
         FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;
-        I = pV->children.begin();
-        E = pV->children.end();
         if (fcvPartial == VIS)
         {
-            for (; I != E; I++)
-                add_Dynamic(*I, planes);
+            for (auto &i : pV->children)
+                add_Dynamic(i, planes);
         }
         else
         {
-            for (; I != E; I++)
-                add_leafs_Dynamic(*I);
+            for (auto &i : pV->children)
+                add_leafs_Dynamic(i);
         }
     }
     break;
@@ -725,20 +699,9 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)
         {
             pV->CalculateBones(TRUE);
             pV->CalculateWallmarks(); //. bug?
-            I = pV->children.begin();
-            E = pV->children.end();
-            for (; I != E; I++)
-                add_leafs_Dynamic(*I);
+            for (auto &i : pV->children)
+                add_leafs_Dynamic(i);
         }
-        /*
-        I = pV->children.begin      ();
-        E = pV->children.end        ();
-        if (fcvPartial==VIS) {
-            for (; I!=E; I++)   add_Dynamic         (*I,planes);
-        } else {
-            for (; I!=E; I++)   add_leafs_Dynamic   (*I);
-        }
-        */
     }
     break;
     default:
@@ -764,38 +727,32 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)
         return;
 
     // If we get here visual is visible or partially visible
-    xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals
-
     switch (pVisual->Type)
     {
     case MT_PARTICLE_GROUP:
     {
         // Add all children, doesn't perform any tests
         PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;
-        for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)
+        for (auto &it : pG->items)
         {
-            PS::CParticleGroup::SItem& I = *i_it;
+            PS::CParticleGroup::SItem& I = it;
             if (fcvPartial == VIS)
             {
                 if (I._effect)
                     add_Dynamic(I._effect, planes);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                     pit != I._children_related.end(); pit++)
-                    add_Dynamic(*pit, planes);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();
-                     pit != I._children_free.end(); pit++)
-                    add_Dynamic(*pit, planes);
+                for (auto &pit : I._children_related)
+                    add_Dynamic(pit, planes);
+                for (auto &pit : I._children_free)
+                    add_Dynamic(pit, planes);
             }
             else
             {
                 if (I._effect)
                     add_leafs_Dynamic(I._effect);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();
-                     pit != I._children_related.end(); pit++)
-                    add_leafs_Dynamic(*pit);
-                for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();
-                     pit != I._children_free.end(); pit++)
-                    add_leafs_Dynamic(*pit);
+                for (auto &pit : I._children_related)
+                    add_leafs_Dynamic(pit);
+                for (auto &pit : I._children_free)
+                    add_leafs_Dynamic(pit);
             }
         }
     }
@@ -804,17 +761,15 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)
     {
         // Add all children
         FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;
-        I = pV->children.begin();
-        E = pV->children.end();
         if (fcvPartial == VIS)
         {
-            for (; I != E; I++)
-                add_Static(*I, planes);
+            for (auto &i : pV->children)
+                add_Static(i, planes);
         }
         else
         {
-            for (; I != E; I++)
-                add_leafs_Static(*I);
+            for (auto &i : pV->children)
+                add_leafs_Static(i);
         }
     }
     break;
@@ -824,17 +779,15 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)
         // Add all children, doesn't perform any tests
         CKinematics* pV = (CKinematics*)pVisual;
         pV->CalculateBones(TRUE);
-        I = pV->children.begin();
-        E = pV->children.end();
         if (fcvPartial == VIS)
         {
-            for (; I != E; I++)
-                add_Static(*I, planes);
+            for (auto &i : pV->children)
+                add_Static(i, planes);
         }
         else
         {
-            for (; I != E; I++)
-                add_leafs_Static(*I);
+            for (auto &i : pV->children)
+                add_leafs_Static(i);
         }
     }
     break;
@@ -859,10 +812,8 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)
 #endif
         {
             // Add all children, perform tests
-            I = pV->children.begin();
-            E = pV->children.end();
-            for (; I != E; I++)
-                add_leafs_Static(*I);
+            for (auto &i : pV->children)
+                add_leafs_Static(i);
         }
     }
     break;

Original file line number	Diff line number	Diff line change
`@@ -465,36 +465,30 @@ void CRender::add_leafs_Dynamic(dxRender_Visual* pVisual)`
`465`	`465`	`return;`
`466`	`466`
`467`	`467`	`// Visual is 100% visible - simply add it`
`468`		`- xr_vector<dxRender_Visual *>::iterator I, E; // it may be useful for 'hierrarhy' visual`
`469`		`-`
`470`	`468`	`switch (pVisual->Type)`
`471`	`469`	`{`
`472`	`470`	`case MT_PARTICLE_GROUP:`
`473`	`471`	`{`
`474`	`472`	`// Add all children, doesn't perform any tests`
`475`	`473`	`PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;`
`476`		`- for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)`
	`474`	`+ for (auto &it : pG->items)`
`477`	`475`	`{`
`478`		`- PS::CParticleGroup::SItem& I = *i_it;`
	`476`	`+ PS::CParticleGroup::SItem& I = it;`
`479`	`477`	`if (I._effect)`
`480`	`478`	`add_leafs_Dynamic(I._effect);`
`481`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`482`		`- pit != I._children_related.end(); pit++)`
`483`		`- add_leafs_Dynamic(*pit);`
`484`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin(); pit != I._children_free.end();`
`485`		`- pit++)`
`486`		`- add_leafs_Dynamic(*pit);`
	`479`	`+ for (auto &pit : I._children_related)`
	`480`	`+ add_leafs_Dynamic(pit);`
	`481`	`+ for (auto &pit : I._children_free)`
	`482`	`+ add_leafs_Dynamic(pit);`
`487`	`483`	`}`
`488`	`484`	`}`
`489`	`485`	`return;`
`490`	`486`	`case MT_HIERRARHY:`
`491`	`487`	`{`
`492`	`488`	`// Add all children, doesn't perform any tests`
`493`	`489`	`FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;`
`494`		`- I = pV->children.begin();`
`495`		`- E = pV->children.end();`
`496`		`- for (; I != E; I++)`
`497`		`- add_leafs_Dynamic(*I);`
	`490`	`+ for (auto &i : pV->children)`
	`491`	`+ add_leafs_Dynamic(i);`
`498`	`492`	`}`
`499`	`493`	`return;`
`500`	`494`	`case MT_SKELETON_ANIM:`
`@@ -520,10 +514,8 @@ void CRender::add_leafs_Dynamic(dxRender_Visual* pVisual)`
`520`	`514`	`{`
`521`	`515`	`pV->CalculateBones(TRUE);`
`522`	`516`	`pV->CalculateWallmarks(); //. bug?`
`523`		`- I = pV->children.begin();`
`524`		`- E = pV->children.end();`
`525`		`- for (; I != E; I++)`
`526`		`- add_leafs_Dynamic(*I);`
	`517`	`+ for (auto &i : pV->children)`
	`518`	`+ add_leafs_Dynamic(i);`
`527`	`519`	`}`
`528`	`520`	`}`
`529`	`521`	`return;`
`@@ -545,36 +537,30 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)`
`545`	`537`	`return;`
`546`	`538`
`547`	`539`	`// Visual is 100% visible - simply add it`
`548`		`- xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals`
`549`		`-`
`550`	`540`	`switch (pVisual->Type)`
`551`	`541`	`{`
`552`	`542`	`case MT_PARTICLE_GROUP:`
`553`	`543`	`{`
`554`	`544`	`// Add all children, doesn't perform any tests`
`555`	`545`	`PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;`
`556`		`- for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)`
	`546`	`+ for (auto &it : pG->items)`
`557`	`547`	`{`
`558`		`- PS::CParticleGroup::SItem& I = *i_it;`
	`548`	`+ PS::CParticleGroup::SItem& I = it;`
`559`	`549`	`if (I._effect)`
`560`	`550`	`add_leafs_Dynamic(I._effect);`
`561`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`562`		`- pit != I._children_related.end(); pit++)`
`563`		`- add_leafs_Dynamic(*pit);`
`564`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin(); pit != I._children_free.end();`
`565`		`- pit++)`
`566`		`- add_leafs_Dynamic(*pit);`
	`551`	`+ for (auto &pit : I._children_related)`
	`552`	`+ add_leafs_Dynamic(pit);`
	`553`	`+ for (auto &pit : I._children_free)`
	`554`	`+ add_leafs_Dynamic(pit);`
`567`	`555`	`}`
`568`	`556`	`}`
`569`	`557`	`return;`
`570`	`558`	`case MT_HIERRARHY:`
`571`	`559`	`{`
`572`	`560`	`// Add all children, doesn't perform any tests`
`573`	`561`	`FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;`
`574`		`- I = pV->children.begin();`
`575`		`- E = pV->children.end();`
`576`		`- for (; I != E; I++)`
`577`		`- add_leafs_Static(*I);`
	`562`	`+ for (auto &i : pV->children)`
	`563`	`+ add_leafs_Static(i);`
`578`	`564`	`}`
`579`	`565`	`return;`
`580`	`566`	`case MT_SKELETON_ANIM:`
`@@ -583,10 +569,8 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)`
`583`	`569`	`// Add all children, doesn't perform any tests`
`584`	`570`	`CKinematics* pV = (CKinematics*)pVisual;`
`585`	`571`	`pV->CalculateBones(TRUE);`
`586`		`- I = pV->children.begin();`
`587`		`- E = pV->children.end();`
`588`		`- for (; I != E; I++)`
`589`		`- add_leafs_Static(*I);`
	`572`	`+ for (auto &i : pV->children)`
	`573`	`+ add_leafs_Static(i);`
`590`	`574`	`}`
`591`	`575`	`return;`
`592`	`576`	`case MT_LOD:`
`@@ -610,10 +594,8 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)`
`610`	`594`	`#endif`
`611`	`595`	`{`
`612`	`596`	`// Add all children, doesn't perform any tests`
`613`		`- I = pV->children.begin();`
`614`		`- E = pV->children.end();`
`615`		`- for (; I != E; I++)`
`616`		`- add_leafs_Static(*I);`
	`597`	`+ for (auto &i : pV->children)`
	`598`	`+ add_leafs_Static(i);`
`617`	`599`	`}`
`618`	`600`	`}`
`619`	`601`	`return;`
`@@ -648,38 +630,32 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)`
`648`	`630`	`return FALSE;`
`649`	`631`
`650`	`632`	`// If we get here visual is visible or partially visible`
`651`		`- xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals`
`652`		`-`
`653`	`633`	`switch (pVisual->Type)`
`654`	`634`	`{`
`655`	`635`	`case MT_PARTICLE_GROUP:`
`656`	`636`	`{`
`657`	`637`	`// Add all children, doesn't perform any tests`
`658`	`638`	`PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;`
`659`		`- for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)`
	`639`	`+ for (auto &it : pG->items)`
`660`	`640`	`{`
`661`		`- PS::CParticleGroup::SItem& I = *i_it;`
	`641`	`+ PS::CParticleGroup::SItem& I = it;`
`662`	`642`	`if (fcvPartial == VIS)`
`663`	`643`	`{`
`664`	`644`	`if (I._effect)`
`665`	`645`	`add_Dynamic(I._effect, planes);`
`666`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`667`		`- pit != I._children_related.end(); pit++)`
`668`		`- add_Dynamic(*pit, planes);`
`669`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();`
`670`		`- pit != I._children_free.end(); pit++)`
`671`		`- add_Dynamic(*pit, planes);`
	`646`	`+ for (auto &pit : I._children_related)`
	`647`	`+ add_Dynamic(pit, planes);`
	`648`	`+ for (auto &pit : I._children_free)`
	`649`	`+ add_Dynamic(pit, planes);`
`672`	`650`	`}`
`673`	`651`	`else`
`674`	`652`	`{`
`675`	`653`	`if (I._effect)`
`676`	`654`	`add_leafs_Dynamic(I._effect);`
`677`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`678`		`- pit != I._children_related.end(); pit++)`
`679`		`- add_leafs_Dynamic(*pit);`
`680`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();`
`681`		`- pit != I._children_free.end(); pit++)`
`682`		`- add_leafs_Dynamic(*pit);`
	`655`	`+ for (auto &pit : I._children_related)`
	`656`	`+ add_leafs_Dynamic(pit);`
	`657`	`+ for (auto &pit : I._children_free)`
	`658`	`+ add_leafs_Dynamic(pit);`
`683`	`659`	`}`
`684`	`660`	`}`
`685`	`661`	`}`
`@@ -688,17 +664,15 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)`
`688`	`664`	`{`
`689`	`665`	`// Add all children`
`690`	`666`	`FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;`
`691`		`- I = pV->children.begin();`
`692`		`- E = pV->children.end();`
`693`	`667`	`if (fcvPartial == VIS)`
`694`	`668`	`{`
`695`		`- for (; I != E; I++)`
`696`		`- add_Dynamic(*I, planes);`
	`669`	`+ for (auto &i : pV->children)`
	`670`	`+ add_Dynamic(i, planes);`
`697`	`671`	`}`
`698`	`672`	`else`
`699`	`673`	`{`
`700`		`- for (; I != E; I++)`
`701`		`- add_leafs_Dynamic(*I);`
	`674`	`+ for (auto &i : pV->children)`
	`675`	`+ add_leafs_Dynamic(i);`
`702`	`676`	`}`
`703`	`677`	`}`
`704`	`678`	`break;`
`@@ -725,20 +699,9 @@ BOOL CRender::add_Dynamic(dxRender_Visual* pVisual, u32 planes)`
`725`	`699`	`{`
`726`	`700`	`pV->CalculateBones(TRUE);`
`727`	`701`	`pV->CalculateWallmarks(); //. bug?`
`728`		`- I = pV->children.begin();`
`729`		`- E = pV->children.end();`
`730`		`- for (; I != E; I++)`
`731`		`- add_leafs_Dynamic(*I);`
	`702`	`+ for (auto &i : pV->children)`
	`703`	`+ add_leafs_Dynamic(i);`
`732`	`704`	`}`
`733`		`- /*`
`734`		`- I = pV->children.begin ();`
`735`		`- E = pV->children.end ();`
`736`		`- if (fcvPartial==VIS) {`
`737`		`- for (; I!=E; I++) add_Dynamic (*I,planes);`
`738`		`- } else {`
`739`		`- for (; I!=E; I++) add_leafs_Dynamic (*I);`
`740`		`- }`
`741`		`- */`
`742`	`705`	`}`
`743`	`706`	`break;`
`744`	`707`	`default:`
`@@ -764,38 +727,32 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)`
`764`	`727`	`return;`
`765`	`728`
`766`	`729`	`// If we get here visual is visible or partially visible`
`767`		`- xr_vector<dxRender_Visual *>::iterator I, E; // it may be usefull for 'hierrarhy' visuals`
`768`		`-`
`769`	`730`	`switch (pVisual->Type)`
`770`	`731`	`{`
`771`	`732`	`case MT_PARTICLE_GROUP:`
`772`	`733`	`{`
`773`	`734`	`// Add all children, doesn't perform any tests`
`774`	`735`	`PS::CParticleGroup* pG = (PS::CParticleGroup*)pVisual;`
`775`		`- for (auto i_it = pG->items.begin(); i_it != pG->items.end(); i_it++)`
	`736`	`+ for (auto &it : pG->items)`
`776`	`737`	`{`
`777`		`- PS::CParticleGroup::SItem& I = *i_it;`
	`738`	`+ PS::CParticleGroup::SItem& I = it;`
`778`	`739`	`if (fcvPartial == VIS)`
`779`	`740`	`{`
`780`	`741`	`if (I._effect)`
`781`	`742`	`add_Dynamic(I._effect, planes);`
`782`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`783`		`- pit != I._children_related.end(); pit++)`
`784`		`- add_Dynamic(*pit, planes);`
`785`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();`
`786`		`- pit != I._children_free.end(); pit++)`
`787`		`- add_Dynamic(*pit, planes);`
	`743`	`+ for (auto &pit : I._children_related)`
	`744`	`+ add_Dynamic(pit, planes);`
	`745`	`+ for (auto &pit : I._children_free)`
	`746`	`+ add_Dynamic(pit, planes);`
`788`	`747`	`}`
`789`	`748`	`else`
`790`	`749`	`{`
`791`	`750`	`if (I._effect)`
`792`	`751`	`add_leafs_Dynamic(I._effect);`
`793`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_related.begin();`
`794`		`- pit != I._children_related.end(); pit++)`
`795`		`- add_leafs_Dynamic(*pit);`
`796`		`- for (xr_vector<dxRender_Visual*>::iterator pit = I._children_free.begin();`
`797`		`- pit != I._children_free.end(); pit++)`
`798`		`- add_leafs_Dynamic(*pit);`
	`752`	`+ for (auto &pit : I._children_related)`
	`753`	`+ add_leafs_Dynamic(pit);`
	`754`	`+ for (auto &pit : I._children_free)`
	`755`	`+ add_leafs_Dynamic(pit);`
`799`	`756`	`}`
`800`	`757`	`}`
`801`	`758`	`}`
`@@ -804,17 +761,15 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)`
`804`	`761`	`{`
`805`	`762`	`// Add all children`
`806`	`763`	`FHierrarhyVisual* pV = (FHierrarhyVisual*)pVisual;`
`807`		`- I = pV->children.begin();`
`808`		`- E = pV->children.end();`
`809`	`764`	`if (fcvPartial == VIS)`
`810`	`765`	`{`
`811`		`- for (; I != E; I++)`
`812`		`- add_Static(*I, planes);`
	`766`	`+ for (auto &i : pV->children)`
	`767`	`+ add_Static(i, planes);`
`813`	`768`	`}`
`814`	`769`	`else`
`815`	`770`	`{`
`816`		`- for (; I != E; I++)`
`817`		`- add_leafs_Static(*I);`
	`771`	`+ for (auto &i : pV->children)`
	`772`	`+ add_leafs_Static(i);`
`818`	`773`	`}`
`819`	`774`	`}`
`820`	`775`	`break;`
`@@ -824,17 +779,15 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)`
`824`	`779`	`// Add all children, doesn't perform any tests`
`825`	`780`	`CKinematics* pV = (CKinematics*)pVisual;`
`826`	`781`	`pV->CalculateBones(TRUE);`
`827`		`- I = pV->children.begin();`
`828`		`- E = pV->children.end();`
`829`	`782`	`if (fcvPartial == VIS)`
`830`	`783`	`{`
`831`		`- for (; I != E; I++)`
`832`		`- add_Static(*I, planes);`
	`784`	`+ for (auto &i : pV->children)`
	`785`	`+ add_Static(i, planes);`
`833`	`786`	`}`
`834`	`787`	`else`
`835`	`788`	`{`
`836`		`- for (; I != E; I++)`
`837`		`- add_leafs_Static(*I);`
	`789`	`+ for (auto &i : pV->children)`
	`790`	`+ add_leafs_Static(i);`
`838`	`791`	`}`
`839`	`792`	`}`
`840`	`793`	`break;`
`@@ -859,10 +812,8 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)`
`859`	`812`	`#endif`
`860`	`813`	`{`
`861`	`814`	`// Add all children, perform tests`
`862`		`- I = pV->children.begin();`
`863`		`- E = pV->children.end();`
`864`		`- for (; I != E; I++)`
`865`		`- add_leafs_Static(*I);`
	`815`	`+ for (auto &i : pV->children)`
	`816`	`+ add_leafs_Static(i);`
`866`	`817`	`}`
`867`	`818`	`}`
`868`	`819`	`break;`