# HG changeset patch
# User nemo
# Date 1381689614 14400
# Node ID db77654c35655a02fba947a143675a3fb126a2ef
# Parent  0dc3b8f94b0bc12811a4862dd65a07f5f5695828# Parent  7fcdedc455897f8ab10331062f26a2945c670781
merge last rev

diff -r 0dc3b8f94b0b -r db77654c3565 hedgewars/uPhysFSLayer.pas
--- a/hedgewars/uPhysFSLayer.pas	Sun Oct 13 14:21:35 2013 -0400
+++ b/hedgewars/uPhysFSLayer.pas	Sun Oct 13 14:40:14 2013 -0400
@@ -143,10 +143,14 @@
 
     i:= PHYSFS_mount(Str2PChar(PathPrefix), nil, false);
     AddFileLog('[PhysFS] mount ' + PathPrefix + ': ' + inttostr(i));
-    i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/'), '/', false);
-    AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/: ' + inttostr(i));
+    i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/Data'), nil, false);
+    AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/Data: ' + inttostr(i));
 
     hedgewarsMountPackages;
+
+    i:= PHYSFS_mount(Str2PChar(UserPathPrefix), nil, false);
+    // need access to teams and frontend configs (for bindings)
+    AddFileLog('[PhysFS] mount ' + UserPathPrefix + ': ' + inttostr(i)); 
 end;
 
 procedure freeModule;
diff -r 0dc3b8f94b0b -r db77654c3565 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Sun Oct 13 14:21:35 2013 -0400
+++ b/hedgewars/uScript.pas	Sun Oct 13 14:40:14 2013 -0400
@@ -2088,7 +2088,10 @@
 begin
 s:= cPathz[ptData] + name;
 if not pfsExists(s) then
+    begin
+    AddFileLog('[LUA] Script not found: ' + name);
     exit;
+    end;
 
 f:= pfsOpenRead(s);
 if f = nil then