The previous attempt to keep from leaking generated journey macros...
...into the global macro namespace got a bit overzealous.
This commit is contained in:
Eric S. Raymond
parent
9678bd35f1
commit
709ea04e11
15 changed files with 63 additions and 215 deletions
|
|
@ -291,19 +291,12 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY_STAGE1
|
||||
#undef JOURNEY_STAGE1_END
|
||||
#undef JOURNEY_STAGE2
|
||||
#undef JOURNEY_STAGE2_END
|
||||
#undef JOURNEY_STAGE3
|
||||
#undef JOURNEY_STAGE3_END
|
||||
#undef JOURNEY_STAGE4
|
||||
#undef JOURNEY_STAGE4_END
|
||||
#undef JOURNEY_STAGE5
|
||||
#undef JOURNEY_STAGE5_END
|
||||
#undef JOURNEY_STAGE6
|
||||
#undef JOURNEY_STAGE6_END
|
||||
#undef JOURNEY_STAGE7
|
||||
#undef JOURNEY_STAGE7_END
|
||||
#undef JOURNEY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -372,6 +372,22 @@
|
|||
{NEW_BATTLE 481 128}
|
||||
#enddef
|
||||
|
||||
#define KALENZ_COMPLETE
|
||||
{OLD_JOURNEY 949 230}
|
||||
{OLD_JOURNEY 821 265}
|
||||
{OLD_JOURNEY 776 316}
|
||||
{OLD_JOURNEY 720 320}
|
||||
{OLD_JOURNEY 625 342}
|
||||
{OLD_BATTLE 586 381}
|
||||
{OLD_BATTLE 586 381}
|
||||
{OLD_JOURNEY 586 381}
|
||||
{OLD_JOURNEY 557 325}
|
||||
{OLD_JOURNEY 497 221}
|
||||
{OLD_JOURNEY 486 205}
|
||||
{OLD_JOURNEY 477 176}
|
||||
{OLD_BATTLE 481 128}
|
||||
#enddef
|
||||
|
||||
#define TRIUMPH_STAGE1
|
||||
{NEW_JOURNEY 579 330}
|
||||
{NEW_JOURNEY 560 328}
|
||||
|
|
@ -961,3 +977,26 @@
|
|||
|
||||
# Prince of Wesnoth has no map screen. It's not connected to either
|
||||
# the previous scenario or the next one.
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef SEARCH_STAGE1_END
|
||||
#undef SEARCH_STAGE2_END
|
||||
#undef SEARCH_STAGE3_END
|
||||
#undef SEARCH_STAGE4_END
|
||||
#undef SEARCH_STAGE5_END
|
||||
#undef SEARCH_STAGE6_END
|
||||
#undef SEARCH_STAGE7_END
|
||||
#undef SEARCH_COMPLETE
|
||||
#undef CHANTAL_STAGE1_END
|
||||
#undef CHANTAL_STAGE2_END
|
||||
#undef KALENZ_STAGE1_END
|
||||
#undef KALENZ_STAGE2_END
|
||||
#undef KALENZ_STAGE3
|
||||
#undef KALENZ_STAGE3_END
|
||||
#undef KALENZ_COMPLETE
|
||||
#undef TRIUMPH_STAGE3_END
|
||||
#undef TRIUMPH_STAGE4_END
|
||||
#undef TRIUMPH_STAGE5_END
|
||||
#undef TRIUMPH_COMPLETE
|
||||
|
||||
# trackplacer: epilog ends
|
||||
|
|
|
|||
|
|
@ -644,23 +644,14 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY_STAGE1
|
||||
#undef JOURNEY_STAGE1_END
|
||||
#undef JOURNEY_STAGE2
|
||||
#undef JOURNEY_STAGE2_END
|
||||
#undef JOURNEY_STAGE3
|
||||
#undef JOURNEY_STAGE3_END
|
||||
#undef JOURNEY_STAGE4
|
||||
#undef JOURNEY_STAGE4_END
|
||||
#undef JOURNEY_STAGE5
|
||||
#undef JOURNEY_STAGE5_END
|
||||
#undef JOURNEY_STAGE6
|
||||
#undef JOURNEY_STAGE6_END
|
||||
#undef JOURNEY_STAGE7
|
||||
#undef JOURNEY_STAGE7_END
|
||||
#undef JOURNEY_STAGE8
|
||||
#undef JOURNEY_STAGE8_END
|
||||
#undef JOURNEY_STAGE9
|
||||
#undef JOURNEY_STAGE9_END
|
||||
#undef JOURNEY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -678,47 +678,23 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY1_STAGE1
|
||||
#undef JOURNEY1_STAGE1_END
|
||||
#undef JOURNEY1_STAGE2
|
||||
#undef JOURNEY1_STAGE2_END
|
||||
#undef JOURNEY1_COMPLETE
|
||||
#undef JOURNEY2_STAGE1
|
||||
#undef JOURNEY2_STAGE1_END
|
||||
#undef JOURNEY2_STAGE2
|
||||
#undef JOURNEY2_STAGE2_END
|
||||
#undef JOURNEY2_COMPLETE
|
||||
#undef JOURNEY3_STAGE1
|
||||
#undef JOURNEY3_STAGE1_END
|
||||
#undef JOURNEY3_STAGE2
|
||||
#undef JOURNEY3_STAGE2_END
|
||||
#undef JOURNEY3_STAGE3
|
||||
#undef JOURNEY3_STAGE3_END
|
||||
#undef JOURNEY3_COMPLETE
|
||||
#undef JOURNEY4_STAGE1
|
||||
#undef JOURNEY4_STAGE1_END
|
||||
#undef JOURNEY4_COMPLETE
|
||||
#undef JOURNEY5_STAGE1
|
||||
#undef JOURNEY5_STAGE1_END
|
||||
#undef JOURNEY5_STAGE2
|
||||
#undef JOURNEY5_STAGE2_END
|
||||
#undef JOURNEY5_COMPLETE
|
||||
#undef JOURNEY6_STAGE1
|
||||
#undef JOURNEY6_STAGE1_END
|
||||
#undef JOURNEY6_STAGE2
|
||||
#undef JOURNEY6_STAGE2_END
|
||||
#undef JOURNEY6_COMPLETE
|
||||
#undef JOURNEY7_STAGE1
|
||||
#undef JOURNEY7_STAGE1_END
|
||||
#undef JOURNEY7_STAGE2
|
||||
#undef JOURNEY7_STAGE2_END
|
||||
#undef JOURNEY7_STAGE3
|
||||
#undef JOURNEY7_STAGE3_END
|
||||
#undef JOURNEY7_STAGE4
|
||||
#undef JOURNEY7_STAGE4_END
|
||||
#undef JOURNEY7_STAGE5
|
||||
#undef JOURNEY7_STAGE5_END
|
||||
#undef JOURNEY7_STAGE6
|
||||
#undef JOURNEY7_STAGE6_END
|
||||
#undef JOURNEY7_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -1494,7 +1494,7 @@
|
|||
{OLD_JOURNEY 778 493}
|
||||
{OLD_JOURNEY 755 500}
|
||||
{OLD_JOURNEY 732 507}
|
||||
{OLD_JOURNEY 709 514}
|
||||
{OLD_JOURNEY 710 515}
|
||||
{OLD_JOURNEY 686 521}
|
||||
{OLD_JOURNEY 663 528}
|
||||
{OLD_JOURNEY 640 535}
|
||||
|
|
@ -1898,63 +1898,40 @@
|
|||
[/story]
|
||||
#enddef
|
||||
|
||||
#undef FROM_ELENSEFAR
|
||||
#undef FROM_ELVEN_COUNCIL
|
||||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY1_STAGE1
|
||||
#undef JOURNEY1_STAGE1_END
|
||||
#undef JOURNEY1_STAGE2
|
||||
#undef JOURNEY1_STAGE2_END
|
||||
#undef JOURNEY1_STAGE3
|
||||
#undef JOURNEY1_STAGE3_END
|
||||
#undef JOURNEY1_COMPLETE
|
||||
#undef JOURNEY2_STAGE1
|
||||
#undef JOURNEY1_STAGE4_END
|
||||
#undef JOURNEY2_STAGE1_END
|
||||
#undef JOURNEY2_STAGE2
|
||||
#undef JOURNEY2_STAGE2_END
|
||||
#undef JOURNEY2_COMPLETE
|
||||
#undef JOURNEY3_STAGE1
|
||||
#undef JOURNEY3_STAGE1_END
|
||||
#undef JOURNEY3_STAGE2
|
||||
#undef JOURNEY3_STAGE2_END
|
||||
#undef JOURNEY3_STAGE3
|
||||
#undef JOURNEY3_STAGE3_END
|
||||
#undef JOURNEY3_COMPLETE
|
||||
#undef JOURNEY4_STAGE1
|
||||
#undef JOURNEY4_STAGE1_END
|
||||
#undef JOURNEY4_STAGE2
|
||||
#undef JOURNEY4_STAGE2_END
|
||||
#undef JOURNEY4_STAGE3
|
||||
#undef JOURNEY4_STAGE3_END
|
||||
#undef JOURNEY4_COMPLETE
|
||||
#undef JOURNEY5_STAGE1
|
||||
#undef JOURNEY4_STAGE4_END
|
||||
#undef JOURNEY4_STAGE5_END
|
||||
#undef JOURNEY4_STAGE6_END
|
||||
#undef JOURNEY4_STAGE7_END
|
||||
#undef JOURNEY4_STAGE8_END
|
||||
#undef JOURNEY4_STAGE9_END
|
||||
#undef JOURNEY4_STAGE10_END
|
||||
#undef JOURNEY4_STAGE11_END
|
||||
#undef JOURNEY4_STAGE12_END
|
||||
#undef JOURNEY5_STAGE1_END
|
||||
#undef JOURNEY5_STAGE2
|
||||
#undef JOURNEY5_STAGE2_END
|
||||
#undef JOURNEY5_STAGE3
|
||||
#undef JOURNEY5_STAGE3_END
|
||||
#undef JOURNEY5_COMPLETE
|
||||
#undef JOURNEY6_STAGE1
|
||||
#undef JOURNEY6_STAGE1_END
|
||||
#undef JOURNEY6_STAGE2
|
||||
#undef JOURNEY6_STAGE2_END
|
||||
#undef JOURNEY6_STAGE3
|
||||
#undef JOURNEY6_STAGE3_END
|
||||
#undef JOURNEY6_COMPLETE
|
||||
#undef JOURNEY7_STAGE1
|
||||
#undef JOURNEY7_STAGE1_END
|
||||
#undef JOURNEY7_STAGE2
|
||||
#undef JOURNEY7_STAGE2_END
|
||||
#undef JOURNEY7_STAGE3
|
||||
#undef JOURNEY7_STAGE3_END
|
||||
#undef JOURNEY7_COMPLETE
|
||||
#undef JOURNEY8_STAGE1
|
||||
#undef JOURNEY8_STAGE1_END
|
||||
#undef JOURNEY8_STAGE2
|
||||
#undef JOURNEY8_STAGE2_END
|
||||
#undef JOURNEY8_STAGE3
|
||||
#undef JOURNEY8_STAGE3_END
|
||||
#undef JOURNEY8_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -1092,50 +1092,21 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef FLIGHT_STAGE1
|
||||
#undef FLIGHT_STAGE1_END
|
||||
#undef FLIGHT_STAGE2
|
||||
#undef FLIGHT_STAGE2_END
|
||||
#undef FLIGHT_STAGE3
|
||||
#undef FLIGHT_STAGE3_END
|
||||
#undef FLIGHT_COMPLETE
|
||||
#undef TREASURY_STAGE1
|
||||
#undef TREASURY_STAGE1_END
|
||||
#undef TREASURY_STAGE2
|
||||
#undef TREASURY_STAGE2_END
|
||||
#undef TREASURY_STAGE3
|
||||
#undef TREASURY_STAGE3_END
|
||||
#undef TREASURY_STAGE4
|
||||
#undef TREASURY_STAGE4_END
|
||||
#undef TREASURY_COMPLETE
|
||||
#undef BOOK_STAGE1
|
||||
#undef BOOK_STAGE1_END
|
||||
#undef BOOK_STAGE2
|
||||
#undef BOOK_STAGE2_END
|
||||
#undef BOOK_STAGE3
|
||||
#undef BOOK_STAGE3_END
|
||||
#undef BOOK_COMPLETE
|
||||
#undef ALLIANCE_STAGE1
|
||||
#undef ALLIANCE_STAGE1_END
|
||||
#undef ALLIANCE_STAGE2
|
||||
#undef ALLIANCE_STAGE2_END
|
||||
#undef ALLIANCE_STAGE3
|
||||
#undef ALLIANCE_STAGE3_END
|
||||
#undef ALLIANCE_STAGE4
|
||||
#undef ALLIANCE_STAGE4_END
|
||||
#undef ALLIANCE_COMPLETE
|
||||
#undef SAURIANS_STAGE1
|
||||
#undef SAURIANS_STAGE1_END
|
||||
#undef SAURIANS_STAGE2
|
||||
#undef SAURIANS_STAGE2_END
|
||||
#undef SAURIANS_STAGE3
|
||||
#undef SAURIANS_STAGE3_END
|
||||
#undef SAURIANS_COMPLETE
|
||||
#undef CIVILWAR_STAGE1
|
||||
#undef CIVILWAR_STAGE1_END
|
||||
#undef CIVILWAR_STAGE2
|
||||
#undef CIVILWAR_STAGE2_END
|
||||
#undef CIVILWAR_STAGE3
|
||||
#undef CIVILWAR_STAGE3_END
|
||||
#undef CIVILWAR_STAGE4
|
||||
#undef CIVILWAR_STAGE4_END
|
||||
|
|
|
|||
|
|
@ -309,21 +309,13 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY_STAGE1
|
||||
#undef JOURNEY_STAGE1_END
|
||||
#undef JOURNEY_STAGE2
|
||||
#undef JOURNEY_STAGE2_END
|
||||
#undef JOURNEY_STAGE3
|
||||
#undef JOURNEY_STAGE3_END
|
||||
#undef JOURNEY_STAGE4
|
||||
#undef JOURNEY_STAGE4_END
|
||||
#undef JOURNEY_STAGE5
|
||||
#undef JOURNEY_STAGE5_END
|
||||
#undef JOURNEY_STAGE6
|
||||
#undef JOURNEY_STAGE6_END
|
||||
#undef JOURNEY_STAGE7
|
||||
#undef JOURNEY_STAGE7_END
|
||||
#undef JOURNEY_STAGE8
|
||||
#undef JOURNEY_STAGE8_END
|
||||
#undef JOURNEY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -201,21 +201,14 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef REVOLT_STAGE1
|
||||
#undef REVOLT_STAGE1_END
|
||||
#undef REVOLT_STAGE2
|
||||
#undef REVOLT_STAGE2_END
|
||||
#undef REVOLT_STAGE3
|
||||
#undef REVOLT_STAGE3_END
|
||||
#undef REVOLT_COMPLETE
|
||||
#undef RESCUE_STAGE1
|
||||
#undef RESCUE_STAGE1_END
|
||||
#undef RESCUE_COMPLETE
|
||||
#undef RECOVERY_STAGE1
|
||||
#undef RECOVERY_STAGE1_END
|
||||
#undef RECOVERY_STAGE2
|
||||
#undef RECOVERY_STAGE2_END
|
||||
#undef RECOVERY_STAGE3
|
||||
#undef RECOVERY_STAGE3_END
|
||||
#undef RECOVERY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -528,36 +528,19 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef FLIGHT_STAGE1
|
||||
#undef FLIGHT_STAGE1_END
|
||||
#undef FLIGHT_STAGE2
|
||||
#undef FLIGHT_STAGE2_END
|
||||
#undef FLIGHT_STAGE3
|
||||
#undef FLIGHT_STAGE3_END
|
||||
#undef FLIGHT_COMPLETE
|
||||
#undef SEARCH_STAGE1
|
||||
#undef SEARCH_STAGE1_END
|
||||
#undef SEARCH_STAGE2
|
||||
#undef SEARCH_STAGE2_END
|
||||
#undef SEARCH_COMPLETE
|
||||
#undef MATERIALS_STAGE1
|
||||
#undef MATERIALS_STAGE1_END
|
||||
#undef MATERIALS_STAGE2
|
||||
#undef MATERIALS_STAGE2_END
|
||||
#undef MATERIALS_COMPLETE
|
||||
#undef TOOLS_STAGE1
|
||||
#undef TOOLS_STAGE1_END
|
||||
#undef TOOLS_STAGE2
|
||||
#undef TOOLS_STAGE2_END
|
||||
#undef TOOLS_COMPLETE
|
||||
#undef ALANIN_STAGE1
|
||||
#undef ALANIN_STAGE1_END
|
||||
#undef ALANIN_STAGE2
|
||||
#undef ALANIN_STAGE2_END
|
||||
#undef ALANIN_COMPLETE
|
||||
#undef FORGING_STAGE1
|
||||
#undef FORGING_STAGE1_END
|
||||
#undef FORGING_STAGE2
|
||||
#undef FORGING_STAGE2_END
|
||||
#undef FORGING_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -1453,37 +1453,17 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef CONQUEST_STAGE1
|
||||
#undef CONQUEST_STAGE1_END
|
||||
#undef CONQUEST_STAGE2
|
||||
#undef CONQUEST_STAGE2_END
|
||||
#undef CONQUEST_STAGE3
|
||||
#undef CONQUEST_STAGE3_END
|
||||
#undef CONQUEST_STAGE4
|
||||
#undef CONQUEST_STAGE4_END
|
||||
#undef CONQUEST_STAGE5
|
||||
#undef CONQUEST_STAGE5_END
|
||||
#undef CONQUEST_STAGE6
|
||||
#undef CONQUEST_STAGE6_END
|
||||
#undef CONQUEST_STAGE7
|
||||
#undef CONQUEST_STAGE7_END
|
||||
#undef CONQUEST_STAGE8
|
||||
#undef CONQUEST_STAGE8_END
|
||||
#undef CONQUEST_STAGE9
|
||||
#undef CONQUEST_STAGE9_END
|
||||
#undef CONQUEST_STAGE10
|
||||
#undef CONQUEST_STAGE10_END
|
||||
#undef CONQUEST_COMPLETE
|
||||
#undef REVENGE_STAGE1
|
||||
#undef REVENGE_STAGE1_END
|
||||
#undef REVENGE_STAGE2
|
||||
#undef REVENGE_STAGE2_END
|
||||
#undef REVENGE_COMPLETE
|
||||
#undef LONG_MARCH_STAGE1
|
||||
#undef LONG_MARCH_STAGE1_END
|
||||
#undef LONG_MARCH_COMPLETE
|
||||
#undef FINALE_STAGE1
|
||||
#undef FINALE_STAGE1_END
|
||||
#undef FINALE_COMPLETE
|
||||
|
||||
# trackplacer: epilog ends
|
||||
|
|
|
|||
|
|
@ -332,23 +332,14 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY_STAGE1
|
||||
#undef JOURNEY_STAGE1_END
|
||||
#undef JOURNEY_STAGE2
|
||||
#undef JOURNEY_STAGE2_END
|
||||
#undef JOURNEY_STAGE3
|
||||
#undef JOURNEY_STAGE3_END
|
||||
#undef JOURNEY_STAGE4
|
||||
#undef JOURNEY_STAGE4_END
|
||||
#undef JOURNEY_STAGE5
|
||||
#undef JOURNEY_STAGE5_END
|
||||
#undef JOURNEY_STAGE6
|
||||
#undef JOURNEY_STAGE6_END
|
||||
#undef JOURNEY_STAGE7
|
||||
#undef JOURNEY_STAGE7_END
|
||||
#undef JOURNEY_STAGE8
|
||||
#undef JOURNEY_STAGE8_END
|
||||
#undef JOURNEY_STAGE9
|
||||
#undef JOURNEY_STAGE9_END
|
||||
#undef JOURNEY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -666,39 +666,20 @@
|
|||
[/story]
|
||||
#enddef
|
||||
|
||||
#undef QUEST_CONDITIONAL
|
||||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef LANDING_STAGE1
|
||||
#undef LANDING_STAGE1_END
|
||||
#undef LANDING_COMPLETE
|
||||
#undef LANDING_TO_KALIAN_STAGE1
|
||||
#undef LANDING_TO_KALIAN_STAGE1_END
|
||||
#undef LANDING_TO_KALIAN_STAGE2
|
||||
#undef LANDING_TO_KALIAN_STAGE2_END
|
||||
#undef LANDING_TO_KALIAN_COMPLETE
|
||||
#undef KALIAN_TO_DRAGON_STAGE1
|
||||
#undef KALIAN_TO_DRAGON_STAGE1_END
|
||||
#undef KALIAN_TO_DRAGON_COMPLETE
|
||||
#undef KALIAN_TO_BEACH_STAGE1
|
||||
#undef KALIAN_TO_BEACH_STAGE1_END
|
||||
#undef KALIAN_TO_BEACH_COMPLETE
|
||||
#undef KALIAN_TO_TROLL_HOLE_STAGE1
|
||||
#undef KALIAN_TO_TROLL_HOLE_STAGE1_END
|
||||
#undef KALIAN_TO_TROLL_HOLE_COMPLETE
|
||||
#undef KALIAN_TO_CURSED_ISLE_STAGE1
|
||||
#undef KALIAN_TO_CURSED_ISLE_STAGE1_END
|
||||
#undef KALIAN_TO_CURSED_ISLE_COMPLETE
|
||||
#undef AFTER_QUEST_STAGE1
|
||||
#undef AFTER_QUEST_STAGE1_END
|
||||
#undef AFTER_QUEST_STAGE2
|
||||
#undef AFTER_QUEST_STAGE2_END
|
||||
#undef AFTER_QUEST_STAGE3
|
||||
#undef AFTER_QUEST_STAGE3_END
|
||||
#undef AFTER_QUEST_STAGE4
|
||||
#undef AFTER_QUEST_STAGE4_END
|
||||
#undef AFTER_QUEST_STAGE5
|
||||
#undef AFTER_QUEST_STAGE5_END
|
||||
#undef AFTER_QUEST_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -871,42 +871,22 @@
|
|||
[/story]
|
||||
#enddef
|
||||
|
||||
#undef FROM_OLDWOOD
|
||||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef FROM_STORMVALE_STAGE1
|
||||
#undef FROM_STORMVALE_STAGE1_END
|
||||
#undef FROM_STORMVALE_STAGE2
|
||||
#undef FROM_STORMVALE_STAGE2_END
|
||||
#undef FROM_STORMVALE_STAGE3
|
||||
#undef FROM_STORMVALE_STAGE3_END
|
||||
#undef FROM_STORMVALE_COMPLETE
|
||||
#undef THE_RIVER_ROAD_STAGE1
|
||||
#undef THE_RIVER_ROAD_STAGE1_END
|
||||
#undef THE_RIVER_ROAD_STAGE2
|
||||
#undef THE_RIVER_ROAD_STAGE2_END
|
||||
#undef THE_RIVER_ROAD_COMPLETE
|
||||
#undef THE_MIDLANDS_STAGE1
|
||||
#undef THE_MIDLANDS_STAGE1_END
|
||||
#undef THE_MIDLANDS_STAGE2
|
||||
#undef THE_MIDLANDS_STAGE2_END
|
||||
#undef THE_MIDLANDS_COMPLETE
|
||||
#undef EXODUS_STAGE1
|
||||
#undef EXODUS_STAGE1_END
|
||||
#undef EXODUS_STAGE2
|
||||
#undef EXODUS_STAGE2_END
|
||||
#undef EXODUS_STAGE3
|
||||
#undef EXODUS_STAGE3_END
|
||||
#undef EXODUS_STAGE4
|
||||
#undef EXODUS_STAGE4_END
|
||||
#undef EXODUS_STAGE5
|
||||
#undef EXODUS_STAGE5_END
|
||||
#undef EXODUS_STAGE6
|
||||
#undef EXODUS_STAGE6_END
|
||||
#undef EXODUS_STAGE7
|
||||
#undef EXODUS_STAGE7_END
|
||||
#undef EXODUS_STAGE8
|
||||
#undef EXODUS_STAGE8_END
|
||||
#undef EXODUS_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -74,11 +74,8 @@
|
|||
|
||||
# trackplacer: epilog begins
|
||||
|
||||
#undef JOURNEY_STAGE1
|
||||
#undef JOURNEY_STAGE1_END
|
||||
#undef JOURNEY_STAGE2
|
||||
#undef JOURNEY_STAGE2_END
|
||||
#undef JOURNEY_STAGE3
|
||||
#undef JOURNEY_STAGE3_END
|
||||
#undef JOURNEY_COMPLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -211,7 +211,8 @@ class JourneyTracks:
|
|||
fp.write(self.after)
|
||||
fp.write ("# trackplacer: epilog begins\n\n")
|
||||
for name in definitions:
|
||||
fp.write("#undef %s\n" % name)
|
||||
if "{" + name + "}" not in self.after:
|
||||
fp.write("#undef %s\n" % name)
|
||||
fp.write ("\n# trackplacer: epilog ends\n")
|
||||
fp.close()
|
||||
self.modified = 0
|
||||
|
|
@ -485,8 +486,9 @@ class TrackController:
|
|||
del self.editor.controller[track_id]
|
||||
|
||||
class TracksEditor:
|
||||
def __init__(self, path=None, verbose=False):
|
||||
def __init__(self, path=None, verbose=False, force_save=False):
|
||||
self.verbose = verbose
|
||||
self.force_save = force_save
|
||||
# Initialize our info about the map and track
|
||||
self.journey = JourneyTracks()
|
||||
self.last_read = None
|
||||
|
|
@ -916,7 +918,7 @@ class TracksEditor:
|
|||
|
||||
def save_handler(self, w):
|
||||
"Save track data,"
|
||||
if not self.journey.has_unsaved_changes():
|
||||
if not self.journey.has_unsaved_changes() and not self.force_save:
|
||||
w = gtk.MessageDialog(type=gtk.MESSAGE_INFO,
|
||||
flags=gtk.DIALOG_DESTROY_WITH_PARENT,
|
||||
buttons=gtk.BUTTONS_OK)
|
||||
|
|
@ -1177,18 +1179,20 @@ class TracksEditor:
|
|||
sys.exit(1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
(options, arguments) = getopt.getopt(sys.argv[1:], "d:hv?",
|
||||
['directory=', 'help', 'verbose'])
|
||||
verbose = False
|
||||
(options, arguments) = getopt.getopt(sys.argv[1:], "d:fhv?",
|
||||
['directory=', 'force', 'help', 'verbose'])
|
||||
verbose = force_save = False
|
||||
top = None
|
||||
for (opt, val) in options:
|
||||
if opt in ('-d', '--directory'):
|
||||
top = val
|
||||
elif opt in ('-f', '--force'):
|
||||
force_save = True
|
||||
elif opt in ('-?', '-h', '--help'):
|
||||
print __doc__
|
||||
sys.exit(0)
|
||||
elif opt in ('-v', '--verbose'):
|
||||
verbose=True
|
||||
verbose = True
|
||||
|
||||
here = os.getcwd()
|
||||
if top:
|
||||
|
|
@ -1201,7 +1205,7 @@ if __name__ == "__main__":
|
|||
# Relativize file path to current directory
|
||||
if filename.startswith(os.getcwd() + os.sep):
|
||||
filename = filename[len(os.getcwd())+1:]
|
||||
TracksEditor(path=filename, verbose=verbose)
|
||||
TracksEditor(path=filename, verbose=verbose, force_save=force_save)
|
||||
except IOException, e:
|
||||
if e.lineno:
|
||||
sys.stderr.write(('"%s", line %d: ' % (e.path, e.lineno)) + e.message + "\n")
|
||||
|
|
@ -1260,7 +1264,7 @@ if __name__ == "__main__":
|
|||
if filename.startswith(os.getcwd() + os.sep):
|
||||
filename = filename[len(os.getcwd())+1:]
|
||||
|
||||
TracksEditor(filename, verbose=verbose)
|
||||
TracksEditor(filename, verbose=verbose, force_save=force_save)
|
||||
except IOException, e:
|
||||
w = gtk.MessageDialog(type=gtk.MESSAGE_ERROR,
|
||||
flags=gtk.DIALOG_DESTROY_WITH_PARENT,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue