From 9f3c3df49cccd3dad20252573721fa3b418587c4 Mon Sep 17 00:00:00 2001
From: janwas <jan@wildfiregames.com>
Date: Sat, 31 May 2008 18:50:39 +0000
Subject: [PATCH] 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)

This was SVN commit r5994.
---
 source/lib/file/vfs/vfs_tree.cpp | 25 ++++++++++++++++---------
 source/lib/file/vfs/vfs_tree.h   |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/source/lib/file/vfs/vfs_tree.cpp b/source/lib/file/vfs/vfs_tree.cpp
index 8323cb1ab0..4e5ef81f7e 100644
--- a/source/lib/file/vfs/vfs_tree.cpp
+++ b/source/lib/file/vfs/vfs_tree.cpp
@@ -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);
 
diff --git a/source/lib/file/vfs/vfs_tree.h b/source/lib/file/vfs/vfs_tree.h
index 72787106f9..bd15578af1 100644
--- a/source/lib/file/vfs/vfs_tree.h
+++ b/source/lib/file/vfs/vfs_tree.h
@@ -46,7 +46,7 @@ private:
 	off_t m_size;
 	time_t m_mtime;
 
-	unsigned m_priority;
+	size_t m_priority;
 
 	PIFileLoader m_loader;
 };