Merge lp:~widelands-dev/widelands/bug-1344350 into lp:widelands

[GunChleoc]

Fixed image for partially constructed building

[SirVer (sirver)]

review: Approve

=== modified file 'src/economy/test/test_routing.cc'
--- src/economy/test/test_routing.cc	2014-07-25 22:17:48 +0000
+++ src/economy/test/test_routing.cc	2014-07-26 10:57:57 +0000
@@ -56,7 +56,7 @@
 		return _neighbours[idx];
 	}
 
-	virtual Flag & base_flag() override {return _flag;}
+	Flag & base_flag() override {return _flag;}
 	void set_waitcost(int32_t const wc) {_waitcost = wc;}
 	int32_t get_waitcost() const {return _waitcost;}
 	const Coords & get_position() const override {return _position;}

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2014-07-26 09:48:21 +0000
+++ src/logic/building.cc	2014-07-26 10:57:57 +0000
@@ -907,7 +907,7 @@
 	// animations of buildings so that the messages can still be displayed, even
 	// after reload.
 	const std::string& img = g_gr->animations().get_animation
-		(descr().get_ui_anim()).representative_image_from_disk().hash();
+		(get_ui_anim()).representative_image_from_disk().hash();
 	std::string rt_description;
 	rt_description.reserve
 		(strlen("<rt image=") + img.size() + 1 +

=== modified file 'src/logic/building.h'
--- src/logic/building.h	2014-07-26 10:43:23 +0000
+++ src/logic/building.h	2014-07-26 10:57:57 +0000
@@ -184,6 +184,10 @@
 	int32_t  get_size    () const override;
 	bool get_passable() const override;
 
+	//Return the animation ID that is used for the building in UI items
+	//(the building UI, messages, etc..)
+	virtual uint32_t get_ui_anim() const {return descr().get_ui_anim();}
+
 	Flag & base_flag() override;
 	virtual uint32_t get_playercaps() const;
 

=== modified file 'src/logic/partially_finished_building.cc'
--- src/logic/partially_finished_building.cc	2014-07-24 20:39:56 +0000
+++ src/logic/partially_finished_building.cc	2014-07-26 10:57:57 +0000
@@ -141,6 +141,17 @@
 	return caps;
 }
 
+/*
+===============
+Return the animation for the building that is in construction, as this
+should be more useful to the player.
+===============
+*/
+uint32_t Partially_Finished_Building::get_ui_anim() const
+{
+	return m_building->get_animation("idle");
+}
+
 
 /*
 ===============

=== modified file 'src/logic/partially_finished_building.h'
--- src/logic/partially_finished_building.h	2014-07-26 10:43:23 +0000
+++ src/logic/partially_finished_building.h	2014-07-26 10:57:57 +0000
@@ -43,12 +43,11 @@
 
 	virtual void set_building         (const Building_Descr &);
 
-	void init   (Editor_Game_Base &) override;
-	void cleanup(Editor_Game_Base &) override;
-
 	int32_t get_size() const override;
 	uint32_t get_playercaps() const override;
-
+	uint32_t get_ui_anim() const override;
+	void cleanup(Editor_Game_Base &) override;
+	void init   (Editor_Game_Base &) override;
 	void set_economy(Economy *) override;
 
 	uint32_t get_nrwaresqueues() {return m_wares.size();}

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2014-07-25 13:45:18 +0000
+++ src/wui/buildingwindow.cc	2014-07-26 10:57:57 +0000
@@ -115,7 +115,7 @@
 {
 	UI::Window::draw(dst);
 
-	const Animation& anim = g_gr->animations().get_animation(building().descr().get_ui_anim());
+	const Animation& anim = g_gr->animations().get_animation(building().get_ui_anim());
 
 	const Image* dark_frame = ImageTransformations::change_luminosity
 		(&anim.representative_image(building().owner().get_playercolor()), 1.22, true);