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

More macro-formal-argument tweaks to enable type checking.

Browse source
This commit is contained in:
Eric S. Raymond 2010-02-07 13:32:13 +00:00
parent da76212491
commit 1ffaf699f7
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer.cfg
View file

@ -296,9 +296,9 @@
#wmllint: usage of "Desert Archer" is archer
#define DESERT_ARCHER_VARIANT SUFFIX COST
#define DESERT_ARCHER_VARIANT SUFFIX_NUMBER COST
[unit_type]
id=Desert Archer{SUFFIX}
id=Desert Archer{SUFFIX_NUMBER}
[base_unit]
id=Desert Archer
[/base_unit]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Fighter.cfg
View file

@ -207,9 +207,9 @@
[/attack_anim]
[/unit_type]
#define DESERT_FIGHTER_VARIANT SUFFIX COST
#define DESERT_FIGHTER_VARIANT SUFFIX_NUMBER COST
[unit_type]
id=Desert Fighter{SUFFIX}
id=Desert Fighter{SUFFIX_NUMBER}
[base_unit]
id=Desert Fighter
[/base_unit]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Hunter.cfg
View file

@ -223,9 +223,9 @@
[/female]
[/unit_type]
#define DESERT_HUNTER_VARIANT SUFFIX COST
#define DESERT_HUNTER_VARIANT SUFFIX_NUMBER COST
[unit_type]
id=Desert Hunter{SUFFIX}
id=Desert Hunter{SUFFIX_NUMBER}
[base_unit]
id=Desert Hunter
[/base_unit]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Scout.cfg
View file

@ -230,9 +230,9 @@
[/attack_anim]
[/unit_type]
#define DESERT_SCOUT_VARIANT SUFFIX COST
#define DESERT_SCOUT_VARIANT SUFFIX_NUMBER COST
[unit_type]
id=Desert Scout{SUFFIX}
id=Desert Scout{SUFFIX_NUMBER}
[base_unit]
id=Desert Scout
[/base_unit]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman.cfg
View file

@ -217,9 +217,9 @@
[/attack_anim]
[/unit_type]
#define DESERT_SHAMAN_VARIANT SUFFIX COST
#define DESERT_SHAMAN_VARIANT SUFFIX_NUMBER COST
[unit_type]
id=Desert Shaman{SUFFIX}
id=Desert Shaman{SUFFIX_NUMBER}
[base_unit]
id=Desert Shaman
[/base_unit]

10
data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg
View file

@ -9,24 +9,24 @@
[/effect]
#enddef
#define KALEH_ADVANCEMENT HP_RAISE XP EFFECT VARIATION_NAME
#define KALEH_ADVANCEMENT HP_INCREMENT XP_INCREMENT EFFECT_WML VARIATION_NAME
[advancement]
max_times=1
always_display=yes
[effect]
apply_to=hitpoints
increase_total={HP_RAISE}
increase={HP_RAISE}
increase_total={HP_INCREMENT}
increase={HP_INCREMENT}
[/effect]
[effect]
apply_to=max_experience
increase={XP}
increase={XP_INCREMENT}
[/effect]
[effect]
apply_to=variation
name={VARIATION_NAME}
[/effect]
{EFFECT}
{EFFECT_WML}
[/advancement]
#enddef

6
data/core/terrain-graphics/util.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth
#define VIMG BASE NAME
#define VIMG BASE_STRING NAME_STRING
[image]
name={NAME}
base={BASE}
name={NAME_STRING}
base={BASE_STRING}
[/image]
#enddef

2
data/tools/wesnoth/wmltools.py
View file

@ -145,7 +145,7 @@ def formaltype(f):
# Deduce the expected type of the formal
if f.startswith("_"):
f = f[1:]
if f in ("SIDE", "X", "Y", "RED", "GREEN", "BLUE", "TURN", "RADIUS") or f.endswith("NUMBER") or f.endswith("AMOUNT") or f.endswith("COST") or f.endswith("_X") or f.endswith("_Y"):
if f in ("SIDE", "X", "Y", "RED", "GREEN", "BLUE", "TURN", "RADIUS") or f.endswith("NUMBER") or f.endswith("AMOUNT") or f.endswith("COST") or f.endswith("_X") or f.endswith("_Y") or f.endswith("_INCREMENT"):
ftype = "numeric"
elif f in ("POSITION",):
ftype = "position"