Daniele Bartolini 9 lat temu
rodzic
commit
27be018108

+ 1 - 1
src/core/filesystem/filesystem_disk.cpp

@@ -368,7 +368,7 @@ void FilesystemDisk::get_absolute_path(const char* path, DynamicString& os_path)
 		return;
 		return;
 	}
 	}
 
 
-	path::join(_prefix.c_str(), path, os_path);
+	path::join(os_path, _prefix.c_str(), path);
 }
 }
 
 
 } // namespace crown
 } // namespace crown

+ 1 - 1
src/core/filesystem/path.cpp

@@ -44,7 +44,7 @@ namespace path
 #endif
 #endif
 	}
 	}
 
 
-	void join(const char* path_a, const char* path_b, DynamicString& path)
+	void join(DynamicString& path, const char* path_a, const char* path_b)
 	{
 	{
 		CE_ENSURE(NULL != path_a);
 		CE_ENSURE(NULL != path_a);
 		CE_ENSURE(NULL != path_b);
 		CE_ENSURE(NULL != path_b);

+ 1 - 1
src/core/filesystem/path.h

@@ -31,7 +31,7 @@ namespace path
 	bool is_root(const char* path);
 	bool is_root(const char* path);
 
 
 	/// Appends @a path_b to @a path_a and fills @a path with the result.
 	/// Appends @a path_b to @a path_a and fills @a path with the result.
-	void join(const char* path_a, const char* path_b, DynamicString& path);
+	void join(DynamicString& path, const char* path_a, const char* path_b);
 
 
 	/// Returns the basename of the @a path.
 	/// Returns the basename of the @a path.
 	/// @note
 	/// @note

+ 1 - 1
src/resource/data_compiler.cpp

@@ -148,7 +148,7 @@ bool DataCompiler::compile(FilesystemDisk& bundle_fs, const char* type, const ch
 	dst_path += '-';
 	dst_path += '-';
 	dst_path += name_str;
 	dst_path += name_str;
 
 
-	path::join(CROWN_DATA_DIRECTORY, dst_path.c_str(), path);
+	path::join(path, CROWN_DATA_DIRECTORY, dst_path.c_str());
 
 
 	logi("%s <= %s", dst_path.c_str(), src_path.c_str());
 	logi("%s <= %s", dst_path.c_str(), src_path.c_str());