diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 7fc74b9b..c10358d8 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -97,7 +97,6 @@ class AppDelegate : cocos2d::CCApplication, cocos2d::CCSceneDelegate { void resumeSound() = win 0x3d4d0; void setupGLView() = win 0x3c950; - PAD = win 0x4; cocos2d::CCScene* m_runningScene; bool m_loadingFinished; // there's 0x18 more on Windows diff --git a/loader/include/Geode/cocos/platform/win32/CCApplication.h b/loader/include/Geode/cocos/platform/win32/CCApplication.h index 682e0ebe..3a0c752c 100644 --- a/loader/include/Geode/cocos/platform/win32/CCApplication.h +++ b/loader/include/Geode/cocos/platform/win32/CCApplication.h @@ -67,11 +67,11 @@ public: return m_startupScriptFilename; } -protected: +public: HINSTANCE m_hInstance; HACCEL m_hAccelTable; LARGE_INTEGER m_nAnimationInterval; - PAD(4); + PAD(8); std::string m_resourceRootPath; std::string m_startupScriptFilename; void* m_pUnknown; diff --git a/loader/src/ui/nodes/Notification.cpp b/loader/src/ui/nodes/Notification.cpp index 58ec88cd..872cc6b5 100644 --- a/loader/src/ui/nodes/Notification.cpp +++ b/loader/src/ui/nodes/Notification.cpp @@ -132,16 +132,22 @@ void Notification::setTime(float time) { void Notification::animateIn() { m_label->setOpacity(0); - m_icon->setOpacity(0); + if (m_icon) { + m_icon->setOpacity(0); + } m_bg->setOpacity(0); m_label->runAction(CCFadeTo::create(NOTIFICATION_FADEIN, 255)); - m_icon->runAction(CCFadeTo::create(NOTIFICATION_FADEIN, 255)); + if (m_icon) { + m_icon->runAction(CCFadeTo::create(NOTIFICATION_FADEIN, 255)); + } m_bg->runAction(CCFadeTo::create(NOTIFICATION_FADEIN, 150)); } void Notification::animateOut() { m_label->runAction(CCFadeTo::create(NOTIFICATION_FADEOUT, 0)); - m_icon->runAction(CCFadeTo::create(NOTIFICATION_FADEOUT, 0)); + if (m_icon) { + m_icon->runAction(CCFadeTo::create(NOTIFICATION_FADEOUT, 0)); + } m_bg->runAction(CCFadeTo::create(NOTIFICATION_FADEOUT, 0)); }