summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtestxml/testxml.py8
-rw-r--r--testxml/xsd/tmw.xsd1
2 files changed, 1 insertions, 8 deletions
diff --git a/testxml/testxml.py b/testxml/testxml.py
index 85401d5..dfa3814 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -1309,7 +1309,6 @@ def testParticles(id, node, nodeName, src):
def testSounds(id, node, type):
global errors
- havemiss = False
for sound in node.getElementsByTagName("sound"):
try:
event = sound.attributes["event"].value
@@ -1323,14 +1322,9 @@ def testSounds(id, node, type):
print "error: incorrect sound event name " + event + " in id=" + id
errors = errors + 1
elif type == "item":
- if event != "hit" and event != "strike" and event != "miss":
+ if event != "hit" and event != "miss":
print "error: incorrect sound event name " + event + " in id=" + id
errors = errors + 1
- if event == "strike" or event == "miss":
- if havemiss:
- print "error: miss and strike attributes at same time in id=" + id
- errors = errors + 1
- havemiss = True
testSound(sound.childNodes[0].data, sfxDir, "")
diff --git a/testxml/xsd/tmw.xsd b/testxml/xsd/tmw.xsd
index 3c37b0f..ec41775 100644
--- a/testxml/xsd/tmw.xsd
+++ b/testxml/xsd/tmw.xsd
@@ -1001,7 +1001,6 @@
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="hit"/>
- <xs:enumeration value="strike"/>
<xs:enumeration value="miss"/>
<xs:enumeration value="use"/>
<xs:enumeration value="equip"/>