Skip to content

Commit e8ed05f

Browse files
committed
Fix CCKeyboardDispatcher bindings and update packages
1 parent 4e5ab12 commit e8ed05f

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

bindings/2.2081/Cocos2d.bro

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ class cocos2d::CCJumpTo : cocos2d::CCActionInterval {
17391739
virtual void startWithTarget(cocos2d::CCNode* pTarget) = imac 0x3b9730, m1 0x33bd10, ios inline;
17401740
}
17411741

1742-
[[link(win, android)]]
1742+
[[link(win, android, ios)]]
17431743
class cocos2d::CCKeyboardDispatcher : cocos2d::CCObject {
17441744
// bool getAltKeyPressed() const;
17451745
// bool getBlockRepeat() const;
@@ -1753,12 +1753,12 @@ class cocos2d::CCKeyboardDispatcher : cocos2d::CCObject {
17531753

17541754
static cocos2d::enumKeyCodes convertKeyCode(cocos2d::enumKeyCodes) = imac 0x203870, m1 0x1b07d0;
17551755

1756-
void addDelegate(cocos2d::CCKeyboardDelegate*); // ios 0x23996, m1 0x1b043c, imac 0x203530;
1756+
void addDelegate(cocos2d::CCKeyboardDelegate*) = m1 0x1b043c, imac 0x203530;
17571757
bool dispatchKeyboardMSG(cocos2d::enumKeyCodes, bool, bool, double) = imac 0x2035b0, m1 0x1b04d4;
1758-
void forceAddDelegate(cocos2d::CCKeyboardDelegate*); // ios 0x2399a, m1 0x1b0498, imac 0x203580;
1759-
void forceRemoveDelegate(cocos2d::CCKeyboardDelegate*); // ios 0x2398c, m1 0x1b03a8, imac 0x2034a0;
1758+
void forceAddDelegate(cocos2d::CCKeyboardDelegate*) = m1 0x1b0498, imac 0x203580;
1759+
void forceRemoveDelegate(cocos2d::CCKeyboardDelegate*) = m1 0x1b03a8, imac 0x2034a0;
17601760
char const* keyToString(cocos2d::enumKeyCodes) = imac 0x2038c0, m1 0x1b0804;
1761-
void removeDelegate(cocos2d::CCKeyboardDelegate*); // ios 0x23988, m1 0x1b02e0, imac 0x2033f0;
1761+
void removeDelegate(cocos2d::CCKeyboardDelegate*) = m1 0x1b02e0, imac 0x2033f0;
17621762
void updateModifierKeys(bool, bool, bool, bool) = imac 0x203890, m1 0x1b07ec;
17631763

17641764
cocos2d::CCArray* m_pDelegates;
@@ -1774,17 +1774,17 @@ class cocos2d::CCKeyboardDispatcher : cocos2d::CCObject {
17741774
bool m_bBlockRepeat;
17751775
}
17761776

1777-
[[link(win, android)]]
1777+
[[link(win, android, ios)]]
17781778
class cocos2d::CCKeyboardHandler : cocos2d::CCObject {
17791779

1780-
virtual ~CCKeyboardHandler() = imac 0x43e0b0, m1 0x3afb5c, ios 0x216958;
1780+
virtual ~CCKeyboardHandler() = imac 0x43e0b0, m1 0x3afb5c;
17811781

1782-
static cocos2d::CCKeyboardHandler* handlerWithDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e290, m1 0x3afd24, ios 0x216a0c;
1782+
static cocos2d::CCKeyboardHandler* handlerWithDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e290, m1 0x3afd24;
17831783

1784-
virtual bool initWithDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e240, m1 0x3afcd0, ios 0x2169c4;
1784+
virtual bool initWithDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e240, m1 0x3afcd0;
17851785

1786-
cocos2d::CCKeyboardDelegate* getDelegate() = imac 0x43e0a0, m1 0x3afb54, ios 0x216950;
1787-
void setDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e1d0, m1 0x3afc64, ios inline;
1786+
cocos2d::CCKeyboardDelegate* getDelegate() = imac 0x43e0a0, m1 0x3afb54;
1787+
void setDelegate(cocos2d::CCKeyboardDelegate*) = imac 0x43e1d0, m1 0x3afc64;
17881788
}
17891789

17901790
[[link(win, android)]]

bindings/2.2081/inline/CCKeyboardHandler.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@
88
#endif
99

1010
#if defined(GEODE_IS_IOS)
11-
void cocos2d::CCKeyboardHandler::setDelegate(cocos2d::CCKeyboardDelegate* p0) {
12-
if (auto delegate = geode::cast::typeinfo_cast<cocos2d::CCObject*>(p0)) delegate->retain();
13-
if (auto delegate = geode::cast::typeinfo_cast<cocos2d::CCObject*>(m_pDelegate)) delegate->release();
14-
m_pDelegate = p0;
15-
}
1611
#endif
1712

test/members/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ CPMAddPackage("gh:geode-sdk/result@1.4.1")
1717
CPMAddPackage("gh:geode-sdk/json@3.2.3")
1818
CPMAddPackage("gh:geode-sdk/TulipHook@3.1.7")
1919
CPMAddPackage("gh:zhihaoy/nontype_functional#8ec2e09")
20-
set (ARC_FEATURE_FULL OFF CACHE BOOL "" FORCE)
20+
set(ARC_FEATURE_FULL OFF CACHE BOOL "" FORCE)
2121
CPMAddPackage("gh:dankmeme01/arc@1.4.7")
2222

23+
set_target_properties(asp PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 64)
24+
set_target_properties(arc PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 64)
25+
2326
if (WIN32)
2427
target_compile_definitions(fmt PRIVATE _HAS_ITERATOR_DEBUGGING=0)
2528
endif()

0 commit comments

Comments
 (0)