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

Prevented an infinite recursion with missing animations.

Browse source 
(Fix for bug #15787.)
This commit is contained in:
Guillaume Melquiond 2010-04-05 08:48:08 +00:00
parent c9b26b5153
commit d7ad94c670
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/unit.cpp
View file

@ -1712,13 +1712,13 @@ void unit::start_animation(int start_time, const unit_animation *animation,
bool with_bars, bool cycles, const std::string &text, Uint32 text_color, STATE state)
{
const game_display * disp = game_display::get_singleton();
// everything except standing select and idle
const bool accelerate = (state != STATE_FORGET && state != STATE_STANDING);
if(!animation) {
state_ = state;
if (!animation && state != STATE_STANDING) {
set_standing(with_bars);
return ;
}
state_ =state;
// everything except standing select and idle
bool accelerate = (state != STATE_FORGET && state != STATE_STANDING);
draw_bars_ = with_bars;
delete anim_;
anim_ = new unit_animation(*animation);