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

Improve Android bindings

Browse source
This commit is contained in:
Cvolton 2023-10-01 17:29:42 +02:00 committed by mat
parent 2a0c08c5d1
commit 63940f2ce9
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bindings/GeometryDash.bro
View file

@ -981,7 +981,8 @@ class CountTriggerAction : cocos2d::CCNode {
class CreateGuidelinesLayer : FLAlertLayer, FLAlertLayerProtocol { class CreateGuidelinesLayer : FLAlertLayer, FLAlertLayerProtocol {
void doClearGuidelines() = win 0x4cf60, mac 0x299690; void doClearGuidelines() = win 0x4cf60, mac 0x299690;
void onStop(cocos2d::CCObject* sender) = win 0x4d2c0, mac 0x2990f0; void onStop(cocos2d::CCObject* sender) = win 0x4d2c0, mac 0x2990f0;
PAD = win 0x4, mac 0x8;
void* m_unk;
LevelSettingsObject* m_levelSettings; LevelSettingsObject* m_levelSettings;
PAD = win 0x1c; PAD = win 0x1c;
gd::string m_guidelineString; gd::string m_guidelineString;
@ -1139,10 +1140,10 @@ class CustomizeObjectLayer : FLAlertLayer, TextInputDelegate, HSVWidgetPopupDele
class DailyLevelPage : FLAlertLayer, FLAlertLayerProtocol, GJDailyLevelDelegate, LevelDownloadDelegate { class DailyLevelPage : FLAlertLayer, FLAlertLayerProtocol, GJDailyLevelDelegate, LevelDownloadDelegate {
static DailyLevelPage* create(bool weekly) = win 0x6a860; static DailyLevelPage* create(bool weekly) = win 0x6a860;
bool init(bool weekly) = mac 0x108C90, win 0x6a900; bool init(bool weekly) = mac 0x108C90, win 0x6a900;
virtual void updateTimers(float) = mac 0x109780, win 0x6bef0; void updateTimers(float) = mac 0x109780, win 0x6bef0;
virtual void show() = mac 0x10a4b0, win 0x3f360; virtual void show() = mac 0x10a4b0, win 0x3f360;
PAD = mac 0x29, win 0x15; PAD = mac 0x29, win 0x15, android 0x15;
bool m_weekly; bool m_weekly;
} }
@ -3015,7 +3016,7 @@ class GameLevelManager : cocos2d::CCNode {
int m_dailyTimeLeft; int m_dailyTimeLeft;
int m_dailyID; int m_dailyID;
int m_dailyIDUnk; int m_dailyIDUnk;
PAD = mac 0x10, win 0x4; PAD = mac 0x10, win 0x4, android 0x4;
int m_weeklyTimeLeft; int m_weeklyTimeLeft;
int m_weeklyID; int m_weeklyID;
int m_weeklyIDUnk; int m_weeklyIDUnk;
@ -3283,7 +3284,7 @@ class GameManager : GManager {
bool m_showedRateDiffDialog; bool m_showedRateDiffDialog;
bool m_showedRateStarDialog; bool m_showedRateStarDialog;
bool m_showedLowDetailDialog; bool m_showedLowDetailDialog;
PAD = mac 0x3c, win 0x30; PAD = mac 0x3c, win 0x30, android 0x30;
int m_bootups; int m_bootups;
bool m_hasRatedGame; bool m_hasRatedGame;
bool m_unk0; bool m_unk0;
@ -3706,14 +3707,14 @@ class GameStatsManager : cocos2d::CCNode {
void storeUserCoin(char const*) = mac 0x42890; void storeUserCoin(char const*) = mac 0x42890;
bool isItemUnlocked(UnlockType type, int id) = win 0xfbb80; bool isItemUnlocked(UnlockType type, int id) = win 0xfbb80;
PAD = mac 0x50, win 0x28; PAD = mac 0x50, win 0x28, android 0x24;
cocos2d::CCDictionary* m_dailyChests; cocos2d::CCDictionary* m_dailyChests;
cocos2d::CCDictionary* m_worldAdvertChests; cocos2d::CCDictionary* m_worldAdvertChests;
cocos2d::CCDictionary* m_activeChallenges; cocos2d::CCDictionary* m_activeChallenges;
cocos2d::CCDictionary* m_upcomingChallenges; cocos2d::CCDictionary* m_upcomingChallenges;
PAD = mac 0x18, win 0xc; PAD = mac 0x18, win 0xc, android 0xc;
cocos2d::CCDictionary* m_playerStats; cocos2d::CCDictionary* m_playerStats;
PAD = mac 0x50, win 0x10; PAD = mac 0x50, win 0x10, android 0x34;
cocos2d::CCDictionary* m_completedLevels; cocos2d::CCDictionary* m_completedLevels;
cocos2d::CCDictionary* m_verifiedUserCoins; cocos2d::CCDictionary* m_verifiedUserCoins;
cocos2d::CCDictionary* m_pendingUserCoins; cocos2d::CCDictionary* m_pendingUserCoins;
@ -3917,7 +3918,7 @@ class LevelBrowserLayer : cocos2d::CCLayer, LevelManagerDelegate, FLAlertLayerPr
void onNew(cocos2d::CCObject* sender) = win 0x15cbf0, mac 0x252ac0; void onNew(cocos2d::CCObject* sender) = win 0x15cbf0, mac 0x252ac0;
static LevelBrowserLayer* create(GJSearchObject* search) = mac 0x251210, win 0x159fa0, ios 0x2d0a00; static LevelBrowserLayer* create(GJSearchObject* search) = mac 0x251210, win 0x159fa0, ios 0x2d0a00;
PAD = win 0x4, mac 0x8; void* m_unk;
TextArea* m_noInternet; TextArea* m_noInternet;
GJListLayer* m_list; GJListLayer* m_list;
CCMenuItemSpriteExtra* m_rightArrow; CCMenuItemSpriteExtra* m_rightArrow;
@ -4192,14 +4193,14 @@ class LevelInfoLayer : cocos2d::CCLayer, LevelDownloadDelegate, LevelUpdateDeleg
void showUpdateAlert(UpdateResponse) = mac 0x164ED0, win 0x179300; void showUpdateAlert(UpdateResponse) = mac 0x164ED0, win 0x179300;
void updateLabelValues() = mac 0x164090, win 0x17b170; void updateLabelValues() = mac 0x164090, win 0x17b170;
PAD = win 0x4, mac 0x8; void* m_unk1;
cocos2d::CCMenu* m_playBtnMenu; cocos2d::CCMenu* m_playBtnMenu;
GJGameLevel* m_level; GJGameLevel* m_level;
cocos2d::CCArray* m_unknown; cocos2d::CCArray* m_unknown;
CCMenuItemSpriteExtra* m_likeBtn; CCMenuItemSpriteExtra* m_likeBtn;
CCMenuItemSpriteExtra* m_starRateBtn; CCMenuItemSpriteExtra* m_starRateBtn;
CCMenuItemSpriteExtra* m_demonRateBtn; CCMenuItemSpriteExtra* m_demonRateBtn;
PAD = win 0x4, mac 0x8; void* m_unk2;
CCMenuItemToggler* m_ldmToggler; CCMenuItemToggler* m_ldmToggler;
cocos2d::CCLabelBMFont* m_ldmLabel; cocos2d::CCLabelBMFont* m_ldmLabel;
cocos2d::CCLabelBMFont* m_lengthLabel; cocos2d::CCLabelBMFont* m_lengthLabel;
@ -4208,7 +4209,7 @@ class LevelInfoLayer : cocos2d::CCLayer, LevelDownloadDelegate, LevelUpdateDeleg
cocos2d::CCLabelBMFont* m_orbsLabel; cocos2d::CCLabelBMFont* m_orbsLabel;
cocos2d::CCLabelBMFont* m_folderLabel; cocos2d::CCLabelBMFont* m_folderLabel;
CCMenuItemSpriteExtra* m_cloneBtn; CCMenuItemSpriteExtra* m_cloneBtn;
PAD = win 0x4, mac 0x8; void* m_unk3;
} }
[[link(android)]] [[link(android)]]
@ -4232,7 +4233,7 @@ class LevelManagerDelegate {
[[link(android)]] [[link(android)]]
class LevelPage : cocos2d::CCLayer, DialogDelegate { class LevelPage : cocos2d::CCLayer, DialogDelegate {
PAD = mac 0x8, win 0x4; void* m_unk;
GJGameLevel* m_level; GJGameLevel* m_level;
void onInfo(cocos2d::CCObject* sender) = mac 0x23AAE0, win 0x189070; void onInfo(cocos2d::CCObject* sender) = mac 0x23AAE0, win 0x189070;
@ -5425,7 +5426,7 @@ class RetryLevelLayer {
[[link(android)]] [[link(android)]]
class RewardsPage : FLAlertLayer { class RewardsPage : FLAlertLayer {
bool init() = mac 0xf3800, win 0x2178F0; virtual bool init() = mac 0xf3800, win 0x2178F0;
} }
[[link(android)]] [[link(android)]]

4
loader/src/ids/LevelBrowserLayer.cpp
View file

@ -4,8 +4,6 @@
#include <Geode/modify/LevelBrowserLayer.hpp> #include <Geode/modify/LevelBrowserLayer.hpp>
#include <Geode/utils/cocos.hpp> #include <Geode/utils/cocos.hpp>
#if !defined(GEODE_IS_ANDROID)
using namespace geode::prelude; using namespace geode::prelude;
$register_ids(LevelBrowserLayer) { $register_ids(LevelBrowserLayer) {
@ -173,5 +171,3 @@ struct LevelBrowserLayerIDs : Modify<LevelBrowserLayerIDs, LevelBrowserLayer> {
return true; return true;
} }
}; };
#endif

4
loader/src/ids/LevelInfoLayer.cpp
View file

@ -3,8 +3,6 @@
#include <Geode/binding/LevelInfoLayer.hpp> #include <Geode/binding/LevelInfoLayer.hpp>
#include <Geode/modify/LevelInfoLayer.hpp> #include <Geode/modify/LevelInfoLayer.hpp>
#if !defined(GEODE_IS_ANDROID)
$register_ids(LevelInfoLayer) { $register_ids(LevelInfoLayer) {
auto winSize = CCDirector::get()->getWinSize(); auto winSize = CCDirector::get()->getWinSize();
@ -137,5 +135,3 @@ struct LevelInfoLayerIDs : Modify<LevelInfoLayerIDs, LevelInfoLayer> {
return true; return true;
} }
}; };
#endif

6
loader/test/members/Android.cpp
View file

@ -8,6 +8,7 @@
GEODE_MEMBER_CHECK(GameManager, m_playLayer, 0x138); GEODE_MEMBER_CHECK(GameManager, m_playLayer, 0x138);
GEODE_MEMBER_CHECK(GameManager, m_levelEditorLayer, 0x13c); GEODE_MEMBER_CHECK(GameManager, m_levelEditorLayer, 0x13c);
GEODE_MEMBER_CHECK(GameManager, m_canGetLevelSaveData, 0x28c);
static_assert(sizeof(GJBaseGameLayer) == 0x2cc); static_assert(sizeof(GJBaseGameLayer) == 0x2cc);
@ -20,4 +21,9 @@ GEODE_MEMBER_CHECK(PlayLayer, m_shouldTryToKick, 0x4e0);
static_assert(sizeof(GameObject) == 0x42c); static_assert(sizeof(GameObject) == 0x42c);
GEODE_MEMBER_CHECK(GameStatsManager, m_dailyChests, 0x110);
GEODE_MEMBER_CHECK(GameStatsManager, m_completedLevels, 0x164);
GEODE_MEMBER_CHECK(DailyLevelPage, m_weekly, 0x1ed);
#endif #endif