Allow load of addon_path without csm.bin

Author: Jon Daniel

src/common/str.cpp

@@ -21,3 +21,28 @@ std::filesystem::path remove_extension( const std::filesystem::path& path )
 	return path.parent_path() / dst;
 }
 
+const char* ExtractFileName( const char* const file_path )
+{
+	const char* file_name_pos= file_path;
+
+	const char* str= file_path;
+	while( *str != '\0' )
+	{
+		if( *str == '/' || *str == '\\' )
+			file_name_pos= str + 1u;
+
+		str++;
+	}
+
+	return file_name_pos;
+}
+
+std::string ToUpper( const std::string& s )
+{
+	std::string r= s;
+	for( char& c : r )
+		c= std::toupper(c);
+	return r;
+}
+
+

src/common/str.hpp

@@ -1,4 +1,5 @@
 #pragma once
+
 #ifdef _MSC_VER
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
@@ -28,16 +29,28 @@ inline char* strncasestr(const char* haystack, const char* needle, size_t n)
 #include <filesystem>
 
 #define GetSubstring strcasestr
-constexpr bool StringEquals( const char* s0, const char* s1 )
-{
-	return ( ::strcasecmp( s0, s1 ) == 0 );
-}
-
-constexpr bool StringNEquals( const char* s0, const char* s1, size_t n )
+constexpr bool StringEquals( const char* s0, const char* s1, size_t n = 0)
 {
-	return ( ::strncasecmp( s0, s1, n ) == 0 );
+	return n == 0 ? ( ::strcasecmp( s0, s1 ) == 0 ) : ( ::strncasecmp( s0, s1, n ) == 0 );
 }
 
+const char* ExtractFileName( const char* const file_path );
 const char* ExtractExtension( const char* const file_path );
 std::filesystem::path remove_extension( const std::filesystem::path& path );
+std::string ToUpper( const std::string& s );
+/*
+// Own replacement for nonstandard strncasecmp
+static bool StringEquals( const char* const s0, const char* const s1, const unsigned int max_length )
+{
+	unsigned int i= 0;
+	while( s0[i] != '\0' && s1[i] != '\0' && i < max_length )
+	{
+		if( std::tolower( s0[i] ) != std::tolower( s1[i] ) )
+			return false;
+		i++;
+	}
+
+	return i == max_length || s0[i] == s1[i];
+}
+*/
 

src/vfs.cpp

@@ -22,44 +22,6 @@ struct FileInfoPacked
 };
 #pragma pack(pop)
 
-// Own replacement for nonstandard strncasecmp
-static bool StringEquals( const char* const s0, const char* const s1, const unsigned int max_length )
-{
-	unsigned int i= 0;
-	while( s0[i] != '\0' && s1[i] != '\0' && i < max_length )
-	{
-		if( std::tolower( s0[i] ) != std::tolower( s1[i] ) )
-			return false;
-		i++;
-	}
-
-	return i == max_length || s0[i] == s1[i];
-}
-
-static std::string ToUpper( const std::string& s )
-{
-	std::string r= s;
-	for( char& c : r )
-		c= std::toupper(c);
-	return r;
-}
-
-static const char* ExtractFileName( const char* const file_path )
-{
-	const char* file_name_pos= file_path;
-
-	const char* str= file_path;
-	while( *str != '\0' )
-	{
-		if( *str == '/' || *str == '\\' )
-			file_name_pos= str + 1u;
-
-		str++;
-	}
-
-	return file_name_pos;
-}
-
 static std::string PrepareAddonPath( const char* const addon_path )
 {
 	if( addon_path == nullptr )
@@ -115,36 +77,38 @@ Vfs::Vfs(
 	: archive_file_( std::fopen( archive_file_name, "rb" ) )
 	, addon_path_( PrepareAddonPath( addon_path ) )
 {
-	if( archive_file_ == nullptr )
+	if( archive_file_ != nullptr )
 	{
-		Log::FatalError( "Could not open file \"", archive_file_name, "\"" );
-		return;
-	}
+		char header[4];
+		FileRead( archive_file_, header, sizeof(header) );
+		if( std::strncmp( header, "CSid", sizeof(header) ) != 0 )
+		{
+			Log::FatalError( "File \"", archive_file_name, "\" is not \"Chasm: The Rift\" archive" );
+			return;
+		}
 
-	char header[4];
-	FileRead( archive_file_, header, sizeof(header) );
-	if( std::strncmp( header, "CSid", sizeof(header) ) != 0 )
-	{
-		Log::FatalError( "File \"", archive_file_name, "\" is not \"Chasm: The Rift\" archive" );
-		return;
-	}
+		unsigned short files_in_archive_count;
+		FileRead( archive_file_, &files_in_archive_count, sizeof(files_in_archive_count) );
 
-	unsigned short files_in_archive_count;
-	FileRead( archive_file_, &files_in_archive_count, sizeof(files_in_archive_count) );
+		std::vector<FileInfoPacked> files_info_packed( files_in_archive_count );
+		FileRead( archive_file_, files_info_packed.data(), files_info_packed.size() * sizeof(FileInfoPacked ) );
 
-	std::vector<FileInfoPacked> files_info_packed( files_in_archive_count );
-	FileRead( archive_file_, files_info_packed.data(), files_info_packed.size() * sizeof(FileInfoPacked ) );
+		virtual_files_.reserve( files_in_archive_count );
 
-	virtual_files_.reserve( files_in_archive_count );
+		for( const FileInfoPacked& file_info_packed : files_info_packed )
+		{
+			VirtualFile file;
+			std::memcpy( &file.size  , &file_info_packed.size  , sizeof(unsigned int) );
+			std::memcpy( &file.offset, &file_info_packed.offset, sizeof(unsigned int) );
 
-	for( const FileInfoPacked& file_info_packed : files_info_packed )
+			virtual_files_[ VirtualFileName( file_info_packed.name, file_info_packed.name_length ) ]= file;
+		}
+	} else if( addon_path_.empty() )
 	{
-		VirtualFile file;
-		std::memcpy( &file.size  , &file_info_packed.size  , sizeof(unsigned int) );
-		std::memcpy( &file.offset, &file_info_packed.offset, sizeof(unsigned int) );
-
-		virtual_files_[ VirtualFileName( file_info_packed.name, file_info_packed.name_length ) ]= file;
+		Log::FatalError( "Could not open file \"", archive_file_name, "\"" );
 	}
+
+	return;
 }
 
 Vfs::~Vfs()