From c8aa2e30db3921028d2b60dd749f2857ef8f6517 Mon Sep 17 00:00:00 2001 From: dankmeme01 <42031238+dankmeme01@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:19:07 +0200 Subject: [PATCH] rename getChildOfType member method to getChildByType, to avoid collisions --- loader/include/Geode/cocos/base_nodes/CCNode.h | 2 +- loader/include/Geode/utils/cocos.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/include/Geode/cocos/base_nodes/CCNode.h b/loader/include/Geode/cocos/base_nodes/CCNode.h index 45c919a7..d2059079 100644 --- a/loader/include/Geode/cocos/base_nodes/CCNode.h +++ b/loader/include/Geode/cocos/base_nodes/CCNode.h @@ -1126,7 +1126,7 @@ public: GEODE_DLL size_t getEventListenerCount(); template - T* getChildOfType(int index) { + T* getChildByType(int index) { size_t indexCounter = 0; if (this->getChildrenCount() == 0) return nullptr; // start from end for negative index diff --git a/loader/include/Geode/utils/cocos.hpp b/loader/include/Geode/utils/cocos.hpp index 5412f112..0c16818b 100644 --- a/loader/include/Geode/utils/cocos.hpp +++ b/loader/include/Geode/utils/cocos.hpp @@ -622,7 +622,7 @@ namespace geode::cocos { */ template static Type* getChildOfType(cocos2d::CCNode* node, int index) { - return node->getChildOfType(index); + return node->getChildByType(index); } /**