Author: esr
Date: Thu May 3 09:56:47 2007
New Revision: 17281
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17281&view=rev
Log:
Fix a regexp bug that was preventing proper map translation.
Modified:
trunk/data/tools/upconvert
Modified: trunk/data/tools/upconvert
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/upconvert?rev=17281&r1=17280&r2=17281&view=diff
==============================================================================
--- trunk/data/tools/upconvert (original)
+++ trunk/data/tools/upconvert Thu May 3 09:56:47 2007
@@ -369,9 +369,9 @@
# 1.3.1 -> 1.3.2 terrain conversions
conversion2 = {
- re.compile(r"(?<!\^)Bww([|/\\])\b") : "Ww^Bw\\1",
- re.compile(r"(?<!\^)Bwo([|/\\])\b") : "Wo^Bw\\1",
- re.compile(r"(?<!\^)Bss([|/\\])\b") : "Ss^Bw\\1",
+ re.compile(r"(?<!\^)Bww([|/\\])") : "Ww^Bw\\1",
+ re.compile(r"(?<!\^)Bwo([|/\\])") : "Wo^Bw\\1",
+ re.compile(r"(?<!\^)Bss([|/\\])") : "Ss^Bw\\1",
re.compile(r"(?<!\^)Dc\b") : "Dd^Dc",
re.compile(r"(?<!\^)Dr\b") : "Dd^Dr",
re.compile(r"(?<!\^)Do\b") : "Dd^Do",
@@ -404,7 +404,6 @@
def maptransform2(input, baseline, inmap, y):
"Convert a map line from 1.3.1 multiletter format to 1.3.2 format."
mapline = inmap[y]
- print "Called on:", mapline
for (old, new) in conversion2.items():
mapline = old.sub(new, mapline)
return mapline
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
