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

- WeightedRule optimization - part 1

Browse Source 
- comments, style
This commit is contained in:
DjWarmonger
2016-08-11 07:49:08 +02:00
parent 25fd4d85e2
commit 2410f0af61
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapping/CMapEditManager.cpp
View File

@ -321,16 +321,16 @@ TerrainViewPattern::TerrainViewPattern() : diffImages(false), rotationTypesCount
maxPoints = std::numeric_limits<int>::max();
}
TerrainViewPattern::WeightedRule::WeightedRule() : points(0)
TerrainViewPattern::WeightedRule::WeightedRule(std::string &Name) : points(0), name(Name)
{
standardRule = (TerrainViewPattern::RULE_ANY == name || TerrainViewPattern::RULE_DIRT == name
|| TerrainViewPattern::RULE_NATIVE == name || TerrainViewPattern::RULE_SAND == name
|| TerrainViewPattern::RULE_TRANSITION == name || TerrainViewPattern::RULE_NATIVE_STRONG == name);
}
bool TerrainViewPattern::WeightedRule::isStandardRule() const
{
return TerrainViewPattern::RULE_ANY == name || TerrainViewPattern::RULE_DIRT == name
|| TerrainViewPattern::RULE_NATIVE == name || TerrainViewPattern::RULE_SAND == name
|| TerrainViewPattern::RULE_TRANSITION == name || TerrainViewPattern::RULE_NATIVE_STRONG == name;
return standardRule;
}
CTerrainViewPatternConfig::CTerrainViewPatternConfig()
@ -357,8 +357,7 @@ CTerrainViewPatternConfig::CTerrainViewPatternConfig()
{
std::vector<std::string> ruleParts;
boost::split(ruleParts, ruleStr, boost::is_any_of("-"));
TerrainViewPattern::WeightedRule rule;
rule.name = ruleParts[0];
TerrainViewPattern::WeightedRule rule(ruleParts[0]);
assert(!rule.name.empty());
if(ruleParts.size() > 1)
{