From 13e41ee059b315e9e92745380c930ef3153f9cb9 Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Sun, 2 Apr 2023 11:02:47 +0300 Subject: [PATCH] buncha mac addresses for betteredit *slurp* :3 --- bindings/Cocos2d.bro | 23 +++++++++++++++-- loader/include/Geode/cocos/cocoa/CCObject.h | 28 ++++++++++----------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/bindings/Cocos2d.bro b/bindings/Cocos2d.bro index 78aa1c6b..5d4ef494 100644 --- a/bindings/Cocos2d.bro +++ b/bindings/Cocos2d.bro @@ -64,9 +64,14 @@ class cocos2d::CCCallFuncO { static auto create(cocos2d::CCObject*, cocos2d::SEL_CallFuncO, cocos2d::CCObject*) = mac 0x455940; } -class cocos2d::CCClippingNode { +class cocos2d::CCClippingNode : CCNode { + inline CCClippingNode() : CCNode(), m_pStencil(nullptr), m_fAlphaThreshold(1.f), m_bInverted(false) {} static cocos2d::CCClippingNode* create() = mac 0x4192a0; static cocos2d::CCClippingNode* create(cocos2d::CCNode*) = mac 0x419330; + // Inlined in create() call + virtual bool init() = mac 0x4193e0; + // Inlined in create() call + virtual bool init(cocos2d::CCNode* stencil) = mac 0x419400; auto getAlphaThreshold() const = mac 0x419a10; auto getStencil() const = mac 0x4199c0; auto isInverted() const = mac 0x419a30; @@ -77,7 +82,7 @@ class cocos2d::CCClippingNode { auto setAlphaThreshold(float) = mac 0x419a20; auto setInverted(bool) = mac 0x419a40; auto setStencil(cocos2d::CCNode*) = mac 0x4199d0; - auto visit() = mac 0x419530; + void visit() = mac 0x419530; } class cocos2d::CCDelayTime { @@ -151,6 +156,20 @@ class cocos2d::CCDrawNode { virtual ~CCDrawNode() = mac 0x378cc0; } +class cocos2d::CCAction { + CCAction() = mac 0x35b610; + virtual ~CCAction() = mac 0x35b6b0; + virtual void stop() = mac 0x35b860; +} + +class cocos2d::CCActionInterval { + virtual cocos2d::CCObject* copyWithZone(cocos2d::CCZone* zone) = mac 0x1f2550; + virtual bool isDone() = mac 0x1f2640; + virtual void startWithTarget(CCNode* pTarget) = mac 0x1f2700; + virtual void step(float dt) = mac 0x1f2660; + bool initWithDuration(float d) = mac 0x1f2510; +} + class cocos2d::CCEaseBackIn { static cocos2d::CCEaseBackIn* create(cocos2d::CCActionInterval*) = mac 0x2a41b0; } diff --git a/loader/include/Geode/cocos/cocoa/CCObject.h b/loader/include/Geode/cocos/cocoa/CCObject.h index 02e5757c..632b2b6d 100644 --- a/loader/include/Geode/cocos/cocoa/CCObject.h +++ b/loader/include/Geode/cocos/cocoa/CCObject.h @@ -130,23 +130,23 @@ public: virtual void update(float dt) {CC_UNUSED_PARAM(dt);}; - RT_ADD( - virtual void encodeWithCoder(DS_Dictionary*); + virtual void encodeWithCoder(DS_Dictionary*); - static CCObject* createWithCoder(DS_Dictionary*); - - virtual bool canEncode(); + static CCObject* createWithCoder(DS_Dictionary*); + + virtual bool canEncode(); - CCObjectType getObjType() const; - - virtual int getTag() const; + inline CCObjectType getObjType() const { + return m_eObjType; + } + + virtual int getTag() const; - virtual void setTag(int nTag); - - inline void setObjType(CCObjectType type) { - m_eObjType = type; - } - ) + virtual void setTag(int nTag); + + inline void setObjType(CCObjectType type) { + m_eObjType = type; + } friend class CCAutoreleasePool; };