From e40485dd12231deba6a3d8c4934d476fe89e760d Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Sat, 4 Jan 2025 15:50:52 -0400
Subject: [PATCH] No longer expose a distinct subtype for native files.

---
 src/modules/event/sdl/Event.cpp       | 4 ++--
 src/modules/filesystem/Filesystem.cpp | 2 +-
 src/modules/filesystem/Filesystem.h   | 2 +-
 src/modules/filesystem/NativeFile.cpp | 2 --
 src/modules/filesystem/NativeFile.h   | 2 --
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index 1c8de041d..4adb4efe8 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -485,8 +485,8 @@ Message *Event::convert(const SDL_Event &e)
 			}
 			else
 			{
-				auto *file = new love::filesystem::NativeFile(filepath, love::filesystem::File::MODE_CLOSED);
-				vargs.emplace_back(&love::filesystem::NativeFile::type, file);
+				auto *file = filesystem->openNativeFile(filepath, love::filesystem::File::MODE_CLOSED);
+				vargs.emplace_back(&love::filesystem::File::type, file);
 				vargs.emplace_back(x);
 				vargs.emplace_back(y);
 				msg = new Message("filedropped", vargs);
diff --git a/src/modules/filesystem/Filesystem.cpp b/src/modules/filesystem/Filesystem.cpp
index d1fff7597..bd36265d8 100644
--- a/src/modules/filesystem/Filesystem.cpp
+++ b/src/modules/filesystem/Filesystem.cpp
@@ -68,7 +68,7 @@ bool Filesystem::isAndroidSaveExternal() const
 	return useExternal;
 }
 
-NativeFile *Filesystem::openNativeFile(const char *path, File::Mode mode) const
+File *Filesystem::openNativeFile(const char *path, File::Mode mode) const
 {
 	return new NativeFile(path, mode);
 }
diff --git a/src/modules/filesystem/Filesystem.h b/src/modules/filesystem/Filesystem.h
index efdd1e7f9..3cc07655d 100644
--- a/src/modules/filesystem/Filesystem.h
+++ b/src/modules/filesystem/Filesystem.h
@@ -175,7 +175,7 @@ public:
 	 **/
 	virtual File *openFile(const char *filename, File::Mode mode) const = 0;
 
-	NativeFile *openNativeFile(const char *path, File::Mode mode) const;
+	File *openNativeFile(const char *path, File::Mode mode) const;
 
 	/**
 	 * Creates a new FileData object. Data will be copied.
diff --git a/src/modules/filesystem/NativeFile.cpp b/src/modules/filesystem/NativeFile.cpp
index 8760a594f..74d87ed5b 100644
--- a/src/modules/filesystem/NativeFile.cpp
+++ b/src/modules/filesystem/NativeFile.cpp
@@ -41,8 +41,6 @@ namespace love
 namespace filesystem
 {
 
-love::Type NativeFile::type("NativeFile", &File::type);
-
 NativeFile::NativeFile(const std::string &filename, Mode mode)
 	: filename(filename)
 	, file(nullptr)
diff --git a/src/modules/filesystem/NativeFile.h b/src/modules/filesystem/NativeFile.h
index 7b46f5c01..c30843561 100644
--- a/src/modules/filesystem/NativeFile.h
+++ b/src/modules/filesystem/NativeFile.h
@@ -37,8 +37,6 @@ class NativeFile : public File
 {
 public:
 
-	static love::Type type;
-
 	NativeFile(const std::string &filename, Mode mode);
 	virtual ~NativeFile();