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

Cleaning formula AI merge 2008-03-03T05:40:29Z!davewx7@gmail.com

Browse Source 
Redo a part of 2008-01-29T07:39:12Z!paniemin@cc.hut.fi

Other changes were reverted by suokko later, but he lets this one and
so the merge reverted it. Not sure why it's like that.  Some double
check of this area could be useful
This commit is contained in:
Ali El Gariani 2008-04-25 23:07:12 +00:00
parent 33cb59f0e1
commit bc2ed329d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions.cpp
View File

@ -788,7 +788,9 @@ void attack::fire_event(const std::string& n)
dat.add_child("second");
(*(dat.child("first")))["weapon"]=a_stats_->weapon->id();
(*(dat.child("second")))["weapon"]=d_stats_->weapon != NULL ? d_stats_->weapon->id() : "none";
DELAY_END_LEVEL(delayed_exception, game_events::fire(n,attacker_,defender_,dat));
DELAY_END_LEVEL(delayed_exception, game_events::fire(n,
game_events::entity_location(attacker_,a_id_),
game_events::entity_location(defender_,d_id_),dat));
// The event could have killed either the attacker or
// defender, so we have to make sure they still exist