upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 17:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug that prevented fade-out on death anims from working properly

Browse Source
This commit is contained in:
Jérémy Rosen 2007-03-11 23:45:55 +00:00
parent 714732a2d3
commit 4a27d1d3b8
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -11,6 +11,7 @@ Version 1.3.1+svn:
lagging
* improved the look of the main menu and tips of the day boxes in the title
screen
* bugfix: units will now fade out properly at the end of death animations
* language and i18n:
* updated translations: Bulgarian, Czech, Danish, Dutch, German, Italian,
Norwegian, Portuguese (Brazil)

2
players_changelog
View File

@ -28,6 +28,8 @@ Version 1.3.1+svn:
* Miscellaneous bugfixes
* Fixed a bug that caused the killing unit's death sound to play instead of
the death sound of the killed unit.
* Fixed a bug that prevented dead units from fading out at the end of their
death animation
Version 1.3.1:
* Campaigns

2
src/animated.cpp
View File

@ -212,7 +212,7 @@ const int animated<T,T_void_value>::get_current_frame_time() const
{
if(frames_.empty() )
return 0;
return maximum<int>(get_current_frame_begin_time(),get_animation_time() - get_current_frame_begin_time());
return maximum<int>(0,get_animation_time() - get_current_frame_begin_time());
}
template<typename T, typename T_void_value>