CLEAR_FOG and UNCLEAR_FOG retrofitted to use [lift_fog] and [reset_fog].

The Fog Clearer unit is now unused in mainline
This commit is contained in:
Elvish_Hunter 2012-04-05 08:59:27 +00:00
parent 818b7e64f1
commit fb9151430d
2 changed files with 12 additions and 23 deletions

View file

@ -186,6 +186,7 @@ Version 1.11.0-svn:
instead
* Border hexes are included when using radius= in the SLF of [remove_shroud]
and [place_shroud] (they were already included for directly matched hexes).
* Retrofitted CLEAR_FOG and UNCLEAR_FOG macros to make use of [lift_fog] and [reset_fog]
* Miscellaneous and bug fixes:
* Fix wrong preferences path suffix (1.1 instead of 1.10) on Linux and other
platforms using XDG layout (no compiled-in preferences path override,

View file

@ -1,4 +1,4 @@
#textdomain wesnoth
wes#textdomain wesnoth
# Interface shortcut macros.
# These don't depend on any other macros. Please don't change this.
@ -93,34 +93,22 @@
#enddef
#define CLEAR_FOG SIDE X Y RADIUS
# Clears fog in a specific area for the given side. This is to be used only
# for the duration of an event: always use {UNCLEAR_FOG} (below) before the
# event exits, or otherwise you'll be left with fake fog clearer units on
# the map.
[unit]
side={SIDE}
type=Fog Clearer
# Clears fog in a specific area for the given side.
[lift_fog]
[filter_side]
side={SIDE}
[/filter_side]
x,y={X},{Y}
max_moves={RADIUS}
[/unit]
[hide_unit]
type=Fog Clearer
[/hide_unit]
[redraw]
side={SIDE}
[/redraw]
radius={RADIUS}
[/lift_fog]
#enddef
#define UNCLEAR_FOG
# Restores fog that was temporarily cleared (check CLEAR_FOG above). Only
# one UNCLEAR_FOG is required no matter how many times CLEAR_FOG was used.
[kill]
type=Fog Clearer
animate=no
fire_event=no
[/kill]
[reset_fog]
reset_view=yes
[/reset_fog]
#enddef
#define SET_LABEL X Y STRING