Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge last rev
authornemo
Sun, 13 Oct 2013 14:40:14 -0400
changeset 9533 db77654c3565
parent 9530 0dc3b8f94b0b (current diff)
parent 9531 7fcdedc45589 (diff)
child 9535 08be603491c7
merge last rev
--- 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;
--- 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
hedgewars