From ac8a6126ed22e40bac4ac77891e2b188e1d2f908 Mon Sep 17 00:00:00 2001 From: dogotrigger Date: Fri, 5 May 2023 17:12:32 +0800 Subject: [PATCH] Fix DialogObject --- bindings/GeometryDash.bro | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 5ada1996..7263ffcb 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -1034,8 +1034,10 @@ class DialogDelegate { } class DialogObject : cocos2d::CCObject { + DialogObject() {} + static DialogObject* create(gd::string title, gd::string text, int portrait, float text_scale, bool is_unskippable, cocos2d::ccColor3B text_color) = win 0x6D160; - bool init(DialogObject*, gd::string title, gd::string text, int portrait, float text_scale, bool is_unskippable, cocos2d::ccColor3B text_color) = win 0x6D2E0; + bool init(gd::string title, gd::string text, int portrait, float text_scale, bool is_unskippable, cocos2d::ccColor3B text_color) = win 0x6D2E0; gd::string m_text; gd::string m_title; @@ -4665,8 +4667,11 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate { void bumpPlayer(float, int) = mac 0x22d890; void buttonDown(PlayerButton) = mac 0x22b7e0; void checkSnapJumpToObject(GameObject*) = mac 0x2217f0; - bool collidedWithObject(float, GameObject*) = mac 0x21d880; - bool collidedWithObject(float, GameObject*, cocos2d::CCRect) = mac 0x21f0b0; + bool collidedWithObject(float fl, GameObject* obj) { + auto rect = obj->getObjectRect(); + return collidedWithObject(fl, obj, rect); + } + bool collidedWithObject(float, GameObject*, cocos2d::CCRect) = mac 0x21f0b0, win 0x1ebdd0; bool collidedWithSlope(float, GameObject*, bool) = mac 0x21d8d0; void convertToClosestRotation(float) = mac 0x21c860, win 0x1e9ac0; void copyAttributes(PlayerObject*) = mac 0x22dc70, win 0x1f93f0;