0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to disable random animation shift in animated terrains.

Browse source 
Use a new key random_start (default = yes) in
[terrain_graphics][image]
This commit is contained in:
Ali El Gariani 2010-10-23 17:07:58 +00:00
parent 9dfc355f1b
commit ae642a5553
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/builder.cpp
View file

@ -82,7 +82,8 @@ void terrain_builder::tile::rebuild_cache(const std::string& tod, logs* log)
///@TODO improve this
unsigned int rnd = ri.rand / 7919; //just the 1000th prime
img_list.push_back(variant.images[rnd % variant.images.size()]);
img_list.back().set_animation_time(ri.rand % img_list.back().get_animation_duration());
if(variant.random_start)
img_list.back().set_animation_time(ri.rand % img_list.back().get_animation_duration());
if(log) {
log->push_back(std::make_pair(&ri, &variant));
@ -563,11 +564,12 @@ void terrain_builder::rotate_rule(building_rule &ret, int angle,
replace_rotate_tokens(ret, angle, rot);
}
terrain_builder::rule_image_variant::rule_image_variant(const std::string &image_string, const std::string& variations, const std::string& tod) :
terrain_builder::rule_image_variant::rule_image_variant(const std::string &image_string, const std::string& variations, const std::string& tod, bool random_start) :
image_string(image_string),
variations(variations),
images(),
tods()
tods(),
random_start(random_start)
{
if(!tod.empty()) {
const std::vector<std::string> tod_list = utils::split(tod);
@ -607,15 +609,17 @@ void terrain_builder::add_images_from_config(rule_imagelist& images, const confi
const std::string &name = variant["name"];
const std::string &variations = img["variations"];
const std::string &tod = variant["tod"];
bool random_start = variant["random_start"].to_bool(true);
images.back().variants.push_back(rule_image_variant(name, variations, tod));
images.back().variants.push_back(rule_image_variant(name, variations, tod, random_start));
}
// Adds the main (default) variant of the image at the end,
// (will be used only if previous variants don't match)
const std::string &name = img["name"];
const std::string &variations = img["variations"];
images.back().variants.push_back(rule_image_variant(name, variations));
bool random_start = img["random_start"].to_bool(true);
images.back().variants.push_back(rule_image_variant(name, variations, random_start));
}
}

10
src/builder.hpp
View file

@ -159,15 +159,16 @@ public:
*/
struct rule_image_variant {
/** Constructor for the normal defaut case */
rule_image_variant(const std::string &image_string, const std::string& variations) :
rule_image_variant(const std::string &image_string, const std::string& variations, bool random_start = true) :
image_string(image_string),
variations(variations),
images(),
tods()
tods(),
random_start(random_start)
{};
/** Constructor for true [variant] cases */
rule_image_variant(const std::string &image_string, const std::string& variations, const std::string& tod);
rule_image_variant(const std::string &image_string, const std::string& variations, const std::string& tod, bool random_start = true);
/** A string representing either the filename for an image, or
* a list of images, with an optional timing for each image.
@ -201,6 +202,9 @@ public:
/** The Time of Day associated to this variant (if any)*/
std::set<std::string> tods;
/** Indicate if the animation uses a random shift */
bool random_start;
};
/**