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

Make use of the new conversions from attribute_value to numeric types.

Browse source
This commit is contained in:
J. Tyne 2012-12-14 16:01:49 +00:00
parent 19e0974935
commit f0222685ae
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/filesystem.cpp
View file

@ -894,9 +894,9 @@ file_tree_checksum::file_tree_checksum()
{}
file_tree_checksum::file_tree_checksum(const config& cfg) :
nfiles (static_cast<size_t>(cfg["nfiles"].to_double())),
sum_size(static_cast<size_t>(cfg["size"].to_double())),
modified(static_cast<time_t>(cfg["modified"].to_double()))
nfiles (cfg["nfiles"].to_size_t()),
sum_size(cfg["size"].to_size_t()),
modified(cfg["modified"].to_time_t())
{
}

2
src/multiplayer_ui.cpp
View file

@ -113,7 +113,7 @@ void level_to_gamestate(config& level, game_state& state)
//set random
const config::attribute_value &seed = level["random_seed"];
if(!seed.empty()) {
const unsigned calls = static_cast<unsigned>(level["random_calls"].to_double());
const unsigned calls = level["random_calls"].to_unsigned();
sides.rng().seed_random(seed.to_int(42), calls);
} else {
ERR_NG << "No random seed found, random "

2
src/portrait.cpp
View file

@ -40,7 +40,7 @@ static tportrait::tside get_side(const std::string& side)
tportrait::tportrait(const config& cfg) :
image(cfg["image"]),
side(get_side(cfg["side"])),
size(static_cast<unsigned>(cfg["size"].to_double())),
size(cfg["size"].to_unsigned()),
mirror(cfg["mirror"].to_bool())
{
VALIDATE(!image.empty(), missing_mandatory_wml_key("portrait", "image"));

2
src/replay.cpp
View file

@ -62,7 +62,7 @@ static void verify(const unit_map& units, const config& cfg) {
std::stringstream errbuf;
LOG_REPLAY << "verifying unit structure...\n";
const size_t nunits = static_cast<size_t>(cfg["num_units"].to_double());
const size_t nunits = cfg["num_units"].to_size_t();
if(nunits != units.size()) {
errbuf << "SYNC VERIFICATION FAILED: number of units from data source differ: "
<< nunits << " according to data source. " << units.size() << " locally\n";

20
src/statistics.cpp
View file

@ -394,18 +394,18 @@ void stats::read(const config& cfg)
defends = read_battle_result_map(c);
}
recruit_cost = cfg["recruit_cost"].to_double();
recall_cost = cfg["recall_cost"].to_double();
recruit_cost = cfg["recruit_cost"].to_int();
recall_cost = cfg["recall_cost"].to_int();
damage_inflicted = cfg["damage_inflicted"].to_double();
damage_taken = cfg["damage_taken"].to_double();
expected_damage_inflicted = cfg["expected_damage_inflicted"].to_double();
expected_damage_taken = cfg["expected_damage_taken"].to_double();
damage_inflicted = cfg["damage_inflicted"].to_long_long();
damage_taken = cfg["damage_taken"].to_long_long();
expected_damage_inflicted = cfg["expected_damage_inflicted"].to_long_long();
expected_damage_taken = cfg["expected_damage_taken"].to_long_long();
turn_damage_inflicted = cfg["turn_damage_inflicted"].to_double();
turn_damage_taken = cfg["turn_damage_taken"].to_double();
turn_expected_damage_inflicted = cfg["turn_expected_damage_inflicted"].to_double();
turn_expected_damage_taken = cfg["turn_expected_damage_taken"].to_double();
turn_damage_inflicted = cfg["turn_damage_inflicted"].to_long_long();
turn_damage_taken = cfg["turn_damage_taken"].to_long_long();
turn_expected_damage_inflicted = cfg["turn_expected_damage_inflicted"].to_long_long();
turn_expected_damage_taken = cfg["turn_expected_damage_taken"].to_long_long();
save_id = cfg["save_id"].str();
}

4
src/terrain_filter.cpp
View file

@ -313,7 +313,7 @@ bool terrain_filter::match(const map_location& loc) const
std::vector<map_location> loc_vec(1, loc);
//handle radius
size_t radius = static_cast<size_t>(cfg_["radius"].to_double(0));
size_t radius = cfg_["radius"].to_size_t(0);
if(radius > max_loop_) {
ERR_NG << "terrain_filter: radius greater than " << max_loop_
<< ", restricting\n";
@ -510,7 +510,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
}
//handle radius
size_t radius = static_cast<size_t>(cfg_["radius"].to_double(0));
size_t radius = cfg_["radius"].to_size_t(0);
if(radius > max_loop_) {
ERR_NG << "terrain_filter: radius greater than " << max_loop_
<< ", restricting\n";