games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

gcc 4.5 compatibility fixes. Mostly due to lack of fully finctional nullptr class

Browse Source
This commit is contained in:
Ivan Savenko
2013-06-19 21:26:27 +00:00
parent 6a88604937
commit 6737c270c9
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CMapEditManager.cpp
View File

@ -327,9 +327,9 @@ CTerrainViewPatternConfig::CTerrainViewPatternConfig()
// Read pattern data
const JsonVector & data = ptrnNode["data"].Vector();
assert(data.size() == 9);
for(int i = 0; i < data.size(); ++i)
for(int j = 0; j < data.size(); ++j)
{
std::string cell = data[i].String();
std::string cell = data[j].String();
boost::algorithm::erase_all(cell, " ");
std::vector<std::string> rules;
boost::split(rules, cell, boost::is_any_of(","));
@ -344,7 +344,7 @@ CTerrainViewPatternConfig::CTerrainViewPatternConfig()
{
rule.points = boost::lexical_cast<int>(ruleParts[1]);
}
pattern.data[i].push_back(rule);
pattern.data[j].push_back(rule);
}
}