forked from 0ad/0ad
Remove some redundant code
This was SVN commit r11252.
This commit is contained in:
parent
2afc4d9d8f
commit
e9bbf25997
@ -310,9 +310,6 @@ bool CColladaManager::GenerateCachedFile(const VfsPath& sourcePath, FileType typ
|
||||
}
|
||||
|
||||
CCacheLoader cacheLoader(m_VFS, extn);
|
||||
MD5 hash;
|
||||
u32 version;
|
||||
PrepareCacheKey(hash, version);
|
||||
|
||||
archiveCachePath = cacheLoader.ArchiveCachePath(sourcePath);
|
||||
|
||||
|
@ -178,8 +178,6 @@ void CConsole::Render()
|
||||
|
||||
PROFILE3_GPU("console");
|
||||
|
||||
CFont font(CONSOLE_FONT);
|
||||
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
|
@ -62,24 +62,15 @@ void CXeromyces::Terminate()
|
||||
g_XeromycesStarted = false;
|
||||
}
|
||||
|
||||
void CXeromyces::PrepareCacheKey(MD5& hash, u32& version)
|
||||
{
|
||||
// We don't have anything special to add into the hash
|
||||
UNUSED2(hash);
|
||||
|
||||
// Arbitrary version number - change this if we update the code and
|
||||
// need to invalidate old users' caches
|
||||
version = 1;
|
||||
}
|
||||
|
||||
PSRETURN CXeromyces::Load(const PIVFS& vfs, const VfsPath& filename)
|
||||
{
|
||||
ENSURE(g_XeromycesStarted);
|
||||
|
||||
CCacheLoader cacheLoader(vfs, L".xmb");
|
||||
MD5 hash;
|
||||
u32 version;
|
||||
PrepareCacheKey(hash, version);
|
||||
|
||||
// Arbitrary version number - change this if we update the code and
|
||||
// need to invalidate old users' caches
|
||||
u32 version = 1;
|
||||
|
||||
VfsPath xmbPath;
|
||||
Status ret = cacheLoader.TryLoadingCached(filename, MD5(), version, xmbPath);
|
||||
@ -113,9 +104,6 @@ PSRETURN CXeromyces::Load(const PIVFS& vfs, const VfsPath& filename)
|
||||
bool CXeromyces::GenerateCachedXMB(const PIVFS& vfs, const VfsPath& sourcePath, VfsPath& archiveCachePath)
|
||||
{
|
||||
CCacheLoader cacheLoader(vfs, L".xmb");
|
||||
MD5 hash;
|
||||
u32 version;
|
||||
PrepareCacheKey(hash, version);
|
||||
|
||||
archiveCachePath = cacheLoader.ArchiveCachePath(sourcePath);
|
||||
|
||||
|
@ -72,8 +72,6 @@ public:
|
||||
static void Terminate();
|
||||
|
||||
private:
|
||||
void PrepareCacheKey(MD5& hash, u32& version);
|
||||
|
||||
PSRETURN ConvertFile(const PIVFS& vfs, const VfsPath& filename, const VfsPath& xmbPath);
|
||||
|
||||
bool ReadXMBFile(const PIVFS& vfs, const VfsPath& filename);
|
||||
|
Loading…
Reference in New Issue
Block a user