openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Update swap functions to recommended ADL-friendly format

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-24 20:33:38 -05:00
parent 64c7e4a5a0
commit d5ea213edd
12 changed files with 186 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/scenedit/scen.townout.cpp
View File

@@ -1246,12 +1246,13 @@ static bool pick_out_event_filter(cDialog& me, std::string item_hit, location& c
if(cur_loc.y >= scenario.outdoors.height() - 1) beep();
else cur_loc.y++;
} else if(item_hit == "choose") {
using std::swap;
int i = cur_loc.x * scenario.outdoors.height() + cur_loc.y;
if(&scenario != &::scenario)
scenario.outdoors.swap(::scenario.outdoors);
swap(scenario.outdoors, ::scenario.outdoors);
i = choose_text(STRT_SECTOR, i, &me, "Which sector?");
if(&scenario != &::scenario)
scenario.outdoors.swap(::scenario.outdoors);
swap(scenario.outdoors, ::scenario.outdoors);
cur_loc.x = i / scenario.outdoors.height();
cur_loc.y = i % scenario.outdoors.height();
}