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

Fix wall_remove_side bogus use of IS_CHILD on wallnum

Browse source 
IS_CHILD is for segments, not walls.
This commit is contained in:
Kp 2016-07-21 01:43:20 +00:00
parent 7bb63324bd
commit c854c25d44
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
similar/editor/medwall.cpp
View file

@ -624,18 +624,19 @@ int wall_restore_all()
// Remove a specific side. // Remove a specific side.
int wall_remove_side(const vsegptridx_t seg, short side) int wall_remove_side(const vsegptridx_t seg, short side)
{ {
if (IS_CHILD(seg->children[side]) && IS_CHILD(seg->sides[side].wall_num)) { if (IS_CHILD(seg->children[side]) && seg->sides[side].wall_num != wall_none)
{
const auto &&csegp = vsegptr(seg->children[side]); const auto &&csegp = vsegptr(seg->children[side]);
auto Connectside = find_connect_side(seg, csegp); const auto Connectside = find_connect_side(seg, csegp);
remove_trigger(seg, side); remove_trigger(seg, side);
remove_trigger(csegp, Connectside); remove_trigger(csegp, Connectside);
// Remove walls 'wall_num' and connecting side 'wall_num' // Remove walls 'wall_num' and connecting side 'wall_num'
// from Walls array. // from Walls array.
auto lower_wallnum = seg->sides[side].wall_num; const auto wall0 = seg->sides[side].wall_num;
if (csegp->sides[Connectside].wall_num < lower_wallnum) const auto wall1 = csegp->sides[Connectside].wall_num;
lower_wallnum = csegp->sides[Connectside].wall_num; const auto lower_wallnum = (wall0 < wall1) ? wall0 : wall1;
{ {
const auto linked_wall = vcwallptr(lower_wallnum)->linked_wall; const auto linked_wall = vcwallptr(lower_wallnum)->linked_wall;
@ -657,9 +658,9 @@ int wall_remove_side(const vsegptridx_t seg, short side)
range_for (const auto &&segp, vsegptr) range_for (const auto &&segp, vsegptr)
{ {
if (segp->segnum != segment_none) if (segp->segnum != segment_none)
for (int w=0;w<MAX_SIDES_PER_SEGMENT;w++) range_for (auto &w, segp->sides)
if (segp->sides[w].wall_num > lower_wallnum+1) if (w.wall_num > lower_wallnum+1)
segp->sides[w].wall_num -= 2; w.wall_num -= 2;
} }
// Destroy any links to the deleted wall. // Destroy any links to the deleted wall.