upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-12 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing variation only applied on the first frame of animated terrains

Browse Source 
(this should animate water transitions)
This commit is contained in:
Ali El Gariani 2010-08-27 20:48:16 +00:00
parent de03f3010d
commit a4fa8eb499
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/builder.cpp
View File

@ -322,10 +322,13 @@ static std::vector<std::string> get_variations(const std::string& base, const st
}
std::vector<std::string> vars = utils::split(variations, ';', 0);
const std::string prefix(base, 0, pos);
const std::string postfix(base, pos+2, std::string::npos);
foreach(std::string& v, vars){
res.push_back(prefix + v + postfix);
foreach(const std::string& v, vars){
res.push_back(base);
std::string::size_type pos = 0;
while ((pos = res.back().find("@V", pos)) != std::string::npos) {
res.back().replace(pos, 2, v);
pos += v.size();
}
}
return res;
}
@ -345,7 +348,6 @@ bool terrain_builder::load_images(building_rule &rule)
foreach(rule_image_variant& variant, ri.variants)
{
//std::vector<std::string> var_strings = utils::split(variant.image_string, ';');
std::vector<std::string> var_strings = get_variations(variant.image_string, variant.variations);
foreach(const std::string& var, var_strings)
{