Skip to content

Commit

Permalink
rename particle members so they actually refer to what they do (#705)
Browse files Browse the repository at this point in the history 
* yeah

* rename member tests

* ok mac

* ok android32

* mac os being mean again
  • Loading branch information
@SpaghettDev
SpaghettDev authored Aug 13, 2024
1 parent f73c90d commit 836ebbc
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions bindings/2.206/GeometryDash.bro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6110,7 +6110,7 @@ class GameObject : CCSpritePlus {
cocos2d::CCSpriteBatchNode* parentForZLayer(int, bool, int);
gd::string perspectiveColorFrame(char const*, int);
gd::string perspectiveFrame(char const*, int);
void playDestroyObjectAnim(GJBaseGameLayer*) = win 0x1a04e0;
void playDestroyObjectAnim(GJBaseGameLayer*) = win 0x1a04e0, imac 0x25a310, m1 0x201d4c;
void playPickupAnimation(cocos2d::CCSprite*, float, float, float, float, float, float, float, float, bool, float, float) = win 0x1a0000;
void playPickupAnimation(cocos2d::CCSprite*, float, float, float, float) = win 0x19ff10;
void playShineEffect() = win 0x18f3f0, imac 0x5c5a90, m1 0x4f4cac;
Expand Down Expand Up @@ -7328,7 +7328,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
void createMiddleground(int) = win 0x1fc890;
TodoReturn createNewKeyframeAnim();
TodoReturn createParticle(int, char const*, int, cocos2d::tCCPositionType);
void createPlayer() = win 0x1fc0c0, ios 0x1e73b8;
void createPlayer() = win 0x1fc0c0, imac 0x1072f0, m1 0xe72e0, ios 0x1e73b8;
TodoReturn createPlayerCollisionBlock() = win 0x208c00;
void createTextLayers() = win 0x1ffa50, m1 0xf09d4, imac 0x113b80;
TodoReturn damagingObjectsInRect(cocos2d::CCRect, bool);
Expand Down Expand Up @@ -7546,7 +7546,7 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
TodoReturn sortStickyGroups();
void spawnGroupTriggered(int groupID, float, bool, gd::vector<int> const&, int, int);
TodoReturn spawnObjectsInOrder(cocos2d::CCArray*, double, gd::vector<int> const&, int, int);
void spawnParticle(char const*, int, cocos2d::tCCPositionType, cocos2d::CCPoint);
cocos2d::CCParticleSystemQuad* spawnParticle(char const* plist, int zOrder, cocos2d::tCCPositionType positionType, cocos2d::CCPoint position) = win 0x22f3f0, imac 0x151480, m1 0x1222ec;
TodoReturn spawnParticleTrigger(int, cocos2d::CCPoint, float, float);
TodoReturn spawnParticleTrigger(SpawnParticleGameObject*);
TodoReturn spawnPlayer2();
Expand Down Expand Up @@ -7952,15 +7952,15 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate {
GameObject* m_player2CollisionBlock;
int m_particleCount;
int m_customParticleCount;
int m_maybeParticleLimit;
cocos2d::CCDictionary* m_portalParticlesDict;
cocos2d::CCDictionary* m_customParticles;
cocos2d::CCArray* m_unclaimedParticles;
gd::unordered_map<int, gd::string> m_umapIntString;
cocos2d::CCDictionary* m_customParticlesDictArray;
cocos2d::CCArray* m_temporaryParticles;
gd::unordered_set<int> m_usetInt;
cocos2d::CCDictionary* m_unk2a50;
int m_particleSystemLimit; // limit per key in m_particlesDict
cocos2d::CCDictionary* m_particlesDict; // CCDictionary<gd::string, CCArray<CCParticleSystemQuad*>>
cocos2d::CCDictionary* m_customParticles; // same type as m_particlesDict
cocos2d::CCArray* m_unclaimedParticles; // CCArray<CCParticleSystemQuad*>
gd::unordered_map<int, gd::string> m_particleCountToParticleString;
cocos2d::CCDictionary* m_claimedParticles; // same type as m_particlesDict
cocos2d::CCArray* m_temporaryParticles; // same type as m_unclaimedParticles
gd::unordered_set<int> m_customParticlesUIDs;
cocos2d::CCDictionary* m_gradientLayers; // CCDictionary<int, CCLayerGradient>
void* m_unk2a54;
ShaderLayer* m_shaderLayer;
bool m_bUnk31a0;
Expand Down
6 changes: 3 additions & 3 deletions test/members/Android32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_player2, 0x898);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groupDict, 0x95c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unknownE38, 0x98c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_massiveFloatArray, 0xa48);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_portalParticlesDict, 0x2a04);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_particlesDict, 0x2a04);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticles, 0x2a08);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unclaimedParticles, 0x2a0c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticlesDictArray, 0x2a2c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_claimedParticles, 0x2a2c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_temporaryParticles, 0x2a30);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_attempts, 0x29d4);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unk2a50, 0x2a50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_gradientLayers, 0x2a50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_startPosObject, 0x2a60);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unk2a84, 0x2aa4);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_audioEffectsLayer, 0x2b04);
Expand Down
4 changes: 2 additions & 2 deletions test/members/Android64.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_objectLayer, 0xff0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groundLayer, 0x1018);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groundLayer2, 0x1020);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_massiveFloatArray, 0x10e4);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_portalParticlesDict, 0x30f0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_particlesDict, 0x30f0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticles, 0x30f8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unclaimedParticles, 0x3100);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticlesDictArray, 0x3140);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_claimedParticles, 0x3140);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_temporaryParticles, 0x3148);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_attempts, 0x30b4);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_shaderLayer, 0x3198);
Expand Down
4 changes: 2 additions & 2 deletions test/members/MacOSArm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groupDict, 0xde0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_massiveFloatArray, 0xf6c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_attempts, 0x2f14);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_isPlatformer, 0x2f2e);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_portalParticlesDict, 0x2f50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_particlesDict, 0x2f50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticles, 0x2f58);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unclaimedParticles, 0x2f60);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticlesDictArray, 0x2f90);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_claimedParticles, 0x2f90);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_temporaryParticles, 0x2f98);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_shaderLayer, 0x2fd8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_startPosObject, 0x2fe8);
Expand Down
4 changes: 2 additions & 2 deletions test/members/MacOSIntel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groupDict, 0xde0);
// GEODE_MEMBER_CHECK(GJBaseGameLayer, m_linkedGroupDict, 0xe80);
// GEODE_MEMBER_CHECK(GJBaseGameLayer, m_objectLayer, 0xea8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_massiveFloatArray, 0xf6c);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_portalParticlesDict, 0x2f50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_particlesDict, 0x2f50);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticles, 0x2f58);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unclaimedParticles, 0x2f60);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticlesDictArray, 0x2f90);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_claimedParticles, 0x2f90);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_temporaryParticles, 0x2f98);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_shaderLayer, 0x2fd8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_startPosObject, 0x2fe8);
Expand Down
6 changes: 3 additions & 3 deletions test/members/Windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_player1, 0xd98);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_player2, 0xda0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_groupDict, 0xef8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_isPlatformer, 0x3096);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unk2a50, 0x3160);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_gradientLayers, 0x3160);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unk2a84, 0x31f0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_startPosObject, 0x3180);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_isPracticeMode, 0x31e8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_endPortal, 0x3220);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_uiLayer, 0x3468);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_queuedButtons, 0x32f8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_portalParticlesDict, 0x30b8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_particlesDict, 0x30b8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticles, 0x30c0);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_unclaimedParticles, 0x30c8);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_customParticlesDictArray, 0x3110);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_claimedParticles, 0x3110);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_temporaryParticles, 0x3118);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_timePlayed, 0x3488);
GEODE_MEMBER_CHECK(GJBaseGameLayer, m_sections, 0x34b8);
Expand Down

0 comments on commit 836ebbc

Please sign in to comment.