merge conflict

theyareonit · Sep 14, 2024 · 0ab75bb · 0ab75bb
2 parents 6dece71 + 3132edf
commit 0ab75bb
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -11,6 +11,7 @@
 #include <Geode/modify/PlayerObject.hpp>
 #include <Geode/modify/EndLevelLayer.hpp>
 #include <Geode/modify/CreatorLayer.hpp>
+#include <Geode/modify/GJGameLevel.hpp>
 
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 
@@ -400,6 +401,18 @@ class $modify(CreatorLayer) {
 	} 
 };
 
+class $modify(GJGameLevel) {
+	void savePercentage(int percent, bool p1, int clicks, int attempts, bool valid) {
+		valid = (
+			 Mod::get()->getSettingValue<bool>("soft-toggle") &&
+			!Mod::get()->getSettingValue<bool>("actual-delta")
+		);
+
+		GJGameLevel::savePercentage(percent, p1, clicks, attempts, valid);
+	}
+};
+
+
 Patch* patch;
 
 void toggleMod(bool disable) {
@@ -499,4 +512,4 @@ HANDLE gdMutex;
 	}
 
 	if (!isLinux) std::thread(inputThread).detach();
-}
+}