icky hack to make h1 core save stuff not attempt construction on winstore (cores are steam only)

Author: Burnt-o

HCMInternal/App.h

@@ -111,7 +111,7 @@ class App {
             auto optionalCheats = std::make_shared<OptionalCheatManager>(guireq, cheatfail, settings, ptr, ver, mccStateHook, sharedMem, mes, exp, dirPath, modal, control); PLOGV << "optionalCheats init"; // constructs and stores required optional cheats. Needs a lot of dependencies, cheats will only keep what they need.
 
             auto guistore = std::make_shared<GUIElementStore>(); PLOGV << "guistore init"; // collection starts empty, populated later by GUIElementConstructor
-            auto GUICon = std::make_shared<GUIElementConstructor>(guireq, cheatfail, guistore, guifail, settings); PLOGV << "GUIMan init"; // constructs gui elements, pushing them into guistore
+            auto GUICon = std::make_shared<GUIElementConstructor>(guireq, cheatfail, guistore, guifail, settings, ver->getMCCProcessType()); PLOGV << "GUIMan init"; // constructs gui elements, pushing them into guistore
             //guifail->printAllFailures();
             // set up main gui
             auto HCMGUI = std::make_shared<HCMInternalGUI>(mccStateHook, guistore, hkr, imm->MidgroundRenderEvent, mccStateHook->getMCCStateChangedEvent(), control, settings); PLOGV << "HCMGUI init";// main gui. Mostly just a canvas for rendering a collection of IGUIElements that will get constructed a bit below.

HCMInternal/GUIElementConstructor.cpp

@@ -49,6 +49,18 @@ class GUIElementConstructor::GUIElementConstructorImpl {
 			return std::nullopt;
 		}
 
+
+		// stupid override to make core save/dump stuff only construct for steam since I can't be bothered reworking the macro system to do this properly
+		if ((magic_enum::enum_name<GUIElementEnum>(guielementenum).contains("core") || magic_enum::enum_name<GUIElementEnum>(guielementenum).contains("Core")) // is the gui elemenet a core save thing? this is the most icky part of this, doing a stringcheck of the enum name.. what if I want to add another cheat that uses the name "core" to mean something else? eh prolly won't come up
+			&& game.operator GameState::Value() == GameState::Value::Halo1 // and is halo 1
+			&& mProcType == MCCProcessType::WinStore // and current process is winstore
+			)
+		{
+			PLOG_DEBUG << "GUIElementEnum::" << magic_enum::enum_name(guielementenum) << " for game " << game.toString() << " does not support WinStore version of MCC (steam only), skipping construction";
+			return std::nullopt; // don't construct 
+		}
+
+
 		PLOG_DEBUG << "attempting to construct guielement: " << magic_enum::enum_name(guielementenum) << " for game: " << game.toString();
 		try 
 		{
@@ -539,11 +551,11 @@ class GUIElementConstructor::GUIElementConstructorImpl {
 
 	std::shared_ptr<GUIElementStore> mStore;
 
-
+	MCCProcessType mProcType;
 
 public:
-	GUIElementConstructorImpl(std::shared_ptr<IGUIRequiredServices> guireq, std::shared_ptr<OptionalCheatInfo> fail, std::shared_ptr<GUIElementStore> store, std::shared_ptr<GUIServiceInfo> info, std::shared_ptr<SettingsStateAndEvents> settings)
-		: mStore(store)
+	GUIElementConstructorImpl(std::shared_ptr<IGUIRequiredServices> guireq, std::shared_ptr<OptionalCheatInfo> fail, std::shared_ptr<GUIElementStore> store, std::shared_ptr<GUIServiceInfo> info, std::shared_ptr<SettingsStateAndEvents> settings, MCCProcessType procType)
+		: mStore(store), mProcType(procType)
 	{
 		// Create all top level GUI elements. Each one will recursively create it's nested elements, if it has any.
 		for (auto& [element, game] : guireq->getToplevelGUIElements())
@@ -564,5 +576,5 @@ class GUIElementConstructor::GUIElementConstructorImpl {
 
 
 
-GUIElementConstructor::GUIElementConstructor(std::shared_ptr<IGUIRequiredServices> guireq, std::shared_ptr<OptionalCheatInfo> fail, std::shared_ptr<GUIElementStore> store, std::shared_ptr<GUIServiceInfo> info, std::shared_ptr<SettingsStateAndEvents> settings) : pimpl(std::make_unique<GUIElementConstructorImpl>(guireq, fail, store, info, settings)) {}
+GUIElementConstructor::GUIElementConstructor(std::shared_ptr<IGUIRequiredServices> guireq, std::shared_ptr<OptionalCheatInfo> fail, std::shared_ptr<GUIElementStore> store, std::shared_ptr<GUIServiceInfo> info, std::shared_ptr<SettingsStateAndEvents> settings, MCCProcessType procType) : pimpl(std::make_unique<GUIElementConstructorImpl>(guireq, fail, store, info, settings, procType)) {}
 GUIElementConstructor::~GUIElementConstructor() = default;

HCMInternal/GUIElementConstructor.h

@@ -4,14 +4,15 @@
 #include "GUIElementStore.h"
 #include "GUIServiceInfo.h"
 #include "SettingsStateAndEvents.h"
+#include "IGetMCCVersion.h"
 class GUIElementConstructor
 {
 private:
 	class GUIElementConstructorImpl;
 	std::unique_ptr< GUIElementConstructorImpl> pimpl;
 
 public:
-	GUIElementConstructor(std::shared_ptr<IGUIRequiredServices>, std::shared_ptr<OptionalCheatInfo>, std::shared_ptr<GUIElementStore>, std::shared_ptr<GUIServiceInfo>, std::shared_ptr<SettingsStateAndEvents>);
+	GUIElementConstructor(std::shared_ptr<IGUIRequiredServices>, std::shared_ptr<OptionalCheatInfo>, std::shared_ptr<GUIElementStore>, std::shared_ptr<GUIServiceInfo>, std::shared_ptr<SettingsStateAndEvents>, MCCProcessType);
 	~GUIElementConstructor();
 };