From fd9379e276faccafbaaa4c57def594ac7df8509c Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Wed, 18 Jun 2014 17:17:49 -0400 Subject: [PATCH] fixup 13155c4f41c7d60f9dec1e323eaa9477a54aaec3 In this commit, the order in which fake units vs real units was changed without realizing the significance. Comments near to the fake_units code makes it clear that the fake units are intended to be drawn after the real units, so that e.g. when the whiteboard is used, the fake units draw over the real ones. --- src/display.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index 972c2e655ec..ad18925a179 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -3057,24 +3057,26 @@ void display::invalidate_animations() } } const std::deque & unit_list = fake_unit_man_->get_fake_unit_list_for_invalidation(); - BOOST_FOREACH(const unit* u, unit_list) { - u->anim_comp().refresh(); - } + BOOST_FOREACH(const unit & u, dc_->units()) { u.anim_comp().refresh(); } + BOOST_FOREACH(const unit* u, unit_list) { + u->anim_comp().refresh(); + } + bool new_inval; do { new_inval = false; #ifdef _OPENMP #pragma omp parallel for reduction(|:new_inval) shared(unit_list) schedule(guided) #endif //_OPENMP - BOOST_FOREACH(const unit* u, unit_list) { - new_inval |= u->anim_comp().invalidate(*this); - } BOOST_FOREACH(const unit & u, dc_->units()) { new_inval |= u.anim_comp().invalidate(*this); } + BOOST_FOREACH(const unit* u, unit_list) { + new_inval |= u->anim_comp().invalidate(*this); + } }while(new_inval); }