summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhercules/tmx_converter.py4
-rwxr-xr-xtestxml/testxml.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/hercules/tmx_converter.py b/hercules/tmx_converter.py
index 5efe117..611abee 100755
--- a/hercules/tmx_converter.py
+++ b/hercules/tmx_converter.py
@@ -204,8 +204,8 @@ class ContentHandler(xml.sax.ContentHandler):
self.state = State.LAYER
# Map width must be enough to fill the largest widescreen on market
if (self.width < WIDESCREEN/TILESIZE):
- print('Bad map width: %d (min. %d)' % (self.width, WIDESCREEN/TILESIZE))
- raise Exception('Invalid map width: %d (min. %d)' % (self.width, WIDESCREEN/TILESIZE))
+ print('\n\nERROR: invalid map width: %d (min. %d)' % (self.width, WIDESCREEN/TILESIZE))
+ #raise SyntaxError('width')
elif self.state is State.LAYER:
if name == u'layer':
self.layers.add(attr[u'name'].lower())
diff --git a/testxml/testxml.py b/testxml/testxml.py
index 6d16094..83723ab 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -44,6 +44,7 @@ warnings = 0
errDict = set()
safeDye = False
borderSize = 14
+widescreenSize = 1920/32
colorsList = set()
showAll = False
silent = False
@@ -1403,6 +1404,8 @@ def testMap(mapName, file, path):
if mapHeight < borderSize * 2 + 1:
if silent == False or file.find("maps/test") != 0:
showMsgFile(file, "map height to small: " + str(mapHeight), False)
+ if mapWidth < widescreenSize:
+ showMsgFile(file, "error: map width below widescreen minimum: " + str(mapHeight), True)
if len(dom.getElementsByTagName("properties")) < 1:
showMsgFile(file, "missing map properties", True)