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

Rearrange the logic in filer_event() for easier reading...

Browse Source 
...and possibly better efficiency.

(No change to the overall functioning, just the order in which things
are checked.)
This commit is contained in:
J. Tyne 2012-08-05 22:58:45 +00:00
parent e93a2593fd
commit 054f2b9152
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/game_events.cpp
View File

@ -3144,6 +3144,13 @@ static bool filter_event(const game_events::event_handler& handler,
}
}
BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side"))
{
side_filter ssf(f);
const int current_side = resources::controller->current_side();
if(!ssf.match(current_side)) return false;
}
BOOST_FOREACH(const vconfig &f, filters.get_children("filter"))
{
if (unit1 == units->end() || !game_events::unit_matches_filter(*unit1, f)) {
@ -3154,27 +3161,30 @@ static bool filter_event(const game_events::event_handler& handler,
}
}
BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side"))
{
side_filter ssf(f);
const int current_side = resources::controller->current_side();
if(!ssf.match(current_side)) return false;
}
vconfig::child_list special_filters = filters.get_children("filter_attack");
bool special_matches = special_filters.empty();
BOOST_FOREACH(const vconfig &f, special_filters)
if ( !special_matches && unit1 != units->end() )
{
if (unit1 != units->end() && game_events::matches_special_filter(ev.data.child("first"), f)) {
special_matches = true;
}
if (!f.empty()) {
filtered_unit1 = true;
const config & attack = ev.data.child("first");
BOOST_FOREACH(const vconfig &f, special_filters)
{
if ( f.empty() )
special_matches = true;
else
filtered_unit1 = true;
special_matches = special_matches ||
game_events::matches_special_filter(attack, f);
}
}
if(!special_matches) {
return false;
}
if (ev.loc1.requires_unit() && filtered_unit1 &&
(unit1 == units->end() || !ev.loc1.matches_unit(*unit1))) {
// Wrong or missing entity at src location
return false;
}
BOOST_FOREACH(const vconfig &f, filters.get_children("filter_second"))
{
@ -3188,23 +3198,23 @@ static bool filter_event(const game_events::event_handler& handler,
special_filters = filters.get_children("filter_second_attack");
special_matches = special_filters.empty();
BOOST_FOREACH(const vconfig &f, special_filters)
if ( !special_matches && unit2 != units->end() )
{
if (unit2 != units->end() && game_events::matches_special_filter(ev.data.child("second"), f)) {
special_matches = true;
}
if (!f.empty()) {
filtered_unit2 = true;
const config & attack = ev.data.child("second");
BOOST_FOREACH(const vconfig &f, special_filters)
{
if ( f.empty() )
special_matches = true;
else
filtered_unit2 = true;
special_matches = special_matches ||
game_events::matches_special_filter(attack, f);
}
}
if(!special_matches) {
return false;
}
if (ev.loc1.requires_unit() && filtered_unit1 &&
(unit1 == units->end() || !ev.loc1.matches_unit(*unit1))) {
// Wrong or missing entity at src location
return false;
}
if (ev.loc2.requires_unit() && filtered_unit2 &&
(unit2 == units->end() || !ev.loc2.matches_unit(*unit2))) {
// Wrong or missing entity at dst location