From 43e2048246e12f0a7805d388a14b3463abd292c7 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 15 Mar 2008 07:08:07 +0000 Subject: [PATCH] No need for the speaker canomicalizatuin any more. --- data/campaigns/Liberty/scenarios/08_Glory.cfg | 3 +-- data/campaigns/tutorial/scenarios/1_Tutorial.cfg | 8 ++------ data/tools/wmllint | 6 +----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/data/campaigns/Liberty/scenarios/08_Glory.cfg b/data/campaigns/Liberty/scenarios/08_Glory.cfg index 2e060198f2f..af4a1b9606c 100644 --- a/data/campaigns/Liberty/scenarios/08_Glory.cfg +++ b/data/campaigns/Liberty/scenarios/08_Glory.cfg @@ -779,10 +779,9 @@ # [terrain_mask] x,y=15,11 -usage=mask + map_data="usage=mask border=0 -map_data=" Re , Mm^Xm , Re , Ww , Rr , Ww^Bw| , Rr , Rr , Gs^Fp , Mm^Xm , Gs^Fp Mm , Chr , Mm^Xm , Re , Uh , Uu , Uh , Uh , Mm^Xm , Uu , Mm^Xm Uu , Uu , Qxu , Uu , Re , Qxu , Re , Qxu , Chr , Rr , Chr diff --git a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg index cc073aa0ce4..6fc7ae95147 100644 --- a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg +++ b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg @@ -45,14 +45,10 @@ id=tutorial translator_comment=_ "Hello translators! Tutorial is meant to be a little funny at the start, welcoming new players. Please keep friendly fun feeling! Any questions email rusty@rustcorp.com.au!" name=_ "Wesnoth Tutorial" -usage=map + map_data="usage=map border_size=1 -border_size=1 -usage=map - -map_data=" - Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp +Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Ww, Ww, Gg^Ve, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp diff --git a/data/tools/wmllint b/data/tools/wmllint index 412aa778af8..2397cb80eca 100755 --- a/data/tools/wmllint +++ b/data/tools/wmllint @@ -1004,9 +1004,6 @@ def hack_syntax(filename, lines): precomment = lines[i].split("#")[0] if '[message]' in precomment: in_message = True - elif in_message and re.search("[^_]description=", precomment): - lines[i] = lines[i].replace("description=", "speaker=") - modcount += 1 if "speaker=narrator" in precomment: need_image = True elif precomment.strip().startswith("image"): @@ -2152,8 +2149,7 @@ if __name__ == '__main__': under("side") or \ re.search("{[A-Z]+.*description=.*}", line): transformed = re.sub(r"\bdescription\s*=", "id=", line) - transformed = re.sub(r"user_description\s*=", "description=", line) - # + transformed = re.sub(r"user_description\s*=", "description=", line) # Report the changes if verbose > 0 and transformed != line: msg = "%s, line %d: %s -> %s" % \