diff --git a/CMakeLists.txt b/CMakeLists.txt index 28afb440..b20a7390 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (GEODE_DISABLE_FMT_CONSTEVAL) target_compile_definitions(${PROJECT_NAME} INTERFACE -DFMT_CONSTEVAL=) endif() -CPMAddPackage("gh:geode-sdk/json#cef9c64") +CPMAddPackage("gh:geode-sdk/json#b92a8af") CPMAddPackage("gh:fmtlib/fmt#9.1.0") CPMAddPackage("gh:gulrak/filesystem#3e5b930") diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 3c1fa577..ae1ae96b 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -1891,7 +1891,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate { cocos2d::CCDictionary* m_spawnedGroups; bool m_didUpdateNormalCapacity; bool m_isDualMode; - int m_unk2AC; + int m_activeEnterEffect; bool m_activeDualTouch; int m_attemptClickCount; int m_lastVisibleSection; @@ -4676,7 +4676,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate { void flipGravity(bool, bool) = mac 0x21c090, win 0x1f59d0; void flipMod() = mac 0x21a4c0; void getActiveMode() = mac 0x22b950, win 0x1f5df0; - void getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870; + float getModifiedSlopeYVel() = mac 0x21bff0, win 0x1ea870; void getOldPosition(float) = mac 0x21a830; void getSecondColor() = mac 0x22cee0; void gravityDown() = mac 0x22e930; diff --git a/loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h b/loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h index 10005f4e..b18c9364 100644 --- a/loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h +++ b/loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h @@ -15,10 +15,8 @@ RT_ADD( typedef enum { // this one might not actually exist in gd itself - HJ_ADD( - KEY_What = -0x01, - KEY_None = 0x00, - ) + KEY_Unknown = -0x01, + KEY_None = 0x00, KEY_Backspace = 0x08, KEY_Tab = 0x09, KEY_Clear = 0x0C, diff --git a/loader/include/Geode/loader/Mod.hpp b/loader/include/Geode/loader/Mod.hpp index a255b157..435de320 100644 --- a/loader/include/Geode/loader/Mod.hpp +++ b/loader/include/Geode/loader/Mod.hpp @@ -160,6 +160,8 @@ namespace geode { return T(); } + bool hasSavedValue(std::string const& key); + template T getSavedValue(std::string const& key) { auto& saved = this->getSaveContainer(); diff --git a/loader/src/loader/Mod.cpp b/loader/src/loader/Mod.cpp index c8917e1d..b443402c 100644 --- a/loader/src/loader/Mod.cpp +++ b/loader/src/loader/Mod.cpp @@ -190,4 +190,8 @@ char const* Mod::expandSpriteName(char const* name) { ModJson Mod::getRuntimeInfo() const { return m_impl->getRuntimeInfo(); -} \ No newline at end of file +} + +bool Mod::hasSavedValue(std::string const& key) { + return this->getSaveContainer().contains(key); +}