diff --git a/bindings/Cocos2d.bro b/bindings/Cocos2d.bro index b4fe40694..61b8a0935 100644 --- a/bindings/Cocos2d.bro +++ b/bindings/Cocos2d.bro @@ -1165,16 +1165,23 @@ class cocos2d::extension::CCControl { auto isSelected() = mac 0x1a7ec0; } -[[link(win, android)]] + class cocos2d::extension::CCControlColourPicker { - CCControlColourPicker() {} + [[link(win)]] + CCControlColourPicker() {} + [[link(win)]] ~CCControlColourPicker() = mac 0x1aae30; - auto setColorValue(cocos2d::_ccColor3B const&) = mac 0x1aac10; + [[link(win, android)]] + auto setColorValue(cocos2d::_ccColor3B const&) = mac 0x1aac10; + [[link(win)]] auto ccTouchBegan(cocos2d::CCTouch*, cocos2d::CCEvent*) = mac 0x1aae10; + [[link(win)]] auto init() = mac 0x1aa400; + [[link(win)]] static auto colourPicker() = mac 0x1aaa30; + [[link(win)]] cocos2d::ccColor3B const& getColorValue() const { - return m_rgb; + return m_rgb; } } diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 1b35b0ed2..3e3ef0667 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -909,14 +909,14 @@ class ColorSelectPopup : FLAlertLayer, cocos2d::extension::ColorPickerDelegate, int m_copyChannelID; bool m_copyOpacity; ConfigureHSVWidget* m_hsvWidget; - PAD = win 0x10, mac 0x10; + PAD = win 0x10, mac 0x10, android 0x10; cocos2d::CCArray* m_unk254; cocos2d::CCArray* m_unk258; CCTextInputNode* m_textInput2; - PAD = win 0x4, mac 0x8; + PAD = win 0x4, mac 0x8, android 0x4; CCMenuItemToggler* m_toggler3; CCMenuItemToggler* m_toggler4; - PAD = win 0x8, mac 0x10; + PAD = win 0x8, mac 0x10, android 0x8; cocos2d::CCArray* m_unk274; bool m_spawnTrigger; bool m_multiTrigger; @@ -5592,10 +5592,10 @@ class SetupPulsePopup : FLAlertLayer, cocos2d::extension::ColorPickerDelegate, T cocos2d::extension::CCControlColourPicker* m_colorPicker; - PAD = win 0x30, mac 0x60; + PAD = win 0x30, mac 0x60, android 0x30; cocos2d::CCSprite* m_currentColorSpr; cocos2d::CCSprite* m_prevColorSpr; - PAD = win 0x64, mac 0xac; + PAD = win 0x64, mac 0xac, android 0x64; int m_pulseMode; // 0x38c on mac }