From bf05109ae3a06961cb5d5d02fc6917a88a53870b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 11 Jun 2012 02:04:11 +0300 Subject: testxml: fix error in multiple imagesets. --- testxml/testxml.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'testxml/testxml.py') diff --git a/testxml/testxml.py b/testxml/testxml.py index a20051d..ceba29b 100755 --- a/testxml/testxml.py +++ b/testxml/testxml.py @@ -407,6 +407,7 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser showMsgSprite(fileLoc, "incorrect number of imageset tags", iserr) return isets = set() + imagesetnums = dict() num = 0 for imageset in imagesets: try: @@ -519,7 +520,8 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser + ". Frames number " + str(num) + ", id=" + str(id), iserr) if num < 1: showMsgSprite(fileLoc, "image have zero frames: " + image, iserr) - + if name is not None and num > 0: + imagesetnums[name] = num try: includes = dom.getElementsByTagName("include") @@ -556,6 +558,15 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser except: showMsgSprite("no action name", iserr) continue + try: + setname = action.attributes["imageset"].value + except: + setname = "" + if setname in imagesetnums: + num = imagesetnums[setname] + else: + num = 0 + showMsgSprite(fileLoc, "using incorrect imageset name in action: " + name, iserr) frameSet = frameSet | testSpriteAction(fileLoc, name, action, num, iserr) if name in actset: -- cgit v1.2.3-70-g09d2