7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-22 23:48:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix CCCallFuncExt

Browse source
This commit is contained in:
HJfod 2024-11-16 18:36:34 +02:00
parent 302eea1f47
commit b9fb2f6778
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
loader/include/Geode/utils/cocos.hpp
View file

@ -1331,15 +1331,13 @@ namespace geode::cocos {
class CallFuncExtImpl : public cocos2d::CCActionInstant { class CallFuncExtImpl : public cocos2d::CCActionInstant {
public: public:
static CallFuncExtImpl* create(const F& func) { static CallFuncExtImpl* create(const F& func) {
auto ret = new CallFuncExtImpl; auto ret = new CallFuncExtImpl(func);
ret->m_func = func;
ret->autorelease(); ret->autorelease();
return ret; return ret;
} }
static CallFuncExtImpl* create(F&& func) { static CallFuncExtImpl* create(F&& func) {
auto ret = new CallFuncExtImpl; auto ret = new CallFuncExtImpl(std::move(func));
ret->m_func = std::move(func);
ret->autorelease(); ret->autorelease();
return ret; return ret;
} }
@ -1347,8 +1345,17 @@ namespace geode::cocos {
private: private:
F m_func; F m_func;
// F may not be default-constructible
CallFuncExtImpl(F&& func) : m_func(std::move(func)) {}
CallFuncExtImpl(F const& func) : m_func(func) {}
void update(float) override { void update(float) override {
if (m_func) this->m_func(); // Make sure any `std::function`s are valid
if constexpr (requires { static_cast<bool>(m_func); }) {
if (m_func) m_func();
} else {
m_func();
}
} }
}; };