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

trackplacer: Don't reread generated *_END macros as new data.

Browse source
This commit is contained in:
Eric S. Raymond 2008-10-30 07:41:22 +00:00
parent 53e70972d9
commit dc36208145
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/tools/trackplacer
View file

@ -222,8 +222,9 @@ class JourneyTracks:
waypoint_re = re.compile("{NEW_(" + "|".join(icon_presentation_order) + ")" \
+ " +([0-9]+) +([0-9]+)}")
property_re = re.compile("# *trackplacer: ([^=]+)=(.*)")
define_re = re.compile("#define (.*)_STAGE[0-9]+")
define_re = re.compile("#define (.*)_STAGE[0-9]+(_END|_COMPLETE)?")
state = "before"
ignore = False
for line in fp:
# This is how we ignore stuff outside of track sections
if state == "before":
@ -239,17 +240,17 @@ class JourneyTracks:
state = "after"
continue
# Which track are we appending to?
# Ignore _COMPLETE macros, they're generated.
m = re.search(define_re, line)
if m and "_COMPLETE" not in line:
if m:
self.selected_id = m.group(1)
ignore = m.group(2)
if self.selected_id not in self.track_order:
self.track_order.append(self.selected_id)
self.tracks[self.selected_id] = []
continue
# Is this a track marker?
m = re.search(waypoint_re, line)
if m:
if m and not ignore:
try:
tag = m.group(1)
x = int(m.group(2))