From a23e7cf3a06901565fd664b9609b1373d184a054 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Jul 2014 18:09:12 +0300 Subject: testxml: fix dye channel messages. --- testxml/testxml.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'testxml/testxml.py') diff --git a/testxml/testxml.py b/testxml/testxml.py index e1d2b32..90670a8 100755 --- a/testxml/testxml.py +++ b/testxml/testxml.py @@ -295,14 +295,14 @@ def testDyeColors(id, color, text, src, iserr): continue return len(colors) -def testDyeMark(file, color, text, iserr): +def testDyeChannel(file, color, text, iserr): if len(color) < 1: - showMsgSprite(file, "dye mark size to small:" + text, iserr) + showMsgSprite(file, "dye channel size to small:" + text, iserr) return -1 colors = dyesplit1.split(color) for c in colors: if len(c) != 1: - showMsgSprite(file, "dye mark incorrect size: " + text, iserr) + showMsgSprite(file, "dye channel incorrect size: " + text, iserr) continue if c != "R" and c != "G" and c != "B" and c != "Y" and c != "M" \ and c != "C" and c != "W" and c != "S": @@ -481,7 +481,7 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser showMsgSprite(fileLoc, "no height attribute", iserr) if imagecolor != "": - num = testDyeMark(fileLoc, imagecolor, image0, iserr) + num = testDyeChannel(fileLoc, imagecolor, image0, iserr) if safeDye == False and dnum != num: if dnum > num: e = iserr @@ -1111,7 +1111,7 @@ def testItems(fileName, imgDir): if colors is None: testDye(id, imagecolor, "image=" + image0, fileName, True) else: - testDyeMark(id, imagecolor, "image=" + image0, True) + testDyeChannel(id, imagecolor, "image=" + image0, True) if colors not in colorsList: print "error: " + fileName + ": colors value " + colors + " not found in itemcolors.xml" errors = errors + 1 @@ -1120,7 +1120,7 @@ def testItems(fileName, imgDir): if colors is None: testDye(id, floorcolor, "floor=" + floor0, fileName, True) else: - testByeMark(id, imagecolor, "floor=" + floor0, True); + testDyeChannel(id, imagecolor, "floor=" + floor0, True); if colors not in colorsList: print "error: " + fileName + ": colors value " + colors + " not found in itemcolors.xml" errors = errors + 1 -- cgit v1.2.3-60-g2f50