From 690b587d1693ebed5504731b091472c0f35d1bad Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 8 Apr 2016 23:41:41 +0300 Subject: testxml: fix wrong report about duplicate action with same name and different hp. --- testxml/testxml.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'testxml/testxml.py') diff --git a/testxml/testxml.py b/testxml/testxml.py index 373f1d0..3752076 100755 --- a/testxml/testxml.py +++ b/testxml/testxml.py @@ -593,6 +593,10 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser except: showMsgSprite("no action name", iserr) continue + try: + hp = action.attributes["hp"].value + except: + hp = "" try: setname = action.attributes["imageset"].value except: @@ -604,10 +608,10 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser showMsgSprite(fileLoc, "using incorrect imageset name in action: " + name, iserr) frameSet = frameSet | testSpriteAction(fileLoc, name, action, num, iserr) - if name in actset: + if name + "|" + hp in actset: showMsgSprite(fileLoc, "duplicate action: " + name, iserr) continue - actset.add(name) + actset.add(name + "|" + hp) if len(frameSet) > 0: errIds = "" -- cgit v1.2.3-70-g09d2