23 lines
892 B
Diff
23 lines
892 B
Diff
|
--- 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp
|
||
|
|
+++ 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp
|
||
|
|
@@ -785,7 +785,7 @@
|
||
|
|
files.push_back(f);
|
||
|
|
p = p / GetWstringFromWpath(*it);
|
||
|
|
}
|
||
|
|
- return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
|
||
|
|
+ return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
--- 0ad-0.0.26-alpha/source/lib/file/file_system.cpp
|
||
|
|
+++ 0ad-0.0.26-alpha/source/lib/file/file_system.cpp
|
||
|
|
@@ -218,7 +218,7 @@
|
||
|
|
try
|
||
|
|
{
|
||
|
|
if(override_if_exists)
|
||
|
|
- fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists);
|
||
|
|
+ fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing);
|
||
|
|
else
|
||
|
|
fs::copy_file(fs::path(path.string()), fs::path(newPath.string()));
|
||
|
|
}
|