upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 18:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Carryover Info: don't use boost::ptr_vector

Browse Source
This commit is contained in:
Charles Dang 2020-12-31 18:09:21 +11:00
parent 48e9360e75
commit 0517f570d0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/carryover.cpp
View File

@ -146,7 +146,7 @@ carryover_info::carryover_info(const config& cfg, bool from_snpashot)
for(const config& item : cfg.child_range("menu_item"))
{
if(item["persistent"].to_bool(true)) {
wml_menu_items_.push_back(new config(item));
wml_menu_items_.push_back(item);
}
}
}

3
src/carryover.hpp
View File

@ -18,7 +18,6 @@ class config;
#include <vector>
#include <string>
#include <set>
#include <boost/ptr_container/ptr_vector.hpp>
#include "config.hpp"
#include "mt_rng.hpp"
@ -100,7 +99,7 @@ private:
std::vector<carryover> carryover_sides_;
config variables_;
randomness::mt_rng rng_;
boost::ptr_vector<config> wml_menu_items_;
std::vector<config> wml_menu_items_;
std::string next_scenario_; /**< the scenario coming next (for campaigns) */
int next_underlying_unit_id_;
};