Changed prvm_ed_loadfromfile - it isnt really compatible with the old vm anymore...

[xonotic/darkplaces.git] / prvm_cmds.c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index bf26c4b4e3c5e86e9630b11863319d67ad3c854a..0b4fb015b32a5798be9b43617e7dceb41420e548 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -2145,13 +2145,15 @@ void VM_loadfromfile(void)
                return;
        }
 
-       data = FS_LoadFile(va("data/%s", filename), false);
+       // not conform with VM_fopen
+       data = FS_LoadFile(filename, false);
        if (data == NULL)
                PRVM_G_FLOAT(OFS_RETURN) = -1;
        
        PRVM_ED_LoadFromFile(data);
 
-       Mem_Free(data);
+       if(data)
+               Mem_Free(data);
 }