From 3becab75b8f672bb99f2d47c576896deb4c382fc Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Tue, 29 Jan 2013 19:39:04 +0000 Subject: [PATCH] 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 --- python/dialog/npc_dialog.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/dialog/npc_dialog.py b/python/dialog/npc_dialog.py index c5b7029df..5aeae3c45 100644 --- 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)