upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 08:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5360 from wesnoth/no_ptr_vector

Browse Source 
Unit: removed use of boost::ptr_vector
This commit is contained in:
Charles Dang 2020-12-16 18:51:17 +11:00 committed by GitHub
commit d47abc1d52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scripting/game_lua_kernel.cpp
View File

@ -111,8 +111,6 @@
#include "deprecation.hpp"
#include <functional> // for bind_t, bind
#include <boost/range/algorithm/copy.hpp> // boost::copy
#include <boost/range/adaptors.hpp> // boost::adaptors::filtered
#include <array>
#include <cassert> // for assert
#include <cstring> // for strcmp
@ -1879,10 +1877,6 @@ int game_lua_kernel::intf_find_reach(lua_State *L)
return 1;
}
static bool intf_find_cost_map_helper(const unit * ptr) {
return ptr->get_location().valid();
}
template<typename T> // This is only a template so I can avoid typing out the long typename. >_>
static int load_fake_units(lua_State* L, int arg, T& fake_units)
{
@ -1952,7 +1946,11 @@ int game_lua_kernel::intf_find_cost_map(lua_State *L)
}
else if (!filter.null()) // 1. arg - filter
{
boost::copy(unit_filter(filter).all_matches_on_map() | boost::adaptors::filtered(&intf_find_cost_map_helper), std::back_inserter(real_units));
for(const ::unit* match : unit_filter(filter).all_matches_on_map()) {
if(match->get_location().valid()) {
real_units.push_back(match);
}
}
}
else // 1. arg - coordinates
{

47
src/units/unit.cpp
View File

@ -54,7 +54,6 @@
#include "variable.hpp" // for vconfig, etc
#include <boost/dynamic_bitset.hpp>
#include <boost/function_output_iterator.hpp>
#ifdef _MSC_VER
#pragma warning (push)
@ -245,19 +244,6 @@ static unit_race::GENDER generate_gender(const unit_type& u_type, const config&
return generate_gender(u_type, cfg["random_gender"].to_bool());
}
struct ptr_vector_pushback
{
ptr_vector_pushback(boost::ptr_vector<config>& vec) : vec_(&vec) {}
void operator()(const config& cfg)
{
vec_->push_back(new config(cfg));
}
//Don't use reference to be copyable.
boost::ptr_vector<config>* vec_;
};
// Copy constructor
unit::unit(const unit& o)
: std::enable_shared_from_this<unit>()
@ -592,8 +578,10 @@ void unit::init(const config& cfg, bool use_traits, const vconfig* vcfg)
// If cfg specifies [advancement]s, replace this [advancement]s with them.
if(cfg.has_child("advancement")) {
set_attr_changed(UA_ADVANCEMENTS);
this->advancements_.clear();
boost::copy(cfg.child_range("advancement"), boost::make_function_output_iterator(ptr_vector_pushback(advancements_)));
advancements_.clear();
for(const config& adv : cfg.child_range("advancement")) {
advancements_.push_back(adv);
}
}
// Don't use the unit_type's abilities if this config has its own defined
@ -602,7 +590,7 @@ void unit::init(const config& cfg, bool use_traits, const vconfig* vcfg)
set_attr_changed(UA_ABILITIES);
abilities_.clear();
for(const config& abilities : cfg_range) {
this->abilities_.append(abilities);
abilities_.append(abilities);
}
}
@ -919,7 +907,7 @@ void unit::advance_to(const unit_type& u_type, bool use_traits)
advancements_.clear();
for(const config& advancement : new_type.advancements()) {
advancements_.push_back(new config(advancement));
advancements_.push_back(advancement);
}
// If unit has specific profile, remember it and keep it after advancing
@ -1384,7 +1372,7 @@ void unit::set_state(const std::string& state, bool value)
bool unit::has_ability_by_id(const std::string& ability) const
{
for(const config::any_child &ab : this->abilities_.all_children_range()) {
for(const config::any_child &ab : abilities_.all_children_range()) {
if(ab.cfg["id"] == ability) {
return true;
}
@ -1396,10 +1384,10 @@ bool unit::has_ability_by_id(const std::string& ability) const
void unit::remove_ability_by_id(const std::string& ability)
{
set_attr_changed(UA_ABILITIES);
config::all_children_iterator i = this->abilities_.ordered_begin();
while (i != this->abilities_.ordered_end()) {
config::all_children_iterator i = abilities_.ordered_begin();
while (i != abilities_.ordered_end()) {
if(i->cfg["id"] == ability) {
i = this->abilities_.erase(i);
i = abilities_.erase(i);
} else {
++i;
}
@ -1572,7 +1560,7 @@ void unit::write(config& cfg, bool write_all) const
}
if(write_all || get_attr_changed(UA_ADVANCEMENTS)) {
cfg.clear_children("advancement");
for(const config& advancement : this->advancements_) {
for(const config& advancement : advancements_) {
if(!advancement.empty()) {
cfg.add_child("advancement", advancement);
}
@ -1798,11 +1786,7 @@ std::vector<config> unit::get_modification_advances() const
void unit::set_advancements(std::vector<config> advancements)
{
set_attr_changed(UA_ADVANCEMENTS);
this->advancements_.clear();
for(config& advancement : advancements) {
this->advancements_.push_back(new config());
this->advancements_.back().swap(advancement);
}
advancements_ = advancements;
}
const std::string& unit::type_id() const
@ -2102,7 +2086,7 @@ void unit::apply_builtin_effect(std::string apply_to, const config& effect)
to_append.add_child(ab.key, ab.cfg);
}
}
this->abilities_.append(to_append);
abilities_.append(to_append);
}
} else if(apply_to == "remove_ability") {
if(const config& ab_effect = effect.child("abilities")) {
@ -2171,8 +2155,9 @@ void unit::apply_builtin_effect(std::string apply_to, const config& effect)
advancements_.clear();
}
config temp = effect;
boost::copy(effect.child_range("advancement"), boost::make_function_output_iterator(ptr_vector_pushback(advancements_)));
for(const config& adv : effect.child_range("advancement")) {
advancements_.push_back(adv);
}
}
} else if(apply_to == "remove_advancement") {
const std::string& types = effect["types"];

6
src/units/unit.hpp
View File

@ -25,7 +25,6 @@
#include <bitset>
#include <boost/dynamic_bitset_fwd.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/variant.hpp>
class display;
@ -310,9 +309,8 @@ public:
*/
std::vector<std::pair<std::string, std::string>> amla_icons() const;
using advancements_list= boost::ptr_vector<config>;
/** The raw, unparsed data for modification advancements. */
const advancements_list& modification_advancements() const
const std::vector<config>& modification_advancements() const
{
return advancements_;
}
@ -1882,7 +1880,7 @@ private:
config modifications_;
config abilities_;
advancements_list advancements_;
std::vector<config> advancements_;
t_string description_;
std::vector<t_string> special_notes_;