Author: segfault
Date: Sun May 25 22:42:16 2008
New Revision: 26860
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26860&view=rev
Log:
Addint a variable "$damage_inflicted" during combats
Modified:
trunk/src/actions.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=26860&r1=26859&r2=26860&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Sun May 25 22:42:16 2008
@@ -943,6 +943,8 @@
static const std::string poison_string("poison");
LOG_NG << "Fight: (" << attacker << ") vs (" << defender << ") ATT: "
<< a_stats_->weapon->name() << " " << a_stats_->damage << "-" <<
a_stats_->num_blows << "(" << a_stats_->chance_to_hit << "%) vs DEF: " <<
(d_stats_->weapon ? d_stats_->weapon->name() : "none") << " " <<
d_stats_->damage << "-" << d_stats_->num_blows << "(" <<
d_stats_->chance_to_hit << "%)" << (defender_strikes_first ? " defender
first-strike" : "") << "\n";
+
+ game_state* game_state = game_events::get_state_of_game();
while(n_attacks_ > 0 || n_defends_ > 0) {
DBG_NG << "start of attack loop...\n";
@@ -955,6 +957,8 @@
int damage_defender_takes;
if(hits) {
damage_defender_takes = attacker_damage_;
+ game_state->set_variable("damage_inflicted",
+
str_cast<int>(damage_defender_takes));
} else {
damage_defender_takes = 0;
}
@@ -1212,6 +1216,9 @@
int damage_attacker_takes;
if(hits) {
damage_attacker_takes = defender_damage_;
+
+ game_state->set_variable("damage_inflicted",
+
str_cast<int>(damage_attacker_takes));
} else {
damage_attacker_takes = 0;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
