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

Allowed customization of healing_sound and healed_sound in unit types

Browse source
This commit is contained in:
Bär Halberkamp 2013-11-14 11:32:56 +01:00
parent 8292a0abe8
commit 4f405f7c53
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/unit_animation.cpp
View file

@ -567,11 +567,24 @@ void unit_animation::fill_initial_animations( std::vector<unit_animation> & anim
animations.back().unit_anim_.override(0,150,particule::NO_CYCLE,"0~1:150,1");
animations.back().event_ = utils::split("post_teleport");
animations.push_back(*itor);
animations.back().event_ = utils::split("healing");
animations.back().sub_anims_["_healing_sound"] = particule();
std::string healing_sound;
if (cfg["healing_sound"].empty()) {
healing_sound = "heal.wav";
} else {
healing_sound = cfg["healing_sound"].str();
}
animations.back().sub_anims_["_healing_sound"].add_frame(1,frame_builder().sound(healing_sound),true);
animations.push_back(*itor);
animations.back().event_ = utils::split("healed");
animations.back().unit_anim_.override(0,300,particule::NO_CYCLE,"","0:30,0.5:30,0:30,0.5:30,0:30,0.5:30,0:30,0.5:30,0:30",display::rgb(255,255,255));
animations.back().sub_anims_["_healed_sound"] = particule();
animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true);
if(!cfg["healed_sound"].empty()) {
animations.back().sub_anims_["_healed_sound"] = particule();
animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound(cfg["healed_sound"]),true);
}
animations.push_back(*itor);
animations.back().event_ = utils::split("poisoned");
@ -646,6 +659,14 @@ void unit_animation::add_anims( std::vector<unit_animation> & animations, const
if (anim["layer"].empty()) anim["layer"] = default_layer;
anim["value"] = anim["damage"];
animations.push_back(unit_animation(anim));
animations.back().sub_anims_["_healing_sound"] = particule();
std::string healing_sound;
if (cfg["healing_sound"].empty()) {
healing_sound = "heal.wav";
} else {
healing_sound = cfg["healing_sound"].str();
}
animations.back().sub_anims_["_healing_sound"].add_frame(1,frame_builder().sound(healing_sound),true);
}
BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
@ -655,8 +676,10 @@ void unit_animation::add_anims( std::vector<unit_animation> & animations, const
if (anim["layer"].empty()) anim["layer"] = default_layer;
anim["value"] = anim["healing"];
animations.push_back(unit_animation(anim));
animations.back().sub_anims_["_healed_sound"] = particule();
animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true);
if(!cfg["healed_sound"].empty()) {
animations.back().sub_anims_["_healed_sound"] = particule();
animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound(cfg["healed_sound"]),true);
}
}
BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "poison_anim"))