From d22e9f7a26d88a863c5b05e3ac9ac66e85d8d4f2 Mon Sep 17 00:00:00 2001
From: Xanfre <xanfrein@gmail.com>
Date: Tue, 21 Jan 2025 19:08:09 -0600
Subject: [PATCH] Use the Script type for both native and Squirrel scripts

---
 Source/ModManager.cpp | 11 ++++-------
 Source/ModManager.hpp |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Source/ModManager.cpp b/Source/ModManager.cpp
index 3c03aaf..73a8d8c 100644
--- a/Source/ModManager.cpp
+++ b/Source/ModManager.cpp
@@ -1100,7 +1100,7 @@ void ModManager::checkModDirectory(Mod& mod)
 	}
 	mod.setHasSubtitle(dir.HasSubDirs(config_.game.subtitleFolder));
 	mod.setHasDML(dir.HasFiles("*.dml") || dir.HasSubDirs("dbmods"));
-	mod.setHasScript(dir.HasSubDirs("scriptdata"));
+	mod.setHasScript(dir.HasFiles("*.osm") || dir.HasSubDirs("sq_scripts") || dir.HasSubDirs("scriptdata"));
 	mod.setHasMis(dir.HasFiles("*.mis"));
 	mod.setHasGamesys(dir.HasFiles("*.gam"));
 	mod.setHasOther(dir.HasFiles("*.crf"));
@@ -1474,7 +1474,7 @@ void ModManager::resetStates()
 	}
 }
 
-const std::array<wxString, 21> ModManager::dataDirectories_ =
+const std::array<wxString, 20> ModManager::dataDirectories_ =
 {
 	{
 		"bitmap",
@@ -1496,12 +1496,11 @@ const std::array<wxString, 21> ModManager::dataDirectories_ =
 		"snd",
 		"snd2",
 		"song",
-		"sq_scripts",
 		"strings"
 	}
 };
 
-const std::array<wxString, 8> ModManager::dataFiles_ =
+const std::array<wxString, 6> ModManager::dataFiles_ =
 {
 	{
 		"motiondb.bin",
@@ -1509,8 +1508,6 @@ const std::array<wxString, 8> ModManager::dataFiles_ =
 		"metaui_r.res",
 		"shkres.res",
 		"skeldata.res",
-		"texture.res",
-		"*.nut",
-		"*.osm"
+		"texture.res"
 	}
 };
\ No newline at end of file
diff --git a/Source/ModManager.hpp b/Source/ModManager.hpp
index 0c3f42d..2de0b13 100644
--- a/Source/ModManager.hpp
+++ b/Source/ModManager.hpp
@@ -106,8 +106,8 @@ class ModManager
 	void collectMisFileToModMapping(Mod& mod, std::unordered_map<std::string, std::vector<Mod*>>& misFileToMods);
 	void createLogFile();
 
-	static const std::array<wxString, 21> dataDirectories_;
-	static const std::array<wxString, 8> dataFiles_;
+	static const std::array<wxString, 20> dataDirectories_;
+	static const std::array<wxString, 6> dataFiles_;
 
 	ApplicationConfig& config_;
 	ModConfig modConfig_;