Renamed [event][condition] to [event][filter_condition]...
...in order to keep the rule "The only tags inside events not being executed are the filter* ones.".
This commit is contained in:
parent
6e222f37cb
commit
07d586bda6
3 changed files with 3 additions and 3 deletions
|
@ -44,7 +44,7 @@ Version 1.9.1+svn:
|
||||||
* WML Engine:
|
* WML Engine:
|
||||||
* id= in SUFs now accepts a comma-separated list.
|
* id= in SUFs now accepts a comma-separated list.
|
||||||
* [capture_village] now accepts a full SLF.
|
* [capture_village] now accepts a full SLF.
|
||||||
* events can be fired depending on a [condition].
|
* events can be fired depending on a condition using [filter_condition].
|
||||||
* Added support for SLF to [terrain]. Note that the SLF's terrain= key is
|
* Added support for SLF to [terrain]. Note that the SLF's terrain= key is
|
||||||
not valid; terrain= specifies the new terrain instead like it used to do.
|
not valid; terrain= specifies the new terrain instead like it used to do.
|
||||||
Filtering for terrain can be done with the [terrain][and]terrain=
|
Filtering for terrain can be done with the [terrain][and]terrain=
|
||||||
|
|
|
@ -214,7 +214,7 @@ local function handle_event_commands(cfg)
|
||||||
for i = 1, #cfg do
|
for i = 1, #cfg do
|
||||||
local v = cfg[i]
|
local v = cfg[i]
|
||||||
local cmd = v[1]
|
local cmd = v[1]
|
||||||
if not string.find(cmd, "^filter") and cmd ~= "condition" then
|
if not string.find(cmd, "^filter") then
|
||||||
cmd = wml_actions[cmd] or
|
cmd = wml_actions[cmd] or
|
||||||
helper.wml_error(string.format("[%s] not supported", cmd))
|
helper.wml_error(string.format("[%s] not supported", cmd))
|
||||||
cmd(v[2])
|
cmd(v[2])
|
||||||
|
|
|
@ -2841,7 +2841,7 @@ static bool process_event(game_events::event_handler& handler, const game_events
|
||||||
vconfig filters(handler.get_config());
|
vconfig filters(handler.get_config());
|
||||||
|
|
||||||
|
|
||||||
foreach (const vconfig &condition, filters.get_children("condition"))
|
foreach (const vconfig &condition, filters.get_children("filter_condition"))
|
||||||
{
|
{
|
||||||
if (!game_events::conditional_passed(condition)) {
|
if (!game_events::conditional_passed(condition)) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Add table
Reference in a new issue