More getting rid of {UNIT}.

This commit is contained in:
Eric S. Raymond 2008-01-31 03:13:44 +00:00
parent 89425f9ac7
commit 32c4540709
2 changed files with 34 additions and 16 deletions

View file

@ -11,3 +11,24 @@
message="Macro '" + {NAME} + "' is scheduled for removal in Wesnoth " + {VERSION} + "."
[/deprecated_message]
#enddef
#define UNIT TYPE DESCRIPTION UDESCRIPTION SIDE X Y
# Create a unit with the Loyal trait.
#
# Example:
#! {UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 1 1}
#
[unit]
type={TYPE}
description={DESCRIPTION}
user_description={UDESCRIPTION}
side={SIDE}
x={X}
y={Y}
[modifications]
{TRAIT_LOYAL}
[/modifications]
[/unit]
{DEPRECATE "UNIT" 1.3.15}
#enddef

View file

@ -292,14 +292,15 @@
#enddef
#define NO_SCROLL_TO_AI_LEADER SIDE
# Prevents the view from scrolling to the leader of a specific AI side at the
# beginning of its turn. Useful if that side doesn't really do anything and the
# scrolling distance would be long enough to be annoying every turn (for example
# on a big map). Does not work on human-controlled sides.
# Prevents the view from scrolling to the leader of a specific AI
# side at the beginning of its turn. Useful if that side doesn't
# really do anything and the scrolling distance would be long
# enough to be annoying every turn (for example on a big
# map). Does not work on human-controlled sides.
#
# Warning: in networked MP this will cause the game to think the leader of this
# side has been defeated when changing turns and thus might lead to
# victory/defeat being declared prematurely.
# Warning: in networked MP this will cause the game to think the
# leader of this side has been defeated when changing turns and
# thus might lead to victory/defeat being declared prematurely.
[event]
name=side turn
first_time_only=no
@ -475,28 +476,24 @@
[/event]
#enddef
#define UNIT TYPE DESCRIPTION UDESCRIPTION SIDE X Y
# Create a unit with the Loyal trait.
#define NOTRAIT_UNIT SIDE TYPE X Y DESCRIPTION USER_DESCRIPTION
# Creates a unit with no traits.
#
# Example:
#! {UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 1 1}
#! {LOYAL_UNIT 1 19 16 (Elvish Fighter) (Myname) ( _ "Myname")}
#
[unit]
type={TYPE}
description={DESCRIPTION}
user_description={UDESCRIPTION}
user_description={USER_DESCRIPTION}
side={SIDE}
x={X}
y={Y}
[modifications]
{TRAIT_LOYAL}
[/modifications]
[/unit]
#enddef
#define LOYAL_UNIT SIDE TYPE X Y DESCRIPTION USER_DESCRIPTION
# Creates a unit with the Loyal trait. Should make the too vaguely named
# UNIT macro above obsolete.
# Creates a unit with the Loyal trait.
#
# Example:
#! {LOYAL_UNIT 1 19 16 (Elvish Fighter) (Myname) ( _ "Myname")}