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

Fix argument-order screwup in the new LOYAL_UNIT macro,

Browse source 
...and fix some instances in Liberty that did not conform.
This commit is contained in:
Eric S. Raymond 2008-02-01 03:08:53 +00:00
parent 2049a2f7d8
commit 7f126adf92
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
View file

@ -121,8 +121,8 @@
[recall]
description=Harper
[/recall]
{LOYAL_UNIT 1 Outlaw 30 17 Jingo ( _ "Jingo")}
{LOYAL_UNIT 1 Outlaw 32 17 Majel ( _ "Majel")}
{LOYAL_UNIT Outlaw Jingo ( _ "Jingo") 1 30 17}
{LOYAL_UNIT Outlaw Majel ( _ "Majel") 1 32 17}
# wmllint: recognize Jingo
# wmllint: recognize Majel
[/event]
@ -151,7 +151,7 @@
message= _ "The garrison. The towers of Halstead are more than a garrison, nephew, they are a fortress. They used to protect this area from the enemies of Wesnoth; I never imagined they would house the enemies of Wesnoth."
[/message]
{LOYAL_UNIT 1 Dragoon 11 1 Pitcher ( _ "Pitcher")}
{LOYAL_UNIT Dragoon Pitcher ( _ "Pitcher") 1 11 1}
# wmllint: recognize Pitcher
{MOVE_UNIT description=Pitcher 20 14}

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

@ -476,11 +476,11 @@
[/event]
#enddef
#define NOTRAIT_UNIT SIDE TYPE X Y DESCRIPTION USER_DESCRIPTION
#define NOTRAIT_UNIT TYPE DESCRIPTION USER_DESCRIPTION SIDE X Y
# Creates a unit with no traits.
#
# Example:
#! {LOYAL_UNIT 1 19 16 (Elvish Fighter) (Myname) ( _ "Myname")}
#! {LOYAL_UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 19 16}
#
[unit]
type={TYPE}
@ -492,11 +492,11 @@
[/unit]
#enddef
#define LOYAL_UNIT SIDE TYPE X Y DESCRIPTION USER_DESCRIPTION
#define LOYAL_UNIT TYPE DESCRIPTION USER_DESCRIPTION SIDE X Y
# Creates a unit with the Loyal trait.
#
# Example:
#! {LOYAL_UNIT 1 19 16 (Elvish Fighter) (Myname) ( _ "Myname")}
#! {LOYAL_UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 19 16}
#
[unit]
type={TYPE}
@ -525,15 +525,15 @@
[/unit]
#enddef
#define RECALL_OR_CREATE TYPE NAME
#define RECALL_OR_CREATE TYPE DESCRIPTION
# A substitute for [recall] that works even when there's no-one to recall
# useful for testing scenarios out of order.
[recall]
description={NAME}
description={DESCRIPTION}
[/recall]
[if]
[have_unit]
description={NAME}
description={DESCRIPTION}
[/have_unit]
[else]
[store_starting_location]
@ -542,7 +542,7 @@
[/store_starting_location]
[unit]
type={TYPE}
description={NAME}
description={DESCRIPTION}
side=1
x=$tmp.x
y=$tmp.y