diff --git a/bindings/Cocos2d.bro b/bindings/Cocos2d.bro index effeaa02..34b7f504 100644 --- a/bindings/Cocos2d.bro +++ b/bindings/Cocos2d.bro @@ -725,6 +725,7 @@ class cocos2d::CCSpriteBatchNode { class cocos2d::CCSpriteFrame { static auto createWithTexture(cocos2d::CCTexture2D*, cocos2d::CCRect const&, bool, cocos2d::CCPoint const&, cocos2d::CCSize const&) = mac 0x1ac7f0; static auto createWithTexture(cocos2d::CCTexture2D*, cocos2d::CCRect const&) = mac 0x1ac5c0; + auto getTexture() = mac 0x1ad250; } class cocos2d::CCSpriteFrameCache { @@ -788,6 +789,8 @@ class cocos2d::CCTextFieldTTF { class cocos2d::CCTextureCache { auto addImage(char const*, bool) = mac 0x358120, ios 0xa8388; + auto textureForKey(char const*) = mac 0x359050; + static cocos2d::CCTextureCache* sharedTextureCache() = mac 0x356e00, ios 0xa81ec; } diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index 743dd67c..c589995c 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -1662,8 +1662,8 @@ class GJBaseGameLayer : cocos2d::CCLayer, TriggerEffectDelegate { int m_unk2AC; bool m_activeDualTouch; int m_attemptClickCount; - int m_currentSection; - int m_oldSection; + int m_lastVisibleSection; + int m_firstVisibleSection; bool m_objectsAreDisabled; bool m_blending; PAD = mac 0x16, win 0x8, android 0x0; @@ -2846,7 +2846,7 @@ class GameObject : CCSpritePlus { virtual cocos2d::CCRect* getObjectRect(float, float) = mac 0x3352d0, win 0xe4a70, ios 0x0; virtual cocos2d::CCRect* getObjectRect2(float, float) = mac 0x3354e0, win 0xe4b90, ios 0x0; virtual cocos2d::CCRect* getObjectTextureRect() = mac 0x3355b0, win 0xe4c40, ios 0x0; - virtual void getRealPosition() = mac 0x335750, win 0xe4d90, ios 0x0; + virtual cocos2d::CCPoint getRealPosition() = mac 0x335750, win 0xe4d90, ios 0x0; virtual void setStartPos(cocos2d::CCPoint) = mac 0x2fa520, win 0xd1390, ios 0x0; virtual void updateStartValues() = mac 0x2fa800, win 0xd1610, ios 0x0; virtual void customObjectSetup() = mac 0xdc1a0, win 0x0, ios 0x0; @@ -2874,7 +2874,7 @@ class GameObject : CCSpritePlus { virtual void setOrientedRectDirty(bool) = mac 0xdc200, win 0x0, ios 0x0; virtual GameObjectType getType() const = mac 0xdc210, win 0x989e0, ios 0x0; virtual void setType(GameObjectType) = mac 0xdc220, win 0x989f0, ios 0x0; - virtual void getStartPos() const = mac 0xdc230, win 0x98a00, ios 0x0; + virtual cocos2d::CCPoint const& getStartPos() const = mac 0xdc230, win 0x98a00, ios 0x0; void activatedByPlayer(GameObject*) = mac 0x342a20, win 0x0, ios 0x0; void addColorSprite() = mac 0x2f7fe0, win 0x0, ios 0x0; void addColorSpriteToParent(bool) = mac 0x2fb470, win 0x0, ios 0x0; @@ -3091,7 +3091,9 @@ class GameObject : CCSpritePlus { int m_unk414; PAD = mac 0xc, win 0xc, android 0x0; cocos2d::CCPoint m_firstPosition; - PAD = mac 0x1c, win 0x1c, android 0x0; + PAD = mac 0x15, win 0x0, android 0x0; + bool m_isTriggerable; + PAD = mac 0x7, win 0x7, android 0x0; bool m_highDetail; ColorActionSprite* m_colorActionSpriteBase; ColorActionSprite* m_colorActionSpriteDetail; @@ -3869,7 +3871,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { void colorObject(int, cocos2d::_ccColor3B) = mac 0x77810, win 0x0, ios 0x0; void commitJumps() = mac 0x737e0, win 0x0, ios 0x0; static PlayLayer* create(GJGameLevel*) = mac 0x6b590, win 0x1fb6d0, ios 0x0; - void createCheckpoint() = mac 0x7e470, win 0x20b050, ios 0x0; + CheckpointObject* createCheckpoint() = mac 0x7e470, win 0x20b050, ios 0x0; void createObjectsFromSetup(gd::string) = mac 0x6d130, win 0x0, ios 0x0; void createParticle(int, char const*, int, cocos2d::tCCPositionType) = mac 0x76800, win 0x0, ios 0x0; void currencyWillExit(CurrencyRewardLayer*) = mac 0x7e070, win 0x0, ios 0x0; @@ -4009,7 +4011,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { int m_dontSaveRand; int m_dontSaveSeed; int unknown4d8; - bool unknown4dc; + bool m_debugPauseOff; bool m_shouldSmoothCamera; float unused_4e0; cocos2d::CCObject* unknown4e8; @@ -4018,7 +4020,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { float m_somegroup4f8; float m_groundRestriction; float m_ceilRestriction; - bool unknown504; + bool m_fullReset; bool unknown505; float unknown508; float unknown50c; @@ -4027,7 +4029,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { float unknown518; //PAD = mac 0x19, win 0x19, android 0x0; StartPosObject* m_startPos; - CheckpointObject* unk330; + CheckpointObject* m_startPosCheckpoint; EndPortalObject* m_endPortal; cocos2d::CCArray* m_checkpoints; cocos2d::CCArray* unk33C; @@ -4049,7 +4051,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { bool unk36A; bool unk36B; cocos2d::CCArray* m_screenRingObjects; - cocos2d::CCParticleSystemQuad* unk370; + cocos2d::CCParticleSystemQuad* m_particleSystem; cocos2d::CCDictionary* m_pickedUpItems; cocos2d::CCArray* m_circleWaves; cocos2d::CCArray* unk37C; @@ -4066,7 +4068,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { bool unknown5e4; int m_ballFrameSeed; float unknown5ec; - float unknown5f0; + float m_lockGroundToCamera; float unknown5f4; float m_levelLength; float m_realLevelLength; @@ -4116,7 +4118,7 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { float m_mirrorTransition; UILayer* m_UILayer; GJGameLevel* m_level; - cocos2d::CCPoint m_cameraPos; + cocos2d::CCPoint m_cameraPosition; bool m_isTestMode; bool m_isPracticeMode; bool unk496; @@ -4155,8 +4157,8 @@ class PlayLayer : GJBaseGameLayer, CCCircleWaveDelegate, DialogDelegate { bool m_hasGlitter; bool m_isBgEffectOff; bool unk52F; - GameObject* unk530; - bool unk534; + GameObject* m_antiCheatObject; + bool m_antiCheatPassed; bool unk535; bool m_disableGravityEffect; } @@ -4196,7 +4198,7 @@ class PlayerObject : GameObject, AnimatedSpriteDelegate { virtual void setFlipX(bool) = mac 0x22e720, win 0x1fa690, ios 0x0; virtual void setFlipY(bool) = mac 0x22e7b0, win 0x1fa740, ios 0x0; virtual void resetObject() = mac 0x223170, win 0x1eecd0, ios 0x0; - virtual void getRealPosition() = mac 0x22d5f0, win 0x1f7e20, ios 0x0; + virtual cocos2d::CCPoint getRealPosition() = mac 0x22d5f0, win 0x1f7e20, ios 0x0; virtual void getOrientedBox() = mac 0x22dee0, win 0x1f95d0, ios 0x0; virtual void animationFinished(char const*) = mac 0x22e9d0, win 0x0, ios 0x0; void activateStreak() = mac 0x21aef0, win 0x1f9080, ios 0x0; diff --git a/include/cocos/cocos2dx/particle_nodes/CCParticleSystem.h b/include/cocos/cocos2dx/particle_nodes/CCParticleSystem.h index 916c7552..88fb2638 100644 --- a/include/cocos/cocos2dx/particle_nodes/CCParticleSystem.h +++ b/include/cocos/cocos2dx/particle_nodes/CCParticleSystem.h @@ -235,8 +235,8 @@ protected: /** weak reference to the CCSpriteBatchNode that renders the CCSprite */ CC_PROPERTY(CCParticleBatchNode*, m_pBatchNode, BatchNode); - // index of system in batch node array - CC_SYNTHESIZE(unsigned int, m_uAtlasIndex, AtlasIndex); + // RobTop removed this + ///CC_SYNTHESIZE(unsigned int, m_uAtlasIndex, AtlasIndex); //true if scaled or rotated bool m_bTransformSystemDirty;