0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure all members are initialized in the constructor.

Browse source
This commit is contained in:
Mark de Wever 2007-09-20 15:39:40 +00:00
parent dcb5e7a2ed
commit 1b170b84b1
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/race.cpp
View file

@ -129,24 +129,35 @@ static wide_string markov_generate_name(const markov_prefix_map& prefixes, size_
return originalRes;
}
unit_race::unit_race() : ntraits_(0), chain_size_(0), traits_(&empty_traits), global_traits_(true)
unit_race::unit_race() :
id_(),
name_(),
description_(),
ntraits_(0),
chain_size_(0),
traits_(&empty_traits),
global_traits_(true)
{
}
unit_race::unit_race(const config& cfg) : name_(cfg["name"]), ntraits_(atoi(cfg["num_traits"].c_str())),
traits_(&cfg.get_children("trait")), global_traits_(!utils::string_bool(cfg["ignore_global_traits"]))
unit_race::unit_race(const config& cfg) :
id_(cfg["id"]),
name_(cfg["name"]),
description_(cfg["description"]),
ntraits_(atoi(cfg["num_traits"].c_str())),
chain_size_(atoi(cfg["markov_chain_size"].c_str())),
traits_(&cfg.get_children("trait")),
global_traits_(!utils::string_bool(cfg["ignore_global_traits"]))
{
id_ = cfg["id"];
if(id_.empty()) {
// This code is only for compatibility with old race defs.
id_ = (cfg["name"]);
}
description_ = cfg["description"];
names_[MALE] = utils::split(cfg["male_names"]);
names_[FEMALE] = utils::split(cfg["female_names"]);
chain_size_ = atoi(cfg["markov_chain_size"].c_str());
if(chain_size_ <= 0)
chain_size_ = 2;