mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
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
This was SVN commit r7686.
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "ObjectManager.h"
|
||||
#include "ps/XML/Xeromyces.h"
|
||||
#include "ps/Filesystem.h"
|
||||
#include "ps/CLogger.h"
|
||||
#include "lib/timer.h"
|
||||
#include "lib/rand.h"
|
||||
@@ -42,7 +43,7 @@ CObjectBase::CObjectBase(CObjectManager& objectManager)
|
||||
bool CObjectBase::Load(const VfsPath& pathname)
|
||||
{
|
||||
CXeromyces XeroFile;
|
||||
if (XeroFile.Load(pathname) != PSRETURN_OK)
|
||||
if (XeroFile.Load(g_VFS, pathname) != PSRETURN_OK)
|
||||
return false;
|
||||
|
||||
// Define all the elements used in the XML file
|
||||
|
||||
Reference in New Issue
Block a user