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

fixed macros/sound-utils.cfg sound start times...

Browse source 
...by setting minimum length animation frame to 1
This commit is contained in:
David Mikos 2013-03-10 21:05:30 +00:00
parent d2ee57db43
commit 3ff04c671c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/core/macros/sound-utils.cfg
View file

@ -508,7 +508,6 @@ zombie-hit-[1~6].ogg #enddef
duration=1
[/slowed_sound_frame]
[slowed_sound_frame]
duration=100
sound=slowed.wav
[/slowed_sound_frame]
[/if]
@ -534,7 +533,6 @@ zombie-hit-[1~6].ogg #enddef
duration=1
[/poisoned_sound_frame]
[poisoned_sound_frame]
duration=100
sound=poison.ogg
[/poisoned_sound_frame]
[/if]
@ -549,6 +547,9 @@ zombie-hit-[1~6].ogg #enddef
attack_sound_start_time={TIME}
[attack_sound_frame]
duration=1
[/attack_sound_frame]
[attack_sound_frame]
sound={HITSOUND}
[/attack_sound_frame]
@ -558,6 +559,9 @@ zombie-hit-[1~6].ogg #enddef
attack_sound_start_time={TIME}
[attack_sound_frame]
duration=1
[/attack_sound_frame]
[attack_sound_frame]
sound={MISSSOUND}
[/attack_sound_frame]

1
src/unit_frame.cpp
View file

@ -299,6 +299,7 @@ frame_builder::frame_builder(const config& cfg,const std::string& frame_string)
} else {
duration(cfg[frame_string + "end"].to_int() - cfg[frame_string + "begin"].to_int());
}
duration_ = std::max(duration_,1);
color = utils::split(cfg[frame_string + "blend_color"]);
if (color.size() == 3) {