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

remove some dead code

Browse source 
This code isn't needed after referencing counting was implemented
for units.
This commit is contained in:
Chris Beck 2014-12-12 22:24:06 -05:00
parent 223521fa44
commit 4fa7b0bc77
1 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/unit_animation.cpp
View file

@ -1399,50 +1399,15 @@ void unit_animator::wait_until(int animation_time) const
new_animation_frame();
}
namespace {
class reentry_preventer {
public:
class entry {
public:
bool valid() {
return valid_;
}
operator bool() {
return valid();
}
~entry() {
--parent_->depth;
}
private:
entry(reentry_preventer *p) : parent_(p), valid_(++p->depth == 1) {}
reentry_preventer *parent_;
bool valid_;
friend class reentry_preventer;
};
reentry_preventer() : depth(0) {}
entry enter() {
return entry(this);
}
private:
unsigned depth;
};
}
void unit_animator::wait_for_end() const
{
if (game_config::no_delay) return;
//static reentry_preventer rp;
//reentry_preventer::entry rpe = rp.enter();
//assert(rpe || (false && "Reentered a unit animation. See bug #18921")); //Catches reentry
bool finished = false;
display*disp = display::get_singleton();
while(!finished) {
resources::controller->play_slice(false);
// Replacing the below assert with a conditional break will fix the local segfault,
// but this just exposes a different one.
// It's also unnecessary given the one a few lines up.
//assert(rpe || (false && "Reentered a unit animation. See bug #18921")); //Catches a past reentry
disp->delay(10);
finished = true;
for(std::vector<anim_elem>::const_iterator anim = animated_units_.begin(); anim != animated_units_.end();++anim) {