Format a few more ctor list (no content changes)
This commit is contained in:
parent
672b33f227
commit
a80831fb9f
3 changed files with 61 additions and 61 deletions
|
@ -19,18 +19,18 @@ wesnothd::player::player(const std::string& n, simple_wml::node& cfg, long id,
|
|||
bool registered, const std::string& version, const std::string& source, unsigned long long login_id, const std::size_t max_messages,
|
||||
const std::size_t time_period,
|
||||
const bool moderator)
|
||||
: name_(n)
|
||||
, version_(version)
|
||||
, source_(source)
|
||||
, cfg_(cfg)
|
||||
, registered_(registered)
|
||||
, flood_start_(0)
|
||||
, messages_since_flood_start_(0)
|
||||
, MaxMessages(max_messages)
|
||||
, TimePeriod(time_period)
|
||||
, status_(LOBBY)
|
||||
, moderator_(moderator)
|
||||
, login_id_(login_id)
|
||||
: name_(n)
|
||||
, version_(version)
|
||||
, source_(source)
|
||||
, cfg_(cfg)
|
||||
, registered_(registered)
|
||||
, flood_start_(0)
|
||||
, messages_since_flood_start_(0)
|
||||
, MaxMessages(max_messages)
|
||||
, TimePeriod(time_period)
|
||||
, status_(LOBBY)
|
||||
, moderator_(moderator)
|
||||
, login_id_(login_id)
|
||||
{
|
||||
cfg_.set_attr_dup("name", n.c_str());
|
||||
cfg_.set_attr("registered", registered ? "yes" : "no");
|
||||
|
|
|
@ -47,32 +47,31 @@ terrain_filter::~terrain_filter()
|
|||
{
|
||||
}
|
||||
|
||||
terrain_filter::terrain_filter(const vconfig& cfg, const filter_context * fc, const bool flat_tod) :
|
||||
cfg_(cfg),
|
||||
fc_(fc),
|
||||
cache_(),
|
||||
max_loop_(game_config::max_loop),
|
||||
flat_(flat_tod)
|
||||
terrain_filter::terrain_filter(const vconfig& cfg, const filter_context* fc, const bool flat_tod)
|
||||
: cfg_(cfg)
|
||||
, fc_(fc)
|
||||
, cache_()
|
||||
, max_loop_(game_config::max_loop)
|
||||
, flat_(flat_tod)
|
||||
{
|
||||
}
|
||||
|
||||
terrain_filter::terrain_filter(const vconfig& cfg, const terrain_filter& original) :
|
||||
cfg_(cfg),
|
||||
fc_(original.fc_),
|
||||
cache_(),
|
||||
max_loop_(original.max_loop_),
|
||||
flat_(original.flat_)
|
||||
terrain_filter::terrain_filter(const vconfig& cfg, const terrain_filter& original)
|
||||
: cfg_(cfg)
|
||||
, fc_(original.fc_)
|
||||
, cache_()
|
||||
, max_loop_(original.max_loop_)
|
||||
, flat_(original.flat_)
|
||||
{
|
||||
}
|
||||
|
||||
terrain_filter::terrain_filter(const terrain_filter& other) :
|
||||
xy_pred(), // We should construct this too, since it has no datamembers
|
||||
// use the default constructor.
|
||||
cfg_(other.cfg_),
|
||||
fc_(other.fc_),
|
||||
cache_(),
|
||||
max_loop_(other.max_loop_),
|
||||
flat_(other.flat_)
|
||||
terrain_filter::terrain_filter(const terrain_filter& other)
|
||||
: xy_pred() // We should construct this too, since it has no datamembers use the default constructor.
|
||||
, cfg_(other.cfg_)
|
||||
, fc_(other.fc_)
|
||||
, cache_()
|
||||
, max_loop_(other.max_loop_)
|
||||
, flat_(other.flat_)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -86,12 +85,13 @@ terrain_filter& terrain_filter::operator=(const terrain_filter& other)
|
|||
return *this ;
|
||||
}
|
||||
|
||||
terrain_filter::terrain_filter_cache::terrain_filter_cache() :
|
||||
parsed_terrain(nullptr),
|
||||
adjacent_matches(nullptr),
|
||||
adjacent_match_cache(),
|
||||
ufilter_()
|
||||
{}
|
||||
terrain_filter::terrain_filter_cache::terrain_filter_cache()
|
||||
: parsed_terrain(nullptr)
|
||||
, adjacent_matches(nullptr)
|
||||
, adjacent_match_cache()
|
||||
, ufilter_()
|
||||
{
|
||||
}
|
||||
|
||||
bool terrain_filter::match_internal(const map_location& loc, const unit* ref_unit, const bool ignore_xy) const
|
||||
{
|
||||
|
|
|
@ -47,29 +47,29 @@ static lg::log_domain log_unit("unit");
|
|||
static lg::log_domain log_wml("wml");
|
||||
#define ERR_WML LOG_STREAM(err, log_wml)
|
||||
|
||||
attack_type::attack_type(const config& cfg) :
|
||||
self_loc_(),
|
||||
other_loc_(),
|
||||
is_attacker_(false),
|
||||
other_attack_(nullptr),
|
||||
description_(cfg["description"].t_str()),
|
||||
id_(cfg["name"]),
|
||||
type_(cfg["type"]),
|
||||
icon_(cfg["icon"]),
|
||||
range_(cfg["range"]),
|
||||
min_range_(cfg["min_range"].to_int(1)),
|
||||
max_range_(cfg["max_range"].to_int(1)),
|
||||
alignment_str_(cfg["alignment"].str()),
|
||||
damage_(cfg["damage"].to_int()),
|
||||
num_attacks_(cfg["number"].to_int()),
|
||||
attack_weight_(cfg["attack_weight"].to_double(1.0)),
|
||||
defense_weight_(cfg["defense_weight"].to_double(1.0)),
|
||||
accuracy_(cfg["accuracy"].to_int()),
|
||||
movement_used_(cfg["movement_used"].to_int(100000)),
|
||||
attacks_used_(cfg["attacks_used"].to_int(1)),
|
||||
parry_(cfg["parry"].to_int()),
|
||||
specials_(cfg.child_or_empty("specials")),
|
||||
changed_(true)
|
||||
attack_type::attack_type(const config& cfg)
|
||||
: self_loc_()
|
||||
, other_loc_()
|
||||
, is_attacker_(false)
|
||||
, other_attack_(nullptr)
|
||||
, description_(cfg["description"].t_str())
|
||||
, id_(cfg["name"])
|
||||
, type_(cfg["type"])
|
||||
, icon_(cfg["icon"])
|
||||
, range_(cfg["range"])
|
||||
, min_range_(cfg["min_range"].to_int(1))
|
||||
, max_range_(cfg["max_range"].to_int(1))
|
||||
, alignment_str_(cfg["alignment"].str())
|
||||
, damage_(cfg["damage"].to_int())
|
||||
, num_attacks_(cfg["number"].to_int())
|
||||
, attack_weight_(cfg["attack_weight"].to_double(1.0))
|
||||
, defense_weight_(cfg["defense_weight"].to_double(1.0))
|
||||
, accuracy_(cfg["accuracy"].to_int())
|
||||
, movement_used_(cfg["movement_used"].to_int(100000))
|
||||
, attacks_used_(cfg["attacks_used"].to_int(1))
|
||||
, parry_(cfg["parry"].to_int())
|
||||
, specials_(cfg.child_or_empty("specials"))
|
||||
, changed_(true)
|
||||
{
|
||||
if (description_.empty())
|
||||
description_ = translation::egettext(id_.c_str());
|
||||
|
|
Loading…
Add table
Reference in a new issue