From 4e6559966f63d76978d8053f6f06511206e7000f Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:49:14 +0200 Subject: [PATCH] make selectors use variadic arguments - this fixes using templated functions as callbacks --- loader/include/Geode/cocos/cocoa/CCObject.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/loader/include/Geode/cocos/cocoa/CCObject.h b/loader/include/Geode/cocos/cocoa/CCObject.h index 4037ba99..cf0958ba 100644 --- a/loader/include/Geode/cocos/cocoa/CCObject.h +++ b/loader/include/Geode/cocos/cocoa/CCObject.h @@ -173,14 +173,14 @@ typedef void (CCObject::*SEL_MenuHandler)(CCObject*); typedef void (CCObject::*SEL_EventHandler)(CCEvent*); typedef int (CCObject::*SEL_Compare)(CCObject*); -#define schedule_selector(_SELECTOR) (cocos2d::SEL_SCHEDULE)(&_SELECTOR) -#define callfunc_selector(_SELECTOR) (cocos2d::SEL_CallFunc)(&_SELECTOR) -#define callfuncN_selector(_SELECTOR) (cocos2d::SEL_CallFuncN)(&_SELECTOR) -#define callfuncND_selector(_SELECTOR) (cocos2d::SEL_CallFuncND)(&_SELECTOR) -#define callfuncO_selector(_SELECTOR) (cocos2d::SEL_CallFuncO)(&_SELECTOR) -#define menu_selector(_SELECTOR) (cocos2d::SEL_MenuHandler)(&_SELECTOR) -#define event_selector(_SELECTOR) (cocos2d::SEL_EventHandler)(&_SELECTOR) -#define compare_selector(_SELECTOR) (cocos2d::SEL_Compare)(&_SELECTOR) +#define schedule_selector(...) (cocos2d::SEL_SCHEDULE)(&__VA_ARGS__) +#define callfunc_selector(...) (cocos2d::SEL_CallFunc)(&__VA_ARGS__) +#define callfuncN_selector(...) (cocos2d::SEL_CallFuncN)(&__VA_ARGS__) +#define callfuncND_selector(...) (cocos2d::SEL_CallFuncND)(&__VA_ARGS__) +#define callfuncO_selector(...) (cocos2d::SEL_CallFuncO)(&__VA_ARGS__) +#define menu_selector(...) (cocos2d::SEL_MenuHandler)(&__VA_ARGS__) +#define event_selector(...) (cocos2d::SEL_EventHandler)(&__VA_ARGS__) +#define compare_selector(...) (cocos2d::SEL_Compare)(&__VA_ARGS__) // end of base_nodes group /// @}