some mod safety measures

qimiko · May 18, 2024 · c9c29f9 · c9c29f9
1 parent 8091558
commit c9c29f9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/async.cpp b/src/async.cpp
@@ -4,6 +4,10 @@
 
 void AsyncUILayer::handleKeypress(cocos2d::enumKeyCodes key, bool down) {
 	auto event = ExtendedCCKeyboardDispatcher::getCurrentEventInfo();
+	if (!event) {
+		return UILayer::handleKeypress(key, down);
+	}
+
 	auto extendedInfo = static_cast<ExtendedCCEvent*>(event);
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
@@ -12,6 +16,10 @@ void AsyncUILayer::handleKeypress(cocos2d::enumKeyCodes key, bool down) {
 }
 
 bool AsyncUILayer::ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
+	if (!event) {
+		return UILayer::ccTouchBegan(touch, event);
+	}
+
 	auto extendedInfo = static_cast<ExtendedCCEvent*>(event);
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
@@ -22,6 +30,10 @@ bool AsyncUILayer::ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 }
 
 void AsyncUILayer::ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
+	if (!event) {
+		return UILayer::ccTouchMoved(touch, event);
+	}
+
 	auto extendedInfo = static_cast<ExtendedCCEvent*>(event);
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
@@ -30,6 +42,10 @@ void AsyncUILayer::ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 }
 
 void AsyncUILayer::ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
+	if (!event) {
+		return UILayer::ccTouchEnded(touch, event);
+	}
+
 	auto extendedInfo = static_cast<ExtendedCCEvent*>(event);
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 
@@ -39,6 +55,10 @@ void AsyncUILayer::ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event
 
 #ifndef GEODE_IS_WINDOWS
 void AsyncUILayer::ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
+	if (!event) {
+		return UILayer::ccTouchCancelled(touch, event);
+	}
+
 	auto extendedInfo = static_cast<ExtendedCCEvent*>(event);
 	m_fields->m_lastTimestamp = extendedInfo->getTimestamp();
 

diff --git a/src/windows.cpp b/src/windows.cpp
@@ -390,7 +390,7 @@ class ManualKeyboardEvent : public GameEvent {
 struct AsyncCCKeyboardDispatcher : geode::Modify<AsyncCCKeyboardDispatcher, cocos2d::CCKeyboardDispatcher> {
 	static void onModify(auto& self) {
 		// this is the most likely to be called before by another mod and it would be really bad if that other mod got to it first
-		(void)self.setHookPriority("cocos2d::CCKeyboardDispatcher::dispatchKeyboardMSG", -10000);
+		(void)self.setHookPriority("cocos2d::CCKeyboardDispatcher::dispatchKeyboardMSG", -100000);
 	}
 
 	bool dispatchKeyboardMSG(cocos2d::enumKeyCodes key, bool isDown, bool isRepeat) {