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

Fix several bugs introduced by refactoring

Browse Source
This commit is contained in:
Celtic Minstrel
2016-09-03 12:40:48 -04:00
parent 88d6afce27
commit 5cce71df26
22 changed files with 328 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/fileio_scen.cpp
View File

@@ -1896,6 +1896,7 @@ void loadOutMapData(map_data&& data, location which, cScenario& scen) {
case eMapFeature::BOAT:
is_boat = true;
case eMapFeature::HORSE:
(is_boat ? scen.boats : scen.horses).resize(abs(feat.second));
what = &(is_boat ? scen.boats : scen.horses)[abs(feat.second) - 1];
what->which_town = 200;
what->sector = which;
@@ -1943,6 +1944,7 @@ void loadTownMapData(map_data&& data, int which, cScenario& scen) {
case eMapFeature::BOAT:
is_boat = true;
case eMapFeature::HORSE:
(is_boat ? scen.boats : scen.horses).resize(abs(feat.second));
what = &(is_boat ? scen.boats : scen.horses)[abs(feat.second) - 1];
what->which_town = which;
what->loc = loc(x,y);