games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos().

Browse Source
This commit is contained in:
Frank Zago
2011-09-04 18:07:26 +00:00
parent 34698eee4d
commit 2ae53395d7
2 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/CGameState.cpp
View File

@@ -1739,23 +1739,25 @@ void CGameState::loadTownDInfos()
{
int i;
const JsonNode config(DATA_DIR "/config/towns_defs.json");
JsonVector vec = config["town_defnames"].Vector();
assert(vec.size() == F_NUMBER);
for (i = 0; i < vec.size(); ++i) {
villages[i] = new CGDefInfo(*VLC->dobjinfo->castles[i]);
forts[i] = VLC->dobjinfo->castles[i];
map->defy.push_back(forts[i]);
capitols[i] = new CGDefInfo(*VLC->dobjinfo->castles[i]);
}
assert(config["town_defnames"].Vector().size() == F_NUMBER);
i = 0;
BOOST_FOREACH(const JsonNode &t, vec) {
BOOST_FOREACH(const JsonNode &t, config["town_defnames"].Vector())
{
villages[i] = new CGDefInfo(*VLC->dobjinfo->castles[i]);
villages[i]->name = t["village"].String();
map->defy.push_back(villages[i]);
forts[i] = VLC->dobjinfo->castles[i];
map->defy.push_back(forts[i]);
capitols[i] = new CGDefInfo(*VLC->dobjinfo->castles[i]);
capitols[i]->name = t["capitol"].String();
++i;
map->defy.push_back(capitols[i]);
++i;
}
for (i = 0; i < vec.size(); ++i) map->defy.push_back(villages[i]);
for (i = 0; i < vec.size(); ++i) map->defy.push_back(capitols[i]);
}
void CGameState::getNeighbours(const TerrainTile &srct, int3 tile, std::vector<int3> &vec, const boost::logic::tribool &onLand, bool limitCoastSailing)