fix crash and add auto safe mode

Author: maxnut

mod.json

@@ -3,7 +3,7 @@
 	"gd": {
 		"win": "2.204"
     },
-	"version": "v2.2.7",
+	"version": "v2.2.9",
 	"id": "maxnu.gd_mega_overlay",
 	"name": "GD Mega Overlay",
 	"developer": "maxnu & SpaghettDev",

src/Common.cpp

@@ -140,7 +140,7 @@ void Common::onAudioPitchChange()
 	AudioChannelControl::setPitch(enabled ? pitch : 1.f);
 }
 
-void Common::updateCheathing()
+void Common::updateCheating()
 {
 	auto checkPatchGroup = [&](JsonPatches::patch_group_type group)
 	{
@@ -152,10 +152,8 @@ void Common::updateCheathing()
 				return true;
 			}
 		}
-
 		return false;
 	};
-
 	if(checkPatchGroup(JsonPatches::bypass))
 		return;
 	if(checkPatchGroup(JsonPatches::creator))
@@ -166,16 +164,13 @@ void Common::updateCheathing()
 		return;
 	if(checkPatchGroup(JsonPatches::player))
 		return;
-
 	float speedhack =
 		Settings::get<bool>("general/speedhack/enabled") ? Settings::get<float>("general/speedhack/value") : 1.f;
-
-	if(speedhack != 1.f)
+	if(speedhack != 1.f || Macrobot::playerMode == 0)
 	{
 		isCheating = true;
 		return;
 	}
-
 	isCheating = false;
 }
 

src/Common.h

@@ -21,5 +21,5 @@ namespace Common
 	void saveIcons();
 	void loadIcons();
 
-	void updateCheathing();
+	void updateCheating();
 };

src/GUI/GUI.cpp

@@ -13,6 +13,7 @@
 #include "ConstData.h"
 
 #include "Common.h"
+#include "Hacks/SafeMode.h"
 
 using namespace geode::prelude;
 
@@ -43,7 +44,8 @@ class $modify(CCKeyboardDispatcher) {
 						GUI::draw();
 						GUI::shortcutLoop = false;
 
-						Common::updateCheathing();
+						Common::updateCheating();
+						SafeMode::updateAuto();
 					}
 				}
 			}
@@ -150,7 +152,8 @@ void GUI::toggle()
 	if (!canToggle)
 		return;
 
-	Common::updateCheathing();
+	Common::updateCheating();
+	SafeMode::updateAuto();
 
 	isVisible = true;
 	static bool toggle = false;

src/Hacks/Labels.cpp

@@ -3,6 +3,7 @@
 #include "../GUI/GUI.h"
 #include "../JsonPatches/JsonPatches.h"
 #include "../Settings.hpp"
+#include "Hacks/SafeMode.h"
 
 #include <Geode/modify/PlayLayer.hpp>
 #include <Geode/modify/PlayerObject.hpp>
@@ -173,7 +174,8 @@ class $modify(PlayLayer)
 
 	void resetLevel()
 	{
-		Common::updateCheathing();
+		Common::updateCheating();
+		SafeMode::updateAuto();
 		noclipDead = false;
 		dead = false;
 		totalClicks = 0;

src/Hacks/SafeMode.cpp

@@ -10,6 +10,8 @@
 #include "../util.hpp"
 #include "../Settings.hpp"
 
+#include "Common.h"
+
 using namespace geode::prelude;
 using namespace SafeMode;
 
@@ -58,6 +60,14 @@ class $modify(EndLevelLayer)
 	}
 };
 
+void SafeMode::updateAuto()
+{
+	if(Settings::get<bool>("level/safe_mode/auto", false))
+		Mod::get()->setSavedValue<bool>("level/safe_mode/enabled", Common::isCheating);
+
+	updateState();
+}
+
 void SafeMode::updateState()
 {
 	for (auto& patch : patches)

src/Hacks/SafeMode.h

@@ -14,6 +14,7 @@ namespace SafeMode
 	using opcode = std::pair<unsigned long, std::vector<uint8_t>>;
 
 	void updateState();
+	void updateAuto();
 
 	// move to JsonHacks
 	inline const std::array<opcode, PATCHES_SIZE> opcodes{

src/Hacks/StartposSwitcher.cpp

@@ -11,6 +11,7 @@
 #include <Geode/modify/PlayLayer.hpp>
 #include <Geode/modify/StartPosObject.hpp>
 #include <Geode/modify/CCKeyboardDispatcher.hpp>
+#include <Geode/modify/LevelEditorLayer.hpp>
 
 #include "ConstData.h"
 
@@ -45,6 +46,17 @@ class $modify(StartPosObject)
 	}
 };
 
+class $modify(LevelEditorLayer)
+{
+	bool init(GJGameLevel* level, bool unk)
+	{
+		startposObjects.clear();
+
+		bool res = LevelEditorLayer::init(level, unk);
+		return res;
+	}
+};
+
 class $modify(PlayLayer)
 {
 	void onQuit()
@@ -55,6 +67,7 @@ class $modify(PlayLayer)
 
 	bool init(GJGameLevel* p0, bool p1, bool p2)
 	{
+		CC_SAFE_RELEASE_NULL(startPosLabel);
 		startposObjects.clear();
 		bool res = PlayLayer::init(p0, p1, p2);
 

src/main.cpp

@@ -36,14 +36,14 @@ void init()
 	DiscordRPCManager::init();
 	Macrobot::getMacros();
 	Clickpacks::init();
-	Common::updateCheathing();
+	Common::updateCheating();
 
 	GUI::setLateInit([] {
 		Common::calculateFramerate();
 		Common::setPriority();
 		Common::onAudioSpeedChange();
 		Common::loadIcons();
-		SafeMode::updateState();
+		SafeMode::updateAuto();
 	});
 }
 
@@ -188,6 +188,8 @@ void initGUI()
 
 		GUI::checkbox("Replay Last Checkpoint", "level/replay_checkpoint");
 
+		GUI::checkbox("Auto Safe Mode", "level/safe_mode/auto");
+
 		if (GUI::checkbox("Safe Mode", "level/safe_mode/enabled"))
 			SafeMode::updateState();
 		GUI::checkbox("Safe Mode Endscreen Label", "level/safe_mode/endscreen_enabled", true);