Rewrote CmdArgs

- Renamed it to CommandLine - Now parsing happens in the ctor where it should; command line arguments are not subject to change throughout a program's run
visuve · Jan 1, 2024 · 335009b · 335009b
1 parent bcef98e
commit 335009b
Show file tree

Hide file tree

Showing 33 changed files with 349 additions and 339 deletions.
diff --git a/CrysisR/CrysisR.cpp b/CrysisR/CrysisR.cpp
@@ -11,7 +11,7 @@
 */
 
 template<typename T>
-void Cheat(const CmdArgs& args, std::string_view key, const Process& process, size_t offset)
+void Cheat(const CommandLine& args, std::string_view key, const Process& process, size_t offset)
 {
 	T wanted = args.Value<T>(key);
 
@@ -28,7 +28,7 @@ int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
 	int exitCode = 0;
 
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "i_unlimitedammo", typeid(int32_t), "Unlimited ammo" },
 		{ "g_suitRecoilEnergyCost", typeid(float), "Recoil energy cost" },

diff --git a/Doom2016/Doom2016.cpp b/Doom2016/Doom2016.cpp
@@ -10,7 +10,7 @@ int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
 	int exitCode = 0;
 
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "infammo", typeid(std::nullopt), "Infinite ammo" },
 		{ "instantcool", typeid(std::nullopt), "Instant weapon cooldown" },

diff --git a/Doom3BFG/Doom3BFG.cpp b/Doom3BFG/Doom3BFG.cpp
@@ -11,7 +11,7 @@
 
 int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "infammo", typeid(std::nullopt), "Ammunition is never reduced" },
 		{ "inflamp", typeid(std::nullopt), "Lamp battery is never reduced" },

diff --git a/Doom3ROE/Doom3ROE.cpp b/Doom3ROE/Doom3ROE.cpp
@@ -11,7 +11,7 @@
 
 int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "infammo", typeid(std::nullopt), "Ammunition is never reduced" },
 		{ "infarmor", typeid(std::nullopt), "Infinite armor" }

diff --git a/DoomEternal/DoomEternal.cpp b/DoomEternal/DoomEternal.cpp
@@ -10,7 +10,7 @@ int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
 	int exitCode = 0;
 
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "infammo", typeid(std::nullopt), "Infinite ammo" },
 		{ "freeupgrades", typeid(std::nullopt), "Free weapon & gear upgrades. Note: do not use before third level (Cultist Base)..." },

diff --git a/EntryPoint/Main.cpp b/EntryPoint/Main.cpp
@@ -1,4 +1,4 @@
-#include "CmdArgs.hpp"
+#include "CommandLine.hpp"
 #include "System.hpp"
 #include "Logger.hpp"
 #include "Win32Event.hpp"
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
 		exitCode = IWillNotUseHackLibForEvil({ argv, argv + argc });
 		System::BeepDown();
 	}
-	catch (const CmdArgs::Exception& e)
+	catch (const CommandLine::Exception& e)
 	{
 		LogError << e.what() << "\n";
 		std::cerr << e.Usage();

diff --git a/FalloutNV/FalloutNV.cpp b/FalloutNV/FalloutNV.cpp
@@ -2,7 +2,7 @@
 
 int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "infammo", typeid(std::nullopt), "Ammunition is never reduced (NOTE: might be flaky)" },
 		{ "nowear", typeid(std::nullopt), "Weapon condition is never reduced" }

diff --git a/HOMM3/HOMM3.cpp b/HOMM3/HOMM3.cpp
@@ -38,7 +38,7 @@ std::ostream& operator << (std::ostream& os, const Resources& r)
 
 int IWillNotUseHackLibForEvil(const std::vector<std::string>& givenArguments)
 {
-	const CmdArgs args(givenArguments,
+	const CommandLine args(givenArguments,
 	{
 		{ "addresources", typeid(std::nullopt), "Adds 48879 to each resource" },
 	});

diff --git a/HackLib/CmdArgs.cpp b/HackLib/CmdArgs.cpp
diff --git a/HackLib/CmdArgs.hpp b/HackLib/CmdArgs.hpp