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

give line number of DEFENSE_ANIM too, when warning that get_hit_sound is also present

Browse source 
Building on our earlier fix pointing this message's line number to the get_hit_sound, it would be even more useful to have the line number of the DEFENSE_ANIM as well. To get this, we change the has_defense_anim variable's value from False to None, and True to i. It is possible that a unit might have two macros for male and female variants, in which case we will assume that the get_hit_sound is most likely associated with the first.
This commit is contained in:
Groggy Dice 2013-07-01 19:33:21 -04:00
parent 77eb8cc8d1
commit aeb558419d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/tools/wmllint-1.4
View file

@ -1008,7 +1008,7 @@ def hack_syntax(filename, lines):
unit_image = None
unit_sound = None
get_hit_sound = None
has_defense_anim = False
has_defense_anim = None
has_special_notes = False
for i in range(len(lines)):
if "[unit]" in lines[i]:
@ -1017,7 +1017,7 @@ def hack_syntax(filename, lines):
elif "[/unit]" in lines[i]:
if unit_id and get_hit_sound:
if has_defense_anim:
print 'wmllint: "%s", line %d: unit%s has both deprecated get_hit_sound key and a DEFENSE_ANIM'%(filename, get_hit_sound+1, unit_id)
print 'wmllint: "%s", lines %d, %d: unit%s has both deprecated get_hit_sound key and a DEFENSE_ANIM'%(filename, get_hit_sound+1, has_defense_anim+1, unit_id)
else:
new_anim = "{DEFENSE_ANIM %s %s %s}" % \
(unit_image, unit_image, unit_sound)
@ -1031,11 +1031,11 @@ def hack_syntax(filename, lines):
unit_image = None
unit_sound = None
get_hit_sound = None
has_defense_anim = False
has_defense_anim = None
has_special_notes = False
if in_unit:
if "{DEFENSE_ANIM" in lines[i]:
has_defense_anim = True
if "{DEFENSE_ANIM" in lines[i] and not has_defense_anim:
has_defense_anim = i
else:
fields = parse_attribute(lines[i])
if fields is None: