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

Merge branch 'main' of https://github.com/geode-sdk/geode into main

Browse source
This commit is contained in:
HJfod 2023-03-19 08:40:32 +02:00
commit ee91aecc48
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/Cocos2d.bro
View file

@ -365,7 +365,7 @@ class cocos2d::CCLayerColor {
virtual auto setContentSize(cocos2d::CCSize const&) = mac 0x2749f0, ios 0xc8f64;
virtual auto setOpacity(unsigned char) = mac 0x274db0, ios 0xc9108;
virtual auto updateColor() = mac 0x274ae0, ios 0xc8f80;
~CCLayerColor() = mac 0x2743d0, ios 0x2743e0, win 0xa1a20;
virtual ~CCLayerColor() = mac 0x2743d0, ios 0x2743e0, win 0xa1a20;
}
class cocos2d::CCLayerRGBA {

1
bindings/GeometryDash.bro
View file

@ -3645,6 +3645,7 @@ class LevelEditorLayer : GJBaseGameLayer, LevelSettingsDelegate {
void resetObjectVector() = mac 0x9c4b0;
void resetToggledGroups() = mac 0x9aa70;
void resetToggledGroupsAndObjects() = mac 0x9c3c0, win 0x166b80;
void resetEffectTriggerOptim(GameObject* obj, cocos2d::CCArray* objs) = win 0x167e00;
void resetUnusedColorChannels() = mac 0x9a870;
void rotationForSlopeNearObject(GameObject*) = mac 0x95cd0, win 0x161130;
void runColorEffect(EffectGameObject*, int, float, float, bool) = mac 0x9bd30;

7
codegen/src/AddressGen.cpp
View file

@ -103,7 +103,12 @@ std::string generateAddressHeader(Root& root) {
);
}
else if (codegen::getStatus(field) == BindStatus::NeedsBinding) {
address_str = fmt::format("base::get() + 0x{:x}", codegen::platformNumber(fn->binds));
if (field.parent.rfind("cocos2d::", 0) == 0 && codegen::platform == Platform::Windows) {
address_str = fmt::format("base::getCocos() + 0x{:x}", codegen::platformNumber(fn->binds));
}
else {
address_str = fmt::format("base::get() + 0x{:x}", codegen::platformNumber(fn->binds));
}
}
else {
continue;