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

Tests for reading and writing map data

Browse Source 
- Fix saving and loading boat/horse positions and property flag
This commit is contained in:
Celtic Minstrel
2015-07-09 15:53:34 -04:00
parent 66a5302515
commit c957987b45
10 changed files with 316 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/fileio_scen.cpp
View File

@@ -45,6 +45,8 @@ static bool load_scenario_v2(fs::path file_to_load, cScenario& scenario, bool on
// Some of these are non-static so that the test cases can access them.
ticpp::Document xmlDocFromStream(std::istream& stream, std::string name);
void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario);
void loadOutMapData(map_data&& data, location which, cScenario& scen);
void loadTownMapData(map_data&& data, int which, cScenario& scen);
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) {
// Before loading a scenario, we may need to pop scenario resource paths.
@@ -1811,7 +1813,7 @@ static void readDialogueFromXml(ticpp::Document&& data, cSpeech& talk, int town_
}
}
static void loadOutMapData(map_data&& data, location which, cScenario& scen) {
void loadOutMapData(map_data&& data, location which, cScenario& scen) {
cOutdoors& out = *scen.outdoors[which.x][which.y];
int num_towns = 0;
for(int x = 0; x < 48; x++) {
@@ -1823,7 +1825,7 @@ static void loadOutMapData(map_data&& data, location which, cScenario& scen) {
cVehicle* what;
switch(feat.first) {
// Special values
case eMapFeature::NONE: case eMapFeature::VEHICLE:
case eMapFeature::NONE:
break;
// Town-only features
case eMapFeature::ENTRANCE_EAST: case eMapFeature::ENTRANCE_NORTH: case eMapFeature::ENTRANCE_SOUTH:
@@ -1842,11 +1844,11 @@ static void loadOutMapData(map_data&& data, location which, cScenario& scen) {
case eMapFeature::BOAT:
is_boat = true;
case eMapFeature::HORSE:
what = &(is_boat ? scen.boats : scen.horses)[feat.second % 10000];
what = &(is_boat ? scen.boats : scen.horses)[abs(feat.second)];
what->which_town = 200;
what->sector = which;
what->loc_in_sec = loc(x,y);
what->property = feat.second >= 10000;
what->property = feat.second < 0;
break;
case eMapFeature::FIELD:
if(feat.second == SPECIAL_SPOT)
@@ -1869,7 +1871,7 @@ static void loadOutMapData(map_data&& data, location which, cScenario& scen) {
}
}
static void loadTownMapData(map_data&& data, int which, cScenario& scen) {
void loadTownMapData(map_data&& data, int which, cScenario& scen) {
cTown& town = *scen.towns[which];
for(int x = 0; x < town.max_dim(); x++) {
for(int y = 0; y < town.max_dim(); y++) {
@@ -1880,7 +1882,7 @@ static void loadTownMapData(map_data&& data, int which, cScenario& scen) {
cVehicle* what;
switch(feat.first) {
// Special values
case eMapFeature::NONE: case eMapFeature::VEHICLE:
case eMapFeature::NONE:
break;
// Outdoor-only features
case eMapFeature::TOWN: break;
@@ -1890,10 +1892,10 @@ static void loadTownMapData(map_data&& data, int which, cScenario& scen) {
case eMapFeature::BOAT:
is_boat = true;
case eMapFeature::HORSE:
what = &(is_boat ? scen.boats : scen.horses)[feat.second % 10000];
what = &(is_boat ? scen.boats : scen.horses)[abs(feat.second)];
what->which_town = which;
what->loc = loc(x,y);
what->property = feat.second >= 10000;
what->property = feat.second < 0;
break;
case eMapFeature::SIGN:
if(feat.second >= town.sign_locs.size())

20
src/tools/map_parse.cpp
View File

@@ -53,7 +53,7 @@ map_data load_map(std::istream& fin, bool isTown, std::string name) {
data.set(col, row, n);
else {
if((curFeature == eMapFeature::BOAT || curFeature == eMapFeature::HORSE) && !vehicle_owned)
n += 10000;
n *= -1;
data.addFeature(col, row, curFeature, n);
}
n = 0;
@@ -71,18 +71,16 @@ map_data load_map(std::istream& fin, bool isTown, std::string name) {
curFeature = eMapFeature::FIELD;
} else if(c == '$') {
curFeature = eMapFeature::CREATURE;
} else if(c == '~') {
curFeature = eMapFeature::VEHICLE;
} else if(c == 'h' && curFeature == eMapFeature::VEHICLE) {
} else if(c == 'h') {
vehicle_owned = true;
curFeature = eMapFeature::HORSE;
} else if(c == 'H' && curFeature == eMapFeature::VEHICLE) {
} else if(c == 'H') {
vehicle_owned = false;
curFeature = eMapFeature::HORSE;
} else if(c == 'b' && curFeature == eMapFeature::VEHICLE) {
} else if(c == 'b') {
vehicle_owned = true;
curFeature = eMapFeature::BOAT;
} else if(c == 'B' && curFeature == eMapFeature::VEHICLE) {
} else if(c == 'B') {
vehicle_owned = false;
curFeature = eMapFeature::BOAT;
} else if(c == ',') {
@@ -97,7 +95,7 @@ map_data load_map(std::istream& fin, bool isTown, std::string name) {
data.set(col, row, n);
else {
if((curFeature == eMapFeature::BOAT || curFeature == eMapFeature::HORSE) && !vehicle_owned)
n += 10000;
n *= -1;
data.addFeature(col, row, curFeature, n);
}
row++;
@@ -150,7 +148,7 @@ void map_data::writeTo(std::ostream& out) {
out << grid[y][x];
for(auto feat : getFeatures(x,y)) {
switch(feat.first) {
case eMapFeature::NONE: case eMapFeature::VEHICLE: break;
case eMapFeature::NONE: break;
case eMapFeature::SPECIAL_NODE: out << ':' << feat.second; break;
case eMapFeature::SIGN: out << '!' << feat.second; break;
case eMapFeature::WANDERING: out << '*' << feat.second; break;
@@ -161,8 +159,8 @@ void map_data::writeTo(std::ostream& out) {
case eMapFeature::ENTRANCE_NORTH: out << '^'; break;
case eMapFeature::ENTRANCE_SOUTH: out << 'v'; break;
case eMapFeature::ENTRANCE_WEST: out << '<'; break;
case eMapFeature::BOAT: out << (feat.second < 0 ? 'b' : 'B') << abs(feat.second); break;
case eMapFeature::HORSE: out << (feat.second < 0 ? 'h' : 'H') << abs(feat.second); break;
case eMapFeature::BOAT: out << (feat.second > 0 ? 'b' : 'B') << abs(feat.second); break;
case eMapFeature::HORSE: out << (feat.second > 0 ? 'h' : 'H') << abs(feat.second); break;
}
}
}

1
src/tools/map_parse.hpp
View File

@@ -20,7 +20,6 @@ enum class eMapFeature {
SIGN,
WANDERING,
TOWN,
VEHICLE, // Another special value that shouldn't appear in the map
BOAT,
HORSE,
ENTRANCE_NORTH,