diff options
| -rwxr-xr-x | hercules/tmx_converter.py | 4 | ||||
| -rwxr-xr-x | testxml/testxml.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hercules/tmx_converter.py b/hercules/tmx_converter.py index 30e1a31..0393a39 100755 --- a/hercules/tmx_converter.py +++ b/hercules/tmx_converter.py @@ -282,8 +282,8 @@ class ContentHandler(xml.sax.ContentHandler): heigherror=False # 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'data': if attr.get(u'encoding','') not in (u'', u'csv'): diff --git a/testxml/testxml.py b/testxml/testxml.py index f3d87b0..5600a7c 100755 --- a/testxml/testxml.py +++ b/testxml/testxml.py @@ -44,6 +44,7 @@ warnings = 0 errDict = set() safeDye = False borderSize = 14 # Required 18 # Original 14 +widescreenSize = 1920/32 tiledVersion = 13 # Minimum Tiled version, advised "14" for Tiled 1.4 colorsList = set() showAll = False @@ -1421,6 +1422,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) |