diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index cda687a4..29b12d1d 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -2071,7 +2071,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate { int m_lastVisibleSection; bool m_objectsAreDisabled; bool m_blending; - PAD = mac 0x8, win 0x8; + PAD = mac 0x8, win 0x8, android 0x8; } [[link(android)]] @@ -3192,19 +3192,18 @@ class GameManager : GManager { bool m_switchModes; bool m_toFullscreen; bool m_reloading; - bool m_unknown0; - PAD = mac 0x4, win 0x4; + PAD = mac 0x5, win 0x5, android 0x1; cocos2d::CCDictionary* m_valueKeeper; cocos2d::CCDictionary* m_unlockValueKeeper; cocos2d::CCDictionary* m_customObjectDict; double m_adTimer; double m_adCache; - PAD = mac 0x8, win 0x8; + PAD = mac 0x8, win 0x8, android 0x8; double m_unknownDouble; // TODO: according to wylie's decomp this pad was 0x4, gd.h has it as 0x8 (and its correct) // i have a feeling android gm and windows gm are different structs // so the extra member could be here (for windows) - PAD = mac 0x4, win 0x8; + PAD = mac 0x4, win 0x8, android 0x8; bool m_loaded; gd::string m_unknownString; PlayLayer* m_playLayer; @@ -4871,7 +4870,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate, bool m_debugPauseOff; bool m_shouldSmoothCamera; float unused_4e0; - PAD = mac 0x4, win 0x4; + PAD = mac 0x4, win 0x4, android 0x4; cocos2d::CCDrawNode* unknown4e8; float m_camera4f0; int unused4f4; @@ -4885,7 +4884,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate, float unknown510; float unknown514; float unknown518; - PAD = mac 0x4, win 0x4; + PAD = mac 0x4, win 0x4, android 0x4; StartPosObject* m_startPos; CheckpointObject* m_startPosCheckpoint; EndPortalObject* m_endPortal; @@ -4918,7 +4917,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate, float unknown5c4; GJGroundLayer* m_bottomGround; GJGroundLayer* m_topGround; - PAD = mac 0x8, win 0x8; + PAD = mac 0x8, win 0x8, android 0x8; bool m_isDead; bool m_startCameraAtCorner; bool m_cameraYLocked; @@ -4952,7 +4951,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, CurrencyRewardDelegate, int unknown680; int m_activeGravityEffects; int m_gravityEffectStatus; // ?? - PAD = mac 0x4, win 0x4; + PAD = mac 0x4, win 0x4, android 0x4; cocos2d::CCArray* m_gravitySprites; bool unk428; bool m_shouldRecordActions; diff --git a/codegen/src/BindingGen.cpp b/codegen/src/BindingGen.cpp index 6aa89a23..c1d5b015 100644 --- a/codegen/src/BindingGen.cpp +++ b/codegen/src/BindingGen.cpp @@ -62,7 +62,7 @@ public: )GEN"; // requires: type, member_name, array - char const* member_definition = R"GEN( {private} {type} {member_name};{public} + char const* member_definition = R"GEN({private} {type} {member_name};{public} )GEN"; char const* pad_definition = R"GEN( GEODE_PAD({hardcode}); diff --git a/codegen/src/SourceGen.cpp b/codegen/src/SourceGen.cpp index 35f58962..eee73f19 100644 --- a/codegen/src/SourceGen.cpp +++ b/codegen/src/SourceGen.cpp @@ -157,9 +157,9 @@ std::string generateBindingSource(Root const& root) { // yeah there are no inlines on cocos } else if (auto fn = f.get_as()) { - if ((c.links & codegen::platform) != Platform::None) { - continue; - } + // if ((c.links & codegen::platform) != Platform::None) { + // continue; + // } if (codegen::getStatus(f) != BindStatus::Unbindable) { continue; } diff --git a/loader/test/members/Android.cpp b/loader/test/members/Android.cpp index 87e81630..fb5a10fd 100644 --- a/loader/test/members/Android.cpp +++ b/loader/test/members/Android.cpp @@ -6,4 +6,9 @@ // needed classes are ones in the ids folder and some generic ones (i think they are already done though so only ids) +GEODE_MEMBER_CHECK(GameManager, m_playLayer, 0x138); +GEODE_MEMBER_CHECK(GameManager, m_levelEditorLayer, 0x13c); + +GEODE_MEMBER_CHECK(PlayLayer, m_level, 0x470); + #endif \ No newline at end of file