0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made IF_ALLIED use [store_side] instead of [store_unit]...

Browse source 
...and prevented the condition from passing if neither side
exists. Probably fixes the macro being broken.
This commit is contained in:
Lari Nieminen 2010-10-17 18:16:26 +00:00
parent b2d92a0f9b
commit 983628dcbb
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
data/core/macros/conditional-utils.cfg
View file

@ -87,37 +87,31 @@
#! amount=-10
#! [/gold]
#! )}
[store_unit]
[filter]
side={PLAYER1_SIDE}
canrecruit=yes
[/filter]
variable=leader1
mode=replace
kill=no
[/store_unit]
[store_unit]
[filter]
side={PLAYER2_SIDE}
canrecruit=yes
[/filter]
variable=leader2
mode=replace
kill=no
[/store_unit]
[store_side]
side={PLAYER1_SIDE}
variable=player1_side
[/store_side]
[store_side]
side={PLAYER2_SIDE}
variable=player2_side
[/store_side]
[if]
[variable]
name=leader1.team_name
equals=$leader2.team_name
name=player1_side.team_name
not_equals=$empty
[/variable]
[variable]
name=player1_side.team_name
equals=$player2_side.team_name
[/variable]
[then]
{ACTION_WML}
[/then]
[/if]
[clear_variable]
name=leader1
name=player1_side
[/clear_variable]
[clear_variable]
name=leader2
name=player2_side
[/clear_variable]
#enddef