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

Fixed some wmlscope warnings

Browse source
This commit is contained in:
Elvish_Hunter 2022-01-13 21:20:48 +01:00
parent 1c3001e568
commit 5f3629f1bb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/core/terrain-graphics/new-macros.cfg
View file

@ -1430,7 +1430,9 @@ carpet_overlay#endarg
[/tile]
[image]
# wmlscope: start ignoring
name={IMAGEPATH}rug-@R0-end.png
# wmlscope: stop ignoring
layer={LAYER}
base=90,161
center=90,144
@ -2728,7 +2730,9 @@ _off^Fp#endarg
[image]
layer=0
base=54,72
# wmlscope: start ignoring
name={IMAGESTEM}@V-A[01~10]-convex-@R0.png
# wmlscope: stop ignoring
variations=";2;3;4;5;6"
[/image]
[/terrain_graphics]
@ -4534,6 +4538,7 @@ wall#endarg
#arg RANDOM_START
no#endarg
# wmlscope: start ignoring
[image]
layer={LAYER}
name={IMAGESTEM}[01~{FRAMES}].png~CROP(0,0,72,72){MASKIPF}{IPF}:{DURATION}
@ -4607,6 +4612,7 @@ no#endarg
random_start={RANDOM_START}
[/variant]
[/image]
# wmlscope: stop ignoring
#enddef
#define NEW:WATER_342_180 TERRAINLIST IMAGESTEM FRAMES

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

@ -910,7 +910,7 @@ macro found in {}: {}".format(filename,
# it as a reference to everything the substitutions
# could potentially match.
elif '{' in name or '@' in name:
pattern = re.sub(r"(\{[^}]*\}|@R0|@V)", '.*', name)
pattern = re.sub(r"(\{[^}]*\}|@R[0-5]|@V)", '.*', name)
key = self.mark_matching_resources(pattern, fn,n+1)
if key:
self.fileref[key].append(fn, n+1)