From 1d53ce76957a476e09a40084b979084d69930b6c Mon Sep 17 00:00:00 2001 From: altalk23 <45172705+altalk23@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:59:12 +0300 Subject: [PATCH] Make missimg members private, ifdef missing ids --- codegen/src/BindingGen.cpp | 2 +- loader/src/ids/EditorPauseLayer.cpp | 4 ++++ loader/src/ids/LevelBrowserLayer.cpp | 4 ++++ loader/src/ids/LevelInfoLayer.cpp | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/codegen/src/BindingGen.cpp b/codegen/src/BindingGen.cpp index 1b5e3735..6aa89a23 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(/*make this private when android headers are done*/{public} {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/loader/src/ids/EditorPauseLayer.cpp b/loader/src/ids/EditorPauseLayer.cpp index 7c44a3f7..c1284360 100644 --- a/loader/src/ids/EditorPauseLayer.cpp +++ b/loader/src/ids/EditorPauseLayer.cpp @@ -2,6 +2,8 @@ #include +#if !defined(GEODE_IS_ANDROID) + using namespace geode::prelude; // special class for this because making it a CCMenuItemToggler would be very UB @@ -272,3 +274,5 @@ struct EditorPauseLayerIDs : Modify { return true; } }; + +#endif \ No newline at end of file diff --git a/loader/src/ids/LevelBrowserLayer.cpp b/loader/src/ids/LevelBrowserLayer.cpp index d3ef28e2..7723454b 100644 --- a/loader/src/ids/LevelBrowserLayer.cpp +++ b/loader/src/ids/LevelBrowserLayer.cpp @@ -4,6 +4,8 @@ #include #include +#if !defined(GEODE_IS_ANDROID) + using namespace geode::prelude; $register_ids(LevelBrowserLayer) { @@ -171,3 +173,5 @@ struct LevelBrowserLayerIDs : Modify { return true; } }; + +#endif \ No newline at end of file diff --git a/loader/src/ids/LevelInfoLayer.cpp b/loader/src/ids/LevelInfoLayer.cpp index d2f96629..5edfe252 100644 --- a/loader/src/ids/LevelInfoLayer.cpp +++ b/loader/src/ids/LevelInfoLayer.cpp @@ -3,6 +3,8 @@ #include #include +#if !defined(GEODE_IS_ANDROID) + $register_ids(LevelInfoLayer) { auto winSize = CCDirector::get()->getWinSize(); @@ -135,3 +137,5 @@ struct LevelInfoLayerIDs : Modify { return true; } }; + +#endif \ No newline at end of file