test

git-svn-id: http://svn.net-core.org/repos/t-engine4@6456 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Module.lua

@@ -362,13 +362,13 @@ function _M:loadAddons(mod, saveuse)
 
 		if add.data then
 			print(" * with data")
-			if add.teaa then fs.mount("subdir:/data/@"..fs.getRealPath(add.teaa), "/data-"..add.short_name, true)
+			if add.teaa then fs.mount("subdir:/data/|"..fs.getRealPath(add.teaa), "/data-"..add.short_name, true)
 			else fs.mount(base.."/data", "/data-"..add.short_name, true)
 			end
 		end
 		if add.superload then 
 			print(" * with superload")
-			if add.teaa then fs.mount("subdir:/superload/@"..fs.getRealPath(add.teaa), "/mod/addons/"..add.short_name.."/superload", true)
+			if add.teaa then fs.mount("subdir:/superload/|"..fs.getRealPath(add.teaa), "/mod/addons/"..add.short_name.."/superload", true)
 			else fs.mount(base.."/superload", "/mod/addons/"..add.short_name.."/superload", true)
 			end
 			
@@ -376,15 +376,23 @@ function _M:loadAddons(mod, saveuse)
 		end
 		if add.overload then
 			print(" * with overload")
-			if add.teaa then fs.mount("subdir:/overload/@"..fs.getRealPath(add.teaa), "/", false)
+			if add.teaa then fs.mount("subdir:/overload/|"..fs.getRealPath(add.teaa), "/", false)
 			else fs.mount(base.."/overload", "/", false)
 			end
 		end
 		if add.hooks then
-			if add.teaa then fs.mount("subdir:/hooks/@"..fs.getRealPath(add.teaa), "/hooks/"..add.short_name, true)
+			if add.teaa then fs.mount("subdir:/hooks/|"..fs.getRealPath(add.teaa), "/hooks/"..add.short_name, true)
 			else fs.mount(base.."/hooks", "/hooks/"..add.short_name, true)
 			end
 
+			print("==== all path")
+			table.print(fs.getSearchPath(true))
+			print("==== hooks")
+			table.print(fs.list("/hooks"))
+			print("==== addon hooks")
+			table.print(fs.list("/hooks/"..add.short_name))
+			print("====")
+
 			self:setCurrentHookDir("/hooks/"..add.short_name.."/")
 			dofile("/hooks/"..add.short_name.."/load.lua")
 			self:setCurrentHookDir(nil)

src/physfs/archivers/subzip.c

@@ -86,7 +86,7 @@ static int SUBZIP_isArchive(const char *name, int forWriting)
 	int len = strlen(name);
 	if (len < 11) return 0;
 	if (name[0] != 's' || name[1] != 'u' || name[2] != 'b' || name[3] != 'd' || name[4] != 'i' || name[5] != 'r' || name[6] != ':' || name[7] != '/') return 0;
-	char *realfile = strrchr(name, '@');
+	char *realfile = strrchr(name, '|');
 	if (!realfile) return 0;
 
 	return __PHYSFS_Archiver_ZIP.isArchive(realfile+1, forWriting);
@@ -100,7 +100,7 @@ static void *SUBZIP_openArchive(const char *name, int forWriting)
 	int len = strlen(name);
 	if (len < 11) return NULL;
 	if (name[0] != 's' || name[1] != 'u' || name[2] != 'b' || name[3] != 'd' || name[4] != 'i' || name[5] != 'r' || name[6] != ':' || name[7] != '/') return NULL;
-	char *realfile = strrchr(name, '@');
+	char *realfile = strrchr(name, '|');
 	if (!realfile) return NULL;
 
 	dvoid *opaque = __PHYSFS_Archiver_ZIP.openArchive(realfile+1, forWriting);