- initialize PhysFSStream to nullptr

- make file.exists use lowercase fallback
dgcor · Nov 12, 2019 · 302717c · 302717c
1 parent 22ce98a
commit 302717c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
@@ -8,6 +8,12 @@
 
 namespace FileUtils
 {
+#ifdef FALLBACK_TO_LOWERCASE_FILENAME
+	static constexpr bool FALLBACK_TO_LOWERCASE = true;
+#else
+	static constexpr bool FALLBACK_TO_LOWERCASE = false;
+#endif
+
 	void initPhysFS(const char* argv0)
 	{
 		static const char* mainArgv0 = argv0;
@@ -272,7 +278,16 @@ namespace FileUtils
 
 	bool exists(const char* filePath) noexcept
 	{
-		return PHYSFS_exists(filePath) != 0;
+		auto fileExists = PHYSFS_exists(filePath) != 0;
+		if constexpr (FALLBACK_TO_LOWERCASE == true)
+		{
+			if (fileExists == false)
+			{
+				auto lowerCasefilePath = Utils::toLower(filePath);
+				fileExists = PHYSFS_exists(lowerCasefilePath.c_str()) != 0;
+			}
+		}
+		return fileExists;
 	}
 
 	std::vector<std::string> getFileList(const std::string_view filePath,

diff --git a/src/PhysFSStream.h b/src/PhysFSStream.h
@@ -30,7 +30,7 @@ namespace sf
 	class PhysFSStream : public sf::InputStream, public sf::NonCopyable
 	{
 	private:
-		PHYSFS_File* file;
+		PHYSFS_File* file{ nullptr };
 
 	public:
 		PhysFSStream(const std::string& fileName);