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

fix slight bug in handling of image mods

Browse source
This commit is contained in:
Jérémy Rosen 2008-10-13 17:14:23 +00:00
parent 1710292e2a
commit da7b24de21
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/unit_frame.cpp
View file

@ -516,10 +516,8 @@ const frame_parameters unit_frame::merge_parameters(int current_time,const frame
if(!engine_val.image_diagonal.is_void() && !engine_val.image_diagonal.get_filename().empty()) result.image_diagonal = engine_val.image_diagonal;
/** engine provides a string for "stoned" and "team color" modifications */
if(primary) {
result.image_mod = current_val.image_mod +animation_val.image_mod;
result.image_mod += engine_val.image_mod;
}
if(primary) result.image_mod += engine_val.image_mod;
assert(engine_val.halo.empty());
result.halo = current_val.halo.empty()?animation_val.halo:current_val.halo;