From f5983a251e6bd64aba2cd1395244931300786e34 Mon Sep 17 00:00:00 2001 From: altalk23 <45172705+altalk23@users.noreply.github.com> Date: Sun, 26 Feb 2023 16:28:02 +0300 Subject: [PATCH] fix editorpauselayer guideline button missing --- bindings/GeometryDash.bro | 4 ++-- loader/src/ids/EditorPauseLayer.cpp | 10 +++++----- loader/test/members/MacOS.cpp | 6 +++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 9f2ae1e6..596dbd57 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -2857,8 +2857,8 @@ class GameManager : GManager { LevelEditorLayer* m_levelEditorLayer; int m_unknown1; MenuLayer* m_menuLayer; - bool m_unknownBool2; - int m_unknownInt2; + bool m_inMenuLayer; + void* m_unknownVariable; bool m_unknownBool3; bool m_unknownPlayLayerBool; bool m_unknownBool4; diff --git a/loader/src/ids/EditorPauseLayer.cpp b/loader/src/ids/EditorPauseLayer.cpp index f1ae68fa..6b43b69b 100644 --- a/loader/src/ids/EditorPauseLayer.cpp +++ b/loader/src/ids/EditorPauseLayer.cpp @@ -8,7 +8,7 @@ USE_GEODE_NAMESPACE(); // (not gonna reinterpret_cast that into the members) class GuidelinesButton : public CCMenuItemSpriteExtra { protected: - bool init() { + bool init() override { if (!CCMenuItemSpriteExtra::init( CCSprite::createWithSpriteFrameName("GJ_audioOffBtn_001.png"), nullptr, @@ -215,8 +215,8 @@ $register_ids(EditorPauseLayer) { auto glToggle = GuidelinesButton::create(); glToggle->setID("guidelines-enable-toggle"); guidelinesMenu->insertBefore(glToggle, nullptr); - m_guidelinesOffButton = m_guidelinesOnButton = glToggle; - this->updateSongButton(); + m_guidelinesOffButton = m_guidelinesOnButton = nullptr; + // this->updateSongButton(); guidelinesMenu->setID("guidelines-menu"); guidelinesMenu->setContentSize({ winSize.width / 2, 50.f }); @@ -246,12 +246,12 @@ $register_ids(EditorPauseLayer) { child->setLayoutOptions( AxisLayoutOptions::create() ->setMinScale(.1f) - ->setMaxScale(.6f) + ->setMaxScale(.5f) ->setBreakLine(true) ); } menu->setContentSize({ 165.f, 100.f }); - menu->setPosition(85.f, winSize.height - 55.f); + menu->setPosition(75.f, winSize.height - 55.f); menu->updateLayout(); } } diff --git a/loader/test/members/MacOS.cpp b/loader/test/members/MacOS.cpp index b30fdf81..aea724eb 100644 --- a/loader/test/members/MacOS.cpp +++ b/loader/test/members/MacOS.cpp @@ -28,7 +28,11 @@ GEODE_MEMBER_CHECK(PlayLayer, m_shouldTryToKick, 0x7a8); // GameManager GEODE_MEMBER_CHECK(GameManager, m_playLayer, 0x180); GEODE_MEMBER_CHECK(GameManager, m_levelEditorLayer, 0x188); -// GEODE_MEMBER_CHECK(GameManager, m_clickedGarage, 0x2a2); // todo: find why this is not 0x2a2 +GEODE_MEMBER_CHECK(GameManager, m_menuLayer, 0x198); +GEODE_MEMBER_CHECK(GameManager, m_playerUDID, 0x1b8); +GEODE_MEMBER_CHECK(GameManager, m_playerUserID, 0x1cc); +GEODE_MEMBER_CHECK(GameManager, m_playerFrame, 0x200); +GEODE_MEMBER_CHECK(GameManager, m_clickedGarage, 0x2a2); // todo: find why this is not 0x2a2 // GameObject GEODE_MEMBER_CHECK(GameObject, m_baseColorID, 0x27c);