upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 11:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename "pre_die" event to "last breath"

Browse Source 
fix some logic errors in the death handling code which detects WML
invalidations
This commit is contained in:
Patrick Parker 2007-12-09 10:53:51 +00:00
parent 79d247bcc2
commit 19aba517bc
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -9,7 +9,7 @@ Version 1.3.12+svn:
* language and i18n: * language and i18n:
* updated translations: Chinese, Danish, Finnish, French, Italian * updated translations: Chinese, Danish, Finnish, French, Italian
* WML engine: * WML engine:
* new event trigger: pre_die, will be triggered when a unit dies, but * new event "last breath" will be triggered when a unit dies, but
before the animation is played before the animation is played
* allow ThemeWML to display the race. * allow ThemeWML to display the race.
* new "random_gender=" key (boolean) to single units declarations in WML; * new "random_gender=" key (boolean) to single units declarations in WML;

24
src/actions.cpp
View File

@ -742,7 +742,9 @@ void attack::fire_event(const std::string& n)
std::pair<std::string,t_string> to_insert("weapon", d_weap); std::pair<std::string,t_string> to_insert("weapon", d_weap);
tempcfg->values.insert(to_insert); tempcfg->values.insert(to_insert);
} }
game_events::fire(n,attacker_,defender_,dat); game_events::fire(n,
game_events::entity_location(a_),
game_events::entity_location(d_), dat);
a_ = units_.find(attacker_); a_ = units_.find(attacker_);
d_ = units_.find(defender_); d_ = units_.find(defender_);
return; return;
@ -1037,24 +1039,31 @@ attack::attack(game_display& gui, const gamemap& map,
std::string undead_variation = d_->second.undead_variation(); std::string undead_variation = d_->second.undead_variation();
const int defender_side = d_->second.side(); const int defender_side = d_->second.side();
fire_event("attack_end"); fire_event("attack_end");
game_events::fire("pre_die",death_loc,attacker_loc); game_events::fire("last breath", death_loc, attacker_loc);
d_ = units_.find(death_loc); d_ = units_.find(death_loc);
a_ = units_.find(attacker_loc); a_ = units_.find(attacker_loc);
if(d_ == units_.end() || !death_loc.matches_unit(d_->second)) { if(d_ == units_.end() || !death_loc.matches_unit(d_->second)
|| d_->second.hitpoints() > 0) {
// WML has invalidated the dying unit, abort // WML has invalidated the dying unit, abort
break; break;
} }
bool attacker_invalid = false;
if(a_ == units_.end() || !attacker_loc.matches_unit(a_->second)) { if(a_ == units_.end() || !attacker_loc.matches_unit(a_->second)) {
if(d_->second.hitpoints() <= 0) { if(d_->second.hitpoints() <= 0) {
units_.erase(d_); units_.erase(d_);
d_ = units_.end(); d_ = units_.end();
} }
// WML has invalidated the killing unit, abort // WML has invalidated the killing unit
break; attacker_invalid = true;
} }
refresh_bc(); refresh_bc();
unit_display::unit_die(d_->first,d_->second,a_stats_->weapon,d_stats_->weapon, &(a_->second)); if(attacker_invalid) {
unit_display::unit_die(d_->first, d_->second, NULL, d_stats_->weapon, NULL);
} else {
unit_display::unit_die(d_->first, d_->second,a_stats_->weapon,d_stats_->weapon, &(a_->second));
}
game_events::fire("die",death_loc,attacker_loc); game_events::fire("die",death_loc,attacker_loc);
d_ = units_.find(death_loc); d_ = units_.find(death_loc);
@ -1067,7 +1076,8 @@ attack::attack(game_display& gui, const gamemap& map,
d_ = units_.end(); d_ = units_.end();
} }
if(a_ == units_.end() || !attacker_loc.matches_unit(a_->second)) { if(attacker_invalid || a_ == units_.end()
|| !attacker_loc.matches_unit(a_->second)) {
// WML has invalidated the killing unit, abort // WML has invalidated the killing unit, abort
break; break;
} }