Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fixed logic error in VFS choose-loose-or-archive-file decision (was causing the archive file to be used regardless of whether the loose one was newer or not)

Browse Source 
This was SVN commit r5994.
This commit is contained in:
janwas 2008-05-31 18:50:39 +00:00
parent 3d6d8c1efc
commit 9f3c3df49c
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/lib/file/vfs/vfs_tree.cpp
View File

@ -25,17 +25,24 @@ VfsFile::VfsFile(const std::string& name, off_t size, time_t mtime, size_t prior
bool VfsFile::IsSupersededBy(const VfsFile& file) const
{
// 1) priority is lower => no.
if(file.m_priority < m_priority)
// 1) priority (override mods)
if(file.m_priority < m_priority) // lower priority
return false;
// 2) timestamp is older => no.
// (note: we need to account for FAT's 2 sec. resolution)
if(difftime(file.MTime(), MTime()) < -2.0)
return false;
// 2) timestamp
{
const double howMuchNewer = difftime(file.MTime(), MTime());
const double threshold = 2.0; // [seconds]; resolution provided by FAT
if(howMuchNewer > threshold) // newer timestamp
return true;
if(howMuchNewer < threshold) // older timestamp
return false;
// else: "equal" (tolerating small differences due to FAT's low
// mtime resolution)
}
// 3) provider is less efficient => no.
if(file.m_loader->Precedence() < m_loader->Precedence())
// 3) precedence (efficiency of file provider)
if(file.m_loader->Precedence() < m_loader->Precedence()) // less efficient
return false;
return true;
@ -139,7 +146,7 @@ void VfsDirectory::DisplayR(size_t depth) const
{
static const char indent[] = " ";
const int maxNameChars = 80 - depth*(sizeof(indent)-1);
const size_t maxNameChars = 80 - depth*(sizeof(indent)-1);
char fmt[20];
sprintf_s(fmt, ARRAY_SIZE(fmt), "%%-%d.%ds %%s", maxNameChars, maxNameChars);

2
source/lib/file/vfs/vfs_tree.h
View File

@ -46,7 +46,7 @@ private:
off_t m_size;
time_t m_mtime;
unsigned m_priority;
size_t m_priority;
PIFileLoader m_loader;
};