Merge branch 'drawable_units'

projectfiles/CodeBlocks-SCons/wesnoth.cbp

@@ -193,6 +193,8 @@
 		<Unit filename="../../src/display.hpp" />
 		<Unit filename="../../src/display_context.cpp" />
 		<Unit filename="../../src/display_context.hpp" />
+		<Unit filename="../../src/drawable_unit.cpp" />
+		<Unit filename="../../src/drawable_unit.hpp" />
 		<Unit filename="../../src/editor/action/action_base.hpp" />
 		<Unit filename="../../src/editor/action/action.cpp" />
 		<Unit filename="../../src/editor/action/action.hpp" />

projectfiles/CodeBlocks/wesnoth.cbp

@@ -231,6 +231,8 @@
 		<Unit filename="..\..\src\display.hpp" />
 		<Unit filename="..\..\src\display_context.cpp" />
 		<Unit filename="..\..\src\display_context.hpp" />
+		<Unit filename="..\..\src\drawable_unit.cpp" />
+		<Unit filename="..\..\src\drawable_unit.hpp" />
 		<Unit filename="..\..\src\editor\action\action.cpp" />
 		<Unit filename="..\..\src\editor\action\action.hpp" />
 		<Unit filename="..\..\src\editor\action\action_base.hpp" />

projectfiles/VC9/wesnoth.vcproj

@@ -20060,6 +20060,14 @@
 			RelativePath="..\..\src\display_context.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\drawable_unit.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\drawable_unit.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\events.cpp"
 			>

src/CMakeLists.txt

@@ -700,6 +700,7 @@ set(wesnoth-main_SRC
 	controller_base.cpp
 	desktop_util.cpp
 	dialogs.cpp
+	drawable_unit.cpp
 	editor/action/action.cpp
 	editor/action/action_item.cpp
 	editor/action/action_label.cpp

src/SConscript

@@ -233,6 +233,7 @@ wesnoth_sources = Split("""
     controller_base.cpp
     desktop_util.cpp
     dialogs.cpp
+    drawable_unit.cpp
     editor/action/action.cpp
     editor/action/action_unit.cpp
     editor/action/action_label.cpp

src/actions/move.cpp

@@ -1288,37 +1288,5 @@ size_t move_unit_from_replay(const std::vector<map_location> &steps,
 	return move_unit_internal(undo_stack, show_move, NULL, mover);
 }
 
-bool unit_can_move(const unit &u)
-{
-	const team &current_team = (*resources::teams)[u.side() - 1];
-
-	if(!u.attacks_left() && u.movement_left()==0)
-		return false;
-
-	// Units with goto commands that have already done their gotos this turn
-	// (i.e. don't have full movement left) should have red globes.
-	if(u.has_moved() && u.has_goto()) {
-		return false;
-	}
-
-	map_location locs[6];
-	get_adjacent_tiles(u.get_location(), locs);
-	for(int n = 0; n != 6; ++n) {
-		if (resources::gameboard->map().on_board(locs[n])) {
-			const unit_map::const_iterator i = resources::units->find(locs[n]);
-			if (i.valid() && !i->incapacitated() &&
-			    current_team.is_enemy(i->side())) {
-				return true;
-			}
-
-			if (u.movement_cost((resources::gameboard->map())[locs[n]]) <= u.movement_left()) {
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
 
 }//namespace actions

src/actions/move.hpp

@@ -114,13 +114,6 @@ size_t move_unit_from_replay(const std::vector<map_location> &steps,
                  bool continued_move, bool skip_ally_sighted,
 				 bool show_move = true);
 
-/**
- * Will return true iff the unit @a u has any possible moves
- * it can do (including attacking etc).
- */
-bool unit_can_move(const unit &u);
-
-
 }//namespace actions
 
 

src/display.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "cursor.hpp"
+#include "drawable_unit.hpp"
 #include "display.hpp"
 #include "fake_unit_manager.hpp"
 #include "game_preferences.hpp"
@@ -2553,7 +2554,7 @@ void display::draw_invalidated() {
 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
 		if (u_it != dc_->units().end()
 				&& (request == exclusive_unit_draw_requests_.end() || request->second == u_it->id()))
-			u_it->redraw_unit();
+			(static_cast<const drawable_unit*> (&*u_it))->redraw_unit();
 	}
 
 }

src/display.hpp

@@ -165,6 +165,8 @@ class display
 
 	void change_display_context(const display_context * dc);
 
+	const display_context & get_disp_context() { return *dc_; }
+
 	static Uint32 rgb(Uint8 red, Uint8 green, Uint8 blue)
 		{ return 0xFF000000 | (red << 16) | (green << 8) | blue; }
 	static Uint8 red(Uint32 color)

src/display_context.cpp

@@ -29,3 +29,41 @@ const unit * display_context::get_visible_unit(const map_location & loc, const t
 	}
 	return &*u;
 }
+
+/**
+ * Will return true iff the unit @a u has any possible moves
+ * it can do (including attacking etc).
+ */
+
+bool display_context::unit_can_move(const unit &u) const
+{
+	if(!u.attacks_left() && u.movement_left()==0)
+		return false;
+
+	// Units with goto commands that have already done their gotos this turn
+	// (i.e. don't have full movement left) should have red globes.
+	if(u.has_moved() && u.has_goto()) {
+		return false;
+	}
+
+	const team &current_team = teams()[u.side() - 1];
+
+	map_location locs[6];
+	get_adjacent_tiles(u.get_location(), locs);
+	for(int n = 0; n != 6; ++n) {
+		if (map().on_board(locs[n])) {
+			const unit_map::const_iterator i = units().find(locs[n]);
+			if (i.valid() && !i->incapacitated() &&
+			    current_team.is_enemy(i->side())) {
+				return true;
+			}
+
+			if (u.movement_cost(map()[locs[n]]) <= u.movement_left()) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+

src/display_context.hpp

@@ -37,8 +37,16 @@ class display_context {
 	virtual const gamemap & map() const = 0;
 	virtual const unit_map & units() const = 0;
 
+	// Needed for reports
+
 	const unit * get_visible_unit(const map_location &loc, const team &current_team, bool see_all = false) const;
 
+	// From actions:: namespace
+
+	bool unit_can_move(const unit & u) const;
+
+	// Dtor
+
 	virtual ~display_context() {}
 };