Removed old code for [portrait]

This was an experimental feature that was never finished. Any [portrait] tags were removed from the unit type WML a while back
wesnoth · Mar 20, 2016 · 33a04c3 · 33a04c3
1 parent 11e1917
commit 33a04c3
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 108 deletions.
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -985,8 +985,6 @@
 		<Unit filename="../../src/playturn.hpp" />
 		<Unit filename="../../src/playturn_network_adapter.cpp" />
 		<Unit filename="../../src/playturn_network_adapter.hpp" />
-		<Unit filename="../../src/portrait.cpp" />
-		<Unit filename="../../src/portrait.hpp" />
 		<Unit filename="../../src/preferences.cpp" />
 		<Unit filename="../../src/preferences.hpp" />
 		<Unit filename="../../src/preferences_display.cpp" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -975,7 +975,6 @@ set(wesnoth-main_SRC
 	playsingle_controller.cpp
 	playturn.cpp
 	playturn_network_adapter.cpp
-	portrait.cpp
 	random_new.cpp
 	random_new_deterministic.cpp
 	random_new_synced.cpp

diff --git a/src/SConscript b/src/SConscript
@@ -555,7 +555,6 @@ wesnoth_sources = Split("""
     playsingle_controller.cpp
     playturn.cpp
     playturn_network_adapter.cpp
-    portrait.cpp
     random_new.cpp
     random_new_deterministic.cpp
     random_new_synced.cpp

diff --git a/src/portrait.cpp b/src/portrait.cpp
diff --git a/src/portrait.hpp b/src/portrait.hpp
diff --git a/src/unit_types.cpp b/src/unit_types.cpp
@@ -27,7 +27,6 @@
 #include "loadscreen.hpp"
 #include "log.hpp"
 #include "make_enum.hpp"
-#include "portrait.hpp"
 #include "unit.hpp"
 #include "unit_abilities.hpp"
 #include "unit_animation.hpp"
@@ -99,8 +98,7 @@ unit_type::unit_type(const unit_type& o) :
 	possible_traits_(o.possible_traits_),
 	genders_(o.genders_),
 	animations_(o.animations_),
-    build_status_(o.build_status_),
-	portraits_(o.portraits_)
+    build_status_(o.build_status_)
 {
 	gender_types_[0] = o.gender_types_[0] != NULL ? new unit_type(*o.gender_types_[0]) : NULL;
 	gender_types_[1] = o.gender_types_[1] != NULL ? new unit_type(*o.gender_types_[1]) : NULL;
@@ -159,8 +157,7 @@ unit_type::unit_type(const config &cfg, const std::string & parent_id) :
 	possible_traits_(),
 	genders_(),
 	animations_(),
-	build_status_(NOT_BUILT),
-	portraits_()
+	build_status_(NOT_BUILT)
 {
 	gender_types_[0] = NULL;
 	gender_types_[1] = NULL;
@@ -227,10 +224,6 @@ void unit_type::build_full(const movement_type_map &mv_types,
 
 	game_config::add_color_info(cfg_);
 
-	BOOST_FOREACH(const config &portrait, cfg_.child_range("portrait")) {
-		portraits_.push_back(tportrait(portrait));
-	}
-
 	hp_bar_scaling_ = cfg_["hp_bar_scaling"].to_double(game_config::hp_bar_scaling);
 	xp_bar_scaling_ = cfg_["xp_bar_scaling"].to_double(game_config::xp_bar_scaling);
 

diff --git a/src/unit_types.hpp b/src/unit_types.hpp
@@ -28,7 +28,6 @@
 #include <string>
 #include <vector>
 
-struct tportrait;
 class unit_ability_list;
 class unit_animation;
 
@@ -210,8 +209,6 @@ class unit_type
 	bool hide_help() const;
 	bool do_not_list() const { return do_not_list_; }
 
-	const std::vector<tportrait>& portraits() const { return portraits_; }
-
 	const config &get_cfg() const { return cfg_; }
 	/// Returns a trimmed config suitable for use with units.
 	const config & get_cfg_for_units() const
@@ -293,9 +290,6 @@ class unit_type
 	mutable std::vector<unit_animation> animations_;
 
 	BUILD_STATUS build_status_;
-
-	/** List with the portraits available for the unit. */
-	std::vector<tportrait> portraits_;
 };
 
 class unit_type_data