Author: esr
Date: Tue Sep 23 15:24:39 2008
New Revision: 29663
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29663&view=rev
Log:
Fix bug #12322 (Campaign statistics not carried from scenario to scenario)
Modified:
trunk/src/statistics.cpp
trunk/src/statistics.hpp
Modified: trunk/src/statistics.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/statistics.cpp?rev=29663&r1=29662&r2=29663&view=diff
==============================================================================
--- trunk/src/statistics.cpp (original)
+++ trunk/src/statistics.cpp Tue Sep 23 15:24:39 2008
@@ -265,7 +265,8 @@
new_expected_damage_inflicted(0),
new_expected_damage_taken(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);
}
@@ -400,6 +401,8 @@
ss << new_turn_expected_damage_taken;
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)
@@ -446,6 +449,7 @@
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_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++; }
@@ -652,6 +656,7 @@
s.turn_expected_damage_taken = 0;
s.new_turn_expected_damage_inflicted = 0;
s.new_turn_expected_damage_taken = 0;
+ s.save_id = save_id;
}
stats calculate_stats(int category, std::string save_id)
Modified: trunk/src/statistics.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/statistics.hpp?rev=29663&r1=29662&r2=29663&view=diff
==============================================================================
--- trunk/src/statistics.hpp (original)
+++ trunk/src/statistics.hpp Tue Sep 23 15:24:39 2008
@@ -69,6 +69,7 @@
long long turn_expected_damage_inflicted,
turn_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;
+ std::string save_id;
};
int sum_str_int_map(const stats::str_int_map& m);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
