separate fake units list from real units list

This is a first step before brnaching off to fake units manager

src/display.cpp

@@ -3033,12 +3033,9 @@ void display::invalidate_animations_location(const map_location& loc) {
 }
 
 
-std::vector<const unit*> display::get_unit_list_for_invalidation() {
-	std::vector<const unit*> unit_list;
-	BOOST_FOREACH(const unit &u, dc_->units()) {
-		unit_list.push_back(&u);
-	}
-	return unit_list;
+const std::deque<unit*> & display::get_fake_unit_list_for_invalidation() {
+	static const std::deque<unit*> blah;
+	return blah;
 }
 void display::invalidate_animations()
 {
@@ -3055,18 +3052,24 @@ void display::invalidate_animations()
 			}
 		}
 	}
-	std::vector<const unit*> unit_list=get_unit_list_for_invalidation();
+	const std::deque<unit*> & unit_list=get_fake_unit_list_for_invalidation();
 	BOOST_FOREACH(const unit* u, unit_list) {
 		u->refresh();
 	}
+	BOOST_FOREACH(const unit & u, dc_->units()) {
+		u.refresh();
+	}
 	bool new_inval;
 	do {
 		new_inval = false;
 #ifdef _OPENMP
 #pragma omp parallel for reduction(|:new_inval) shared(unit_list) schedule(guided)
 #endif //_OPENMP
-		for(int i=0; i < static_cast<int>(unit_list.size()); i++) {
-			new_inval |=  unit_list[i]->invalidate(*this);
+		BOOST_FOREACH(const unit* u, unit_list) {
+			new_inval |=  u->invalidate(*this);
+		}
+		BOOST_FOREACH(const unit & u, dc_->units()) {
+			new_inval |=  u.invalidate(*this);
 		}
 	}while(new_inval);
 }

src/display.hpp

@@ -58,11 +58,11 @@ namespace wb {
 
 #include "overlay.hpp"
 
-#include <list>
-
 #include <boost/function.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <deque>
+#include <list>
 #include <map>
 
 class gamemap;
@@ -423,7 +423,7 @@ class display
 	  * helper function for invalidate_animations
 	  * returns a list of units to check for invalidation
 	  */
-	virtual std::vector<const unit*> get_unit_list_for_invalidation();
+	virtual const std::deque<unit*> & get_fake_unit_list_for_invalidation();
 
 	/**
 	 * Per-location invalidation called by invalidate_animations()

src/game_display.cpp

@@ -624,12 +624,8 @@ void game_display::float_label(const map_location& loc, const std::string& text,
 	font::add_floating_label(flabel);
 }
 
-std::vector<const unit*> game_display::get_unit_list_for_invalidation() {
-	std::vector<const unit*> unit_list = display::get_unit_list_for_invalidation();;
-	BOOST_FOREACH(const unit *u, fake_units_) {
-		unit_list.push_back(u);
-	}
-	return unit_list;;
+const std::deque<unit*> & game_display::get_fake_unit_list_for_invalidation() {
+	return fake_units_;
 }
 
 

src/game_display.hpp

@@ -157,7 +157,7 @@ class game_display : public display
 	/**
 	 * the list of units we need to look at, game_display adds fake units
 	 */
-	virtual std::vector<const unit*> get_unit_list_for_invalidation();
+	virtual const std::deque<unit*> & get_fake_unit_list_for_invalidation();
 
 
 public: