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

Fix boats/horses not appearing

Browse Source
This commit is contained in:
Celtic Minstrel
2017-04-11 20:03:54 -04:00
parent d85321747d
commit 945a7a9e5a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/universe.cpp
View File

@@ -1326,6 +1326,8 @@ void cUniverse::enter_scenario(const std::string& name) {
party.i_w_c = {0, 0}; party.i_w_c = {0, 0};
party.loc_in_sec = scenario.out_start; party.loc_in_sec = scenario.out_start;
party.out_loc = scenario.out_start; party.out_loc = scenario.out_start;
party.boats.clear();
party.horses.clear();
std::copy_if(scenario.boats.begin(), scenario.boats.end(), std::back_inserter(party.boats), std::bind(&cVehicle::exists, _1)); std::copy_if(scenario.boats.begin(), scenario.boats.end(), std::back_inserter(party.boats), std::bind(&cVehicle::exists, _1));
std::copy_if(scenario.horses.begin(), scenario.horses.end(), std::back_inserter(party.horses), std::bind(&cVehicle::exists, _1)); std::copy_if(scenario.horses.begin(), scenario.horses.end(), std::back_inserter(party.horses), std::bind(&cVehicle::exists, _1));
for(auto& pc : party) { for(auto& pc : party) {

2
src/tools/fileio_scen.cpp
View File

@@ -1942,6 +1942,7 @@ void loadOutMapData(map_data&& data, location which, cScenario& scen) {
what->sector = which; what->sector = which;
what->loc = loc(x,y); what->loc = loc(x,y);
what->property = feat.second < 0; what->property = feat.second < 0;
what->exists = true;
break; break;
case eMapFeature::FIELD: case eMapFeature::FIELD:
if(feat.second == SPECIAL_SPOT) if(feat.second == SPECIAL_SPOT)
@@ -1989,6 +1990,7 @@ void loadTownMapData(map_data&& data, int which, cScenario& scen) {
what->which_town = which; what->which_town = which;
what->loc = loc(x,y); what->loc = loc(x,y);
what->property = feat.second < 0; what->property = feat.second < 0;
what->exists = true;
break; break;
case eMapFeature::SIGN: case eMapFeature::SIGN:
if(feat.second >= town.sign_locs.size()) if(feat.second >= town.sign_locs.size())