Fixes

Author: Alphalaneous

changelog.md

@@ -1,3 +1,7 @@
+# 2.0.20
+- Fix some hover bugs
+- Fix onQuit crashes
+
 # 2.0.19
 - Fixed a bug that caused UI modifications to not actually modify the UI haha
 

mod.json

@@ -6,7 +6,7 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.19",
+    "version": "v2.0.20",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/Callbacks.cpp

@@ -36,20 +36,28 @@ struct MenuLayerCallbacks : public CCNode {
         CCDirector::get()->pushScene(CCTransitionFade::create(0.5, GJGarageLayer::scene()));
     }
 
+    void onQuit(CCObject* obj) {
+        createQuickPopup("Quit Game", "Are you sure you want to <cr>quit</c>?", "Cancel", "Yes", [](auto, bool selected) {
+            if (selected) {
+                utils::game::exit(true);
+            }
+        }, true);
+    }
+
 };
 
 void Callbacks::generateMenuLayerCallbacks() {
     CREATE_NORMAL(MenuLayer);
     m_callbacks["MenuLayer"]["onPlay"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onPlay));
     m_callbacks["MenuLayer"]["onGarage"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onGarage));
     m_callbacks["MenuLayer"]["onCreator"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onCreator));
+    m_callbacks["MenuLayer"]["onQuit"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onQuit));
     REGISTER_CALLBACK(MenuLayer, onAchievements);
     REGISTER_CALLBACK(MenuLayer, onDaily);
     REGISTER_CALLBACK(MenuLayer, onMoreGames);
     REGISTER_CALLBACK(MenuLayer, onMyProfile);
     REGISTER_CALLBACK(MenuLayer, onOptions);
     REGISTER_CALLBACK(MenuLayer, onStats);
-    REGISTER_CALLBACK(MenuLayer, onQuit);
 }
 
 void Callbacks::generateCreatorLayerCallbacks() {

src/HPTCCNode.hpp

@@ -81,15 +81,16 @@ struct TouchObject : public CCNode, CCTouchDelegate {
         return lastAlert;
     }
 
-    bool isHoverable(CCNode* node, CCPoint point) {
+    bool isHoverable(CCNode* node) {
         if (!CCScene::get() || !node || isLastAlert()) return false;
+        auto worldPos = node->convertToWorldSpaceAR(CCPointZero);
 
         auto sceneChild = getSceneChildContainingNode();
         if (!sceneChild) return false;
 
         for (auto child : CCArrayExt<CCNode*>(CCScene::get()->getChildren())) {
             if (child->getZOrder() <= sceneChild->getZOrder()) continue;
-            if (child->boundingBox().containsPoint(point) && nodeIsVisible(child)) {
+            if (child->boundingBox().containsPoint(worldPos) && nodeIsVisible(child)) {
                 return false;
             }
         }
@@ -100,8 +101,9 @@ struct TouchObject : public CCNode, CCTouchDelegate {
         if (!nodeIsVisible(m_self)) return;
         if (!m_self->getParent()) return;
 
-        auto worldPos = m_self->convertToWorldSpaceAR(CCPointZero);
-        bool isValid = nodeIsVisible(m_self) && m_self->boundingBox().containsPoint(getMousePos()) && isHoverable(m_self, worldPos);
+        auto nodeMouse = m_self->getParent()->convertToNodeSpace(getMousePos());
+
+        bool isValid = m_self->boundingBox().containsPoint(nodeMouse) && isHoverable(m_self);
 
         checkTouch(!isValid);
     }

src/nodes/CCMenu.hpp

@@ -3,7 +3,6 @@
 #include <Geode/Geode.hpp>
 #include "CCMenuItemSpriteExtra.hpp"
 #include "../UIModding.hpp"
-#include "../Utils.hpp"
 #include "../Macros.hpp"
 #include <alphalaneous.alphas_geode_utils/include/NodeModding.h>
 
@@ -52,15 +51,16 @@ class $nodeModify(MyCCMenu, cocos2d::CCMenu) {
     }
 
 
-    bool isHoverable(CCNode* node, CCPoint point) {
+    bool isHoverable(CCNode* node) {
         if (!CCScene::get() || !node || isLastAlert(node)) return false;
+        auto worldPos = node->convertToWorldSpaceAR(CCPointZero);
 
         auto sceneChild = getSceneChildContainingNode(node);
         if (!sceneChild) return false;
 
-        for (auto child : CCArrayExt<CCNode*>(CCScene::get()->getChildren())) {
+        for (auto child : CCScene::get()->getChildrenExt()) {
             if (child->getZOrder() <= sceneChild->getZOrder()) continue;
-            if (child->boundingBox().containsPoint(point) && nodeIsVisible(child)) {
+            if (child->boundingBox().containsPoint(worldPos) && nodeIsVisible(child)) {
                 return false;
             }
         }
@@ -72,11 +72,16 @@ class $nodeModify(MyCCMenu, cocos2d::CCMenu) {
 
         auto mousePos = getMousePos();
         for (auto child : CCArrayExt<CCNode*>(getChildren())) {
+            if (!nodeIsVisible(child)) continue;
             auto realItem = typeinfo_cast<CCMenuItemSpriteExtra*>(child);
             if (!realItem) continue;
+
             if (EventCCMenuItemSpriteExtra* button = static_cast<EventCCMenuItemSpriteExtra*>(realItem)) {
-                auto worldPos = button->convertToWorldSpaceAR(CCPointZero);
-                bool isValid = nodeIsVisible(button) && button->boundingBox().containsPoint(mousePos) && isHoverable(button, worldPos);
+                auto worldPos = button->convertToWorldSpace(CCPointZero);
+
+                auto nodeMouse = convertToNodeSpace(mousePos);
+
+                bool isValid = button->boundingBox().containsPoint(nodeMouse) && isHoverable(button);
                 button->checkTouch(!isValid);
             }
         }