mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-14 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

less global variables: make most uses of g_VFS explicit (required for another app that has two VFSes), g_yres is no longer required by cursor module

Browse Source 
This was SVN commit r7686.
This commit is contained in:
janwas
2010-07-04 10:15:53 +00:00
parent d764473844
commit d2cf6ceb88
48 changed files with 199 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
+2 -2
View File
@@ -987,7 +987,7 @@ void CGUI::LoadXmlFile(const VfsPath& Filename, std::set<VfsPath>& Paths)
Paths.insert(Filename);
CXeromyces XeroFile;
if (XeroFile.Load(Filename) != PSRETURN_OK)
if (XeroFile.Load(g_VFS, Filename) != PSRETURN_OK)
// Fail silently
return;
@@ -1300,7 +1300,7 @@ void CGUI::Xeromyces_ReadObject(XMBElement Element, CXeromyces* pFile, IGUIObjec
{
Paths.insert(filename);
CVFSFile scriptfile;
if (scriptfile.Load(filename) != PSRETURN_OK)
if (scriptfile.Load(g_VFS, filename) != PSRETURN_OK)
{
LOGERROR(L"Error opening GUI script action file '%ls'", filename.c_str());
throw PSERROR_GUI_JSOpenFailed();