TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use range_for for medwall CountedWalls

Browse source
This commit is contained in:
Kp 2016-01-26 03:45:08 +00:00
parent 5a1791f7c3
commit 38bc1fb28f
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
similar/editor/medwall.cpp
View file

@ -909,15 +909,12 @@ int wall_unlink_door()
} }
#define DIAGNOSTIC_MESSAGE_MAX 150
int check_walls() int check_walls()
{ {
int wall_count, trigger_count;
count_wall CountedWalls[MAX_WALLS]; count_wall CountedWalls[MAX_WALLS];
int matcen_num; int matcen_num;
wall_count = 0; unsigned wall_count = 0;
range_for (const auto &&segp, highest_valid(vsegptridx)) range_for (const auto &&segp, highest_valid(vsegptridx))
{ {
if (segp->segnum != segment_none) { if (segp->segnum != segment_none) {
@ -950,21 +947,23 @@ int check_walls()
} }
// Check validity of Walls array. // Check validity of Walls array.
for (int w=0; w<Num_walls; w++) { range_for (auto &cw, partial_range(CountedWalls, Num_walls))
if ((Walls[CountedWalls[w].wallnum].segnum != CountedWalls[w].segnum) || {
(Walls[CountedWalls[w].wallnum].sidenum != CountedWalls[w].sidenum)) { if (Walls[cw.wallnum].segnum != cw.segnum || Walls[cw.wallnum].sidenum != cw.sidenum)
{
if (ui_messagebox( -2, -2, 2, "Unmatched wall detected\nDo you wish to correct it?\n", "Yes", "No") == 1) if (ui_messagebox( -2, -2, 2, "Unmatched wall detected\nDo you wish to correct it?\n", "Yes", "No") == 1)
{ {
Walls[CountedWalls[w].wallnum].segnum = CountedWalls[w].segnum; Walls[cw.wallnum].segnum = cw.segnum;
Walls[CountedWalls[w].wallnum].sidenum = CountedWalls[w].sidenum; Walls[cw.wallnum].sidenum = cw.sidenum;
} }
} }
} }
trigger_count = 0; const auto &&used_walls = partial_range(Walls, wall_count);
for (int w1=0; w1<wall_count; w1++) { const auto predicate = [](const wall &w) {
if (Walls[w1].trigger != trigger_none) trigger_count++; return w.trigger != trigger_none;
} };
unsigned trigger_count = std::count_if(used_walls.begin(), used_walls.end(), predicate);
if (trigger_count != Num_triggers) { if (trigger_count != Num_triggers) {
if (ui_messagebox(-2, -2, 2, "Num_triggers is bogus\nDo you wish to correct it?\n", "Yes", "No") == 1) if (ui_messagebox(-2, -2, 2, "Num_triggers is bogus\nDo you wish to correct it?\n", "Yes", "No") == 1)
@ -985,8 +984,8 @@ int delete_all_walls()
{ {
range_for (const auto &&segp, highest_valid(vsegptr)) range_for (const auto &&segp, highest_valid(vsegptr))
{ {
for (int side=0;side<MAX_SIDES_PER_SEGMENT;side++) range_for (auto &side, segp->sides)
segp->sides[side].wall_num = wall_none; side.wall_num = wall_none;
} }
Num_walls=0; Num_walls=0;
Num_triggers=0; Num_triggers=0;