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

fix bug #11561 all animations using highlight were broken

Browse source
This commit is contained in:
Jérémy Rosen 2008-04-23 21:54:00 +00:00
parent 3a41dc633d
commit b3b4cf8e14
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/unit_frame.cpp
View file

@ -487,7 +487,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time,const frame
result.blend_ratio = current_value.blend_ratio?current_value.blend_ratio:animation_val.blend_ratio;
if(primary && engine_val.blend_ratio) result.blend_ratio += engine_val.blend_ratio;
result.highlight_ratio = current_value.highlight_ratio!=0.0?current_value.highlight_ratio:animation_val.highlight_ratio;
result.highlight_ratio = current_value.highlight_ratio!=1.0?current_value.highlight_ratio:animation_val.highlight_ratio;
if(primary && engine_val.highlight_ratio != 1.0) result.highlight_ratio = result.highlight_ratio +engine_val.highlight_ratio - 1.0; // selected unit
assert(engine_val.offset == 0);