Skip to content

Commit 4807cad

Browse files
committed
xrCDB: use range-based for
1 parent ad7c518 commit 4807cad

File tree

5 files changed

+11
-18
lines changed

5 files changed

+11
-18
lines changed

src/xrCDB/ISpatial_q_box.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class walker
2323
box.setb(center, size);
2424
space = _space;
2525
}
26+
2627
void walk(ISpatial_NODE* N, Fvector& n_C, float n_R)
2728
{
2829
// box
@@ -33,11 +34,9 @@ class walker
3334
return;
3435

3536
// test items
36-
xr_vector<ISpatial*>::iterator _it = N->items.begin();
37-
xr_vector<ISpatial*>::iterator _end = N->items.end();
38-
for (; _it != _end; _it++)
37+
for (auto& it : N->items)
3938
{
40-
ISpatial* S = *_it;
39+
ISpatial* S = it;
4140
if (0 == (S->GetSpatialData().type & mask))
4241
continue;
4342

src/xrCDB/ISpatial_q_frustum.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ class walker
2929
return;
3030

3131
// test items
32-
xr_vector<ISpatial*>::iterator _it = N->items.begin();
33-
xr_vector<ISpatial*>::iterator _end = N->items.end();
34-
for (; _it != _end; _it++)
32+
for (auto& it : N->items)
3533
{
36-
ISpatial* S = *_it;
34+
ISpatial* S = it;
3735
if (0 == (S->GetSpatialData().type & mask))
3836
continue;
3937

src/xrCDB/ISpatial_q_ray.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,9 @@ class _MM_ALIGN16 walker
290290
}
291291

292292
// test items
293-
xr_vector<ISpatial*>::iterator _it = N->items.begin();
294-
xr_vector<ISpatial*>::iterator _end = N->items.end();
295-
for (; _it != _end; _it++)
293+
for (auto& it : N->items)
296294
{
297-
ISpatial* S = *_it;
295+
ISpatial* S = it;
298296
if (mask != (S->GetSpatialData().type & mask))
299297
continue;
300298
Fsphere& sS = S->GetSpatialData().sphere;

src/xrCDB/xrCDB_Collector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ u32 Collector::VPack(const Fvector& V, float eps)
1515
for (; I != E; I++)
1616
if (I->similar(V, eps))
1717
return u32(I - verts.begin());
18+
1819
verts.push_back(V);
1920
return verts.size() - 1;
2021
}
@@ -364,8 +365,7 @@ u32 CollectorPacked::VPack(const Fvector& V)
364365
clamp(iz, (u32)0, clpMZ);
365366

366367
{
367-
DWORDList* vl;
368-
vl = &(VM[ix][iy][iz]);
368+
DWORDList* vl = &(VM[ix][iy][iz]);
369369
for (DWORDIt it = vl->begin(); it != vl->end(); it++)
370370
if (verts[*it].similar(V))
371371
{

src/xrCDB/xr_area.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ int CObjectSpace::GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<IGameObj
5858
g_SpatialSpace->q_box(q_spatial, 0, STYPE_COLLIDEABLE, point, B);
5959

6060
// Iterate
61-
xr_vector<ISpatial*>::iterator it = q_spatial.begin();
62-
xr_vector<ISpatial*>::iterator end = q_spatial.end();
63-
for (; it != end; it++)
61+
for (auto& it : q_spatial)
6462
{
65-
IGameObject* O = (*it)->dcast_GameObject();
63+
IGameObject* O = it->dcast_GameObject();
6664
if (0 == O)
6765
continue;
6866
if (O == ignore_object)

0 commit comments

Comments
 (0)