From 76404f5e0e6b92273bfc62fdbe7384698ae1b927 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 2 Dec 2023 13:43:31 +0100
Subject: [PATCH] Core/Modules: Fix env var override when no parameter is
 passed

---
 include/Nazara/Core/Modules.hpp |  5 +----
 include/Nazara/Core/Modules.inl | 23 +----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/include/Nazara/Core/Modules.hpp b/include/Nazara/Core/Modules.hpp
index 415c3a096..31e7aaf41 100644
--- a/include/Nazara/Core/Modules.hpp
+++ b/include/Nazara/Core/Modules.hpp
@@ -8,17 +8,15 @@
 #define NAZARA_CORE_MODULES_HPP
 
 #include <NazaraUtils/TypeList.hpp>
+#include <Nazara/Core/CommandLineParameters.hpp>
 
 namespace Nz
 {
-	class CommandLineParameters;
-
 	namespace Detail
 	{
 		template<typename Module, typename... Modules>
 		struct ModuleTuple : ModuleTuple<Module>, ModuleTuple<Modules...>
 		{
-			template<typename... ModuleConfig> ModuleTuple(ModuleConfig&&... configs);
 			template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs);
 
 			template<typename T> T& Get();
@@ -27,7 +25,6 @@ namespace Nz
 		template<typename Module>
 		struct ModuleTuple<Module>
 		{
-			template<typename... ModuleConfig> ModuleTuple(ModuleConfig&&... configs);
 			template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs);
 
 			template<typename T> T& Get();
diff --git a/include/Nazara/Core/Modules.inl b/include/Nazara/Core/Modules.inl
index 6d039f392..f3fe28074 100644
--- a/include/Nazara/Core/Modules.inl
+++ b/include/Nazara/Core/Modules.inl
@@ -51,24 +51,11 @@ namespace Nz
 				}
 			}
 
-			static T Get()
-			{
-				return T{};
-			}
-
 			static auto Get(const CommandLineParameters& parameters)
 			{
 				return OverrideModuleConfig(T{}, parameters);
 			}
 		};
-
-		template<typename Module, typename... Modules>
-		template<typename... ModuleConfig>
-		ModuleTuple<Module, Modules...>::ModuleTuple(ModuleConfig&&... configs) :
-		ModuleTuple<Module>(std::forward<ModuleConfig>(configs)...),
-		ModuleTuple<Modules...>(std::forward<ModuleConfig>(configs)...)
-		{
-		}
 		
 		template<typename Module, typename... Modules>
 		template<typename... ModuleConfig>
@@ -88,14 +75,6 @@ namespace Nz
 				return ModuleTuple<Modules...>::template Get<T>();
 		}
 
-
-		template<typename Module>
-		template<typename... ModuleConfig>
-		ModuleTuple<Module>::ModuleTuple(ModuleConfig&&... configs) :
-		m(Pick<typename Module::Config>::Get(std::forward<ModuleConfig>(configs)...))
-		{
-		}
-		
 		template<typename Module>
 		template<typename... ModuleConfig>
 		ModuleTuple<Module>::ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs) :
@@ -115,7 +94,7 @@ namespace Nz
 	template<typename... ModuleList>
 	template<typename... ModuleConfig>
 	Modules<ModuleList...>::Modules(ModuleConfig&&... configs) :
-	m_modules(std::forward<ModuleConfig>(configs)...)
+	m_modules(CommandLineParameters{}, std::forward<ModuleConfig>(configs)...)
 	{
 	}