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

Fix bug #12322 (Campaign statistics not carried from scenario to scenario)

Browse Source
This commit is contained in:
Eric S. Raymond 2008-09-23 13:24:39 +00:00
parent e3b6b591d8
commit 15ae149c71
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/statistics.cpp
View File

@ -265,7 +265,8 @@ stats::stats(const config& cfg) :
new_expected_damage_inflicted(0), new_expected_damage_inflicted(0),
new_expected_damage_taken(0), new_expected_damage_taken(0),
new_turn_expected_damage_inflicted(0), new_turn_expected_damage_inflicted(0),
new_turn_expected_damage_taken(0) new_turn_expected_damage_taken(0),
save_id(std::string())
{ {
read(cfg); read(cfg);
} }
@ -400,6 +401,8 @@ void stats::write(config_writer &out) const
ss << new_turn_expected_damage_taken; ss << new_turn_expected_damage_taken;
out.write_key_val("new_turn_expected_damage_taken", ss.str()); out.write_key_val("new_turn_expected_damage_taken", ss.str());
out.write_key_val("save_id", save_id);
} }
void stats::read(const config& cfg) void stats::read(const config& cfg)
@ -446,6 +449,7 @@ void stats::read(const config& cfg)
new_expected_damage_taken = lexical_cast_default<long long>(cfg["new_expected_damage_taken"],expected_damage_taken); new_expected_damage_taken = lexical_cast_default<long long>(cfg["new_expected_damage_taken"],expected_damage_taken);
new_turn_expected_damage_inflicted = lexical_cast_default<long long>(cfg["new_turn_expected_damage_inflicted"],turn_expected_damage_inflicted); new_turn_expected_damage_inflicted = lexical_cast_default<long long>(cfg["new_turn_expected_damage_inflicted"],turn_expected_damage_inflicted);
new_turn_expected_damage_taken = lexical_cast_default<long long>(cfg["new_turn_expected_damage_taken"],turn_expected_damage_taken); new_turn_expected_damage_taken = lexical_cast_default<long long>(cfg["new_turn_expected_damage_taken"],turn_expected_damage_taken);
save_id = cfg["save_id"];
} }
disabler::disabler() { stats_disabled++; } disabler::disabler() { stats_disabled++; }
@ -652,6 +656,7 @@ void reset_turn_stats(std::string save_id)
s.turn_expected_damage_taken = 0; s.turn_expected_damage_taken = 0;
s.new_turn_expected_damage_inflicted = 0; s.new_turn_expected_damage_inflicted = 0;
s.new_turn_expected_damage_taken = 0; s.new_turn_expected_damage_taken = 0;
s.save_id = save_id;
} }
stats calculate_stats(int category, std::string save_id) stats calculate_stats(int category, std::string save_id)

1
src/statistics.hpp
View File

@ -69,6 +69,7 @@ namespace statistics
long long turn_expected_damage_inflicted, turn_expected_damage_taken; long long turn_expected_damage_inflicted, turn_expected_damage_taken;
long long new_expected_damage_inflicted, new_expected_damage_taken; long long new_expected_damage_inflicted, new_expected_damage_taken;
long long new_turn_expected_damage_inflicted, new_turn_expected_damage_taken; long long new_turn_expected_damage_inflicted, new_turn_expected_damage_taken;
std::string save_id;
}; };
int sum_str_int_map(const stats::str_int_map& m); int sum_str_int_map(const stats::str_int_map& m);