Skip to content

Commit 5906785

Browse files
committed
ArtTriggerGameObject and SetupArtSwitchPopup
Accidentally made changes on main :P
1 parent 3ba679f commit 5906785

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

bindings/2.2074/GeometryDash.bro

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -553,11 +553,13 @@ class ArtTriggerGameObject : EffectGameObject {
553553

554554
static ArtTriggerGameObject* create(char const*);
555555

556-
virtual void triggerObject(GJBaseGameLayer*, int, gd::vector<int> const*) = imac 0x1db7e0, m1 0x194614, ios 0x390034;
557-
virtual void customObjectSetup(gd::vector<gd::string>&, gd::vector<void*>&) = imac 0x1db780, m1 0x19459c, ios 0x38ffcc;
558-
virtual gd::string getSaveString(GJBaseGameLayer*) = imac 0x1db260, m1 0x194120, ios 0x38fe3c;
556+
virtual void triggerObject(GJBaseGameLayer*, int, gd::vector<int> const*) = win 0x4a98a0, imac 0x1db7e0, m1 0x194614, ios 0x390034;
557+
virtual void customObjectSetup(gd::vector<gd::string>&, gd::vector<void*>&) = win 0x4a9820, imac 0x1db780, m1 0x19459c, ios 0x38ffcc;
558+
virtual gd::string getSaveString(GJBaseGameLayer*) = win 0x4a98a0, imac 0x1db260, m1 0x194120, ios 0x38fe3c;
559559

560560
bool init(char const*);
561+
562+
int m_artIndex;
561563
}
562564

563565
[[link(android)]]
@@ -17864,12 +17866,15 @@ class SetupAreaTriggerPopup : SetupAreaMoveTriggerPopup {
1786417866
class SetupArtSwitchPopup : SetupTriggerPopup, SelectArtDelegate {
1786517867
// virtual ~SetupArtSwitchPopup();
1786617868

17867-
static SetupArtSwitchPopup* create(ArtTriggerGameObject*, cocos2d::CCArray*, int);
17869+
static SetupArtSwitchPopup* create(ArtTriggerGameObject*, cocos2d::CCArray*, int) = win 0x459210;
1786817870

1786917871
virtual void selectArtClosed(SelectArtLayer*) = win 0x459ed0, imac 0x56ee90, m1 0x4c38e4, ios 0x4092dc;
1787017872

17871-
bool init(ArtTriggerGameObject*, cocos2d::CCArray*, int) = m1 0x4c32b0, imac 0x56e840;
17872-
void onArt(cocos2d::CCObject* sender);
17873+
bool init(ArtTriggerGameObject*, cocos2d::CCArray*, int) = win 0x4594d0, m1 0x4c32b0, imac 0x56e840;
17874+
void onArt(cocos2d::CCObject* sender) = win 0x459e80;
17875+
17876+
SelectArtType m_artType;
17877+
cocos2d::CCSprite* m_artSprite;
1787317878
}
1787417879

1787517880
[[link(android)]]

bindings/include/Geode/Enums.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ enum class PlaybackMode {
691691
enum class SelectArtType {
692692
Background = 0,
693693
Ground = 1,
694+
Middleground = 2,
694695
};
695696

696697
enum class UndoCommand {

0 commit comments

Comments
 (0)