mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-28 23:13:09 +00:00
refactor path interface:
- use wrapper class instead of std::wstring (reduces mixing of strings/paths; allows safe+easy join via operator/ and convenient case-insensitive comparison via operator==, avoids NativePathFromString, similar to boost::filesystem) - NativePath -> OsPath - add hash and To/FromJSVal for Path - add TS_ASSERT_PATH_EQUALS - replace _wfopen_s with sys_OpenFile - remove obsolete SortFiles/Directories This was SVN commit r9107.
This commit is contained in:
+2
-2
@@ -1083,7 +1083,7 @@ void CGUI::LoadXmlFile(const VfsPath& Filename, boost::unordered_set<VfsPath>& P
|
||||
}
|
||||
catch (PSERROR_GUI& e)
|
||||
{
|
||||
LOGERROR(L"Errors loading GUI file %ls (%d)", Filename.c_str(), e.getCode());
|
||||
LOGERROR(L"Errors loading GUI file %ls (%d)", Filename.string().c_str(), e.getCode());
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1578,7 +1578,7 @@ void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite
|
||||
|
||||
if (attr_name == "texture")
|
||||
{
|
||||
image.m_TextureName = Path::Join("art/textures/ui", attr_value);
|
||||
image.m_TextureName = VfsPath("art/textures/ui") / attr_value;
|
||||
}
|
||||
else
|
||||
if (attr_name == "size")
|
||||
|
||||
Reference in New Issue
Block a user