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

Make a lot of code stop relying on hard-coded sizes

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-01 17:19:52 -05:00
parent 15a802f63d
commit c37ede5a04
17 changed files with 153 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scenedit/scen.fileio.cpp
View File

@@ -686,9 +686,9 @@ map_data buildOutMapData(location which) {
terrain.addFeature(x, y, eMapFeature::FIELD, SPECIAL_SPOT);
}
}
for(size_t i = 0; i < 18; i++) {
if(sector.special_id[i] >= 0)
terrain.addFeature(sector.special_locs[i].x, sector.special_locs[i].y, eMapFeature::SPECIAL_NODE, sector.special_id[i]);
for(size_t i = 0; i < sector.special_locs.size(); i++) {
if(sector.special_locs[i].spec >= 0)
terrain.addFeature(sector.special_locs[i].x, sector.special_locs[i].y, eMapFeature::SPECIAL_NODE, sector.special_locs[i].spec);
}
for(size_t i = 0; i < 8; i++) {
if(sector.exit_dests[i] >= 0)
@@ -724,9 +724,9 @@ map_data buildTownMapData(size_t which) {
terrain.set(x, y, town.terrain(x,y));
}
}
for(size_t i = 0; i < 50; i++) {
if(town.spec_id[i] >= 0)
terrain.addFeature(town.special_locs[i].x, town.special_locs[i].y, eMapFeature::SPECIAL_NODE, town.spec_id[i]);
for(size_t i = 0; i < town.special_locs.size(); i++) {
if(town.special_locs[i].spec >= 0)
terrain.addFeature(town.special_locs[i].x, town.special_locs[i].y, eMapFeature::SPECIAL_NODE, town.special_locs[i].spec);
}
for(size_t i = 0; i < town.sign_strs.size(); i++) {
if(!town.sign_strs[i].empty())