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

Renamed some variables used in macros...

Browse source 
...and made sure that some currently uncleared variables get cleared properly.
This commit is contained in:
Lari Nieminen 2010-08-10 08:43:33 +00:00
parent 22e5110266
commit 9a60f695e5
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
data/core/macros/utils.cfg
View file

@ -238,7 +238,7 @@
[/unstore_unit]
{NEXT MODIFY_UNIT_i}
{CLEAR_VARIABLE MODIFY_UNIT_store}
{CLEAR_VARIABLE MODIFY_UNIT_store,MODIFY_UNIT_i}
#enddef
#define MOVE_UNIT_BY FILTER OFFSET_X OFFSET_Y
@ -252,15 +252,15 @@
kill=yes
[/store_unit]
{FOREACH MOVE_UNIT_store unit}
{VARIABLE_OP MOVE_UNIT_store[$unit].x add {OFFSET_X}}
{VARIABLE_OP MOVE_UNIT_store[$unit].y add {OFFSET_Y}}
{FOREACH MOVE_UNIT_store MOVE_UNIT_BY_i}
{VARIABLE_OP MOVE_UNIT_store[$MOVE_UNIT_BY_i].x add {OFFSET_X}}
{VARIABLE_OP MOVE_UNIT_store[$MOVE_UNIT_BY_i].y add {OFFSET_Y}}
[unstore_unit]
variable=MOVE_UNIT_store[$unit]
variable=MOVE_UNIT_store[$MOVE_UNIT_BY_i]
find_vacant=no
[/unstore_unit]
{NEXT unit}
{CLEAR_VARIABLE MOVE_UNIT_store}
{NEXT MOVE_UNIT_BY_i}
{CLEAR_VARIABLE MOVE_UNIT_store,MOVE_UNIT_BY_i}
#enddef
#define MOVE_UNIT FILTER TO_X TO_Y
@ -336,9 +336,7 @@
[/unstore_unit]
[redraw][/redraw]
{CLEAR_VARIABLE MOVE_UNIT_temp}
{CLEAR_VARIABLE MOVE_UNIT_path_coords_x}
{CLEAR_VARIABLE MOVE_UNIT_path_coords_y}
{CLEAR_VARIABLE MOVE_UNIT_temp,MOVE_UNIT_path_coords_x,MOVE_UNIT_path_coords_y}
#enddef
#define FULL_HEAL FILTER
@ -361,7 +359,7 @@
[/unstore_unit]
{NEXT FULL_HEAL_i}
{CLEAR_VARIABLE FULL_HEAL_temp}
{CLEAR_VARIABLE FULL_HEAL_temp,FULL_HEAL_i}
#enddef
#define PUT_TO_RECALL_LIST FILTER
@ -391,17 +389,17 @@
kill=yes
[/store_unit]
{FOREACH PUT_TO_RECALL_LIST_temp i}
{VARIABLE PUT_TO_RECALL_LIST_temp[$i].x "recall"}
{VARIABLE PUT_TO_RECALL_LIST_temp[$i].y "recall"}
{FOREACH PUT_TO_RECALL_LIST_temp PUT_TO_RECALL_LIST_i}
{VARIABLE PUT_TO_RECALL_LIST_temp[$PUT_TO_RECALL_LIST_i].x "recall"}
{VARIABLE PUT_TO_RECALL_LIST_temp[$PUT_TO_RECALL_LIST_i].y "recall"}
[unstore_unit]
variable=PUT_TO_RECALL_LIST_temp[$i]
variable=PUT_TO_RECALL_LIST_temp[$PUT_TO_RECALL_LIST_i]
find_vacant=no
[/unstore_unit]
{NEXT i}
{CLEAR_VARIABLE PUT_TO_RECALL_LIST_temp}
{CLEAR_VARIABLE PUT_TO_RECALL_LIST_temp,PUT_TO_RECALL_LIST_i}
#enddef
# FIXME: Documentation for these is needed.