Tentative fix for a Windows bug with 'include' in dialogs.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18568 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-01-29 19:39:04 +00:00 · 2013-01-29 19:39:04 +00:00 · 3becab75b8
parent fdbd121254
commit 3becab75b8
1 changed files with 2 additions and 0 deletions
--- a/python/dialog/npc_dialog.py
+++ b/python/dialog/npc_dialog.py
@ -55,6 +55,8 @@ def parseJSON(filename, relpath):
        if filenm[0] == "/":
            filepath = os.path.join(Crossfire.DataDirectory(),
                            Crossfire.MapDirectory(), filenm[1:])
+        elif relpath != '':
+            filepath = os.path.join(relpath, filenm)
        else:
            filepath = os.path.join(Crossfire.DataDirectory(),
                            Crossfire.MapDirectory(), relpath, filenm)