summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-23 12:33:09 -0300
committerFedja Beader <fedja@protonmail.ch>2024-10-15 02:08:44 +0200
commitada7796794b8202e0b345d3c3553e04a240677fc (patch)
treec57f5ae56cf55ff28bc9f90e277a91715b915d15
parentaae7f6b6ea703ef891c5ae34e708a6b88cfd6a5a (diff)
downloadtools-ada7796794b8202e0b345d3c3553e04a240677fc.tar.gz
tools-ada7796794b8202e0b345d3c3553e04a240677fc.tar.bz2
tools-ada7796794b8202e0b345d3c3553e04a240677fc.tar.xz
tools-ada7796794b8202e0b345d3c3553e04a240677fc.zip
The one who should be breaking is not tmx_converter but testxml
-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 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)