fix main cocos headers

loader/include/Geode/cocos/base_nodes/CCNode.h

@@ -1627,7 +1627,8 @@ protected:
     
     CCGridBase *m_pGrid;                ///< a grid
     
-    int m_nZOrder;                      ///< z-order value that affects the draw order
+    // 2.2 additions
+    RT_REMOVE(  int m_nZOrder; )                     ///< z-order value that affects the draw order
     
     CCArray *m_pChildren;               ///< array of children nodes
     CCNode *m_pParent;                  ///< weak reference to parent node
@@ -1641,7 +1642,8 @@ protected:
     
     ccGLServerState m_eGLServerState;   ///< OpenGL servier side state
     
-    unsigned int m_uOrderOfArrival;     ///< used to preserve sequence while sorting children with the same zOrder
+    // 2.2 additions
+    RT_REMOVE( unsigned int m_uOrderOfArrival; )     ///< used to preserve sequence while sorting children with the same zOrder
     
     CCScheduler *m_pScheduler;          ///< scheduler used to schedule timers and updates
     
@@ -1652,6 +1654,10 @@ protected:
     bool m_bTransformDirty;             ///< transform dirty flag
     bool m_bInverseDirty;               ///< transform dirty flag
     bool m_bAdditionalTransformDirty;   ///< The flag to check whether the additional transform is dirty
+
+    // 2.2 additions
+    PAD(10); // i dont know if this is related to transform at all, but its here
+    
     bool m_bVisible;                    ///< is this node visible
     
     bool m_bIgnoreAnchorPointForPosition; ///< true if the Anchor Point will be (0,0) when you position the CCNode, false otherwise.
@@ -1665,6 +1671,9 @@ protected:
     
     CCComponentContainer *m_pComponentContainer;        ///< Dictionary of components
 
+    // 2.2 additions
+    int m_unknown;  // no idea
+
 };
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)

loader/include/Geode/cocos/cocoa/CCObject.h

@@ -107,7 +107,16 @@ protected:
     unsigned int        m_uAutoReleaseCount;
 
     CCObjectType m_eObjType;
-    int m_nUnknown;
+
+    int m_uIndexInArray; // used in some ccarray stuff, I don't remember what it does rn
+
+    // 2.2 additions
+
+    int m_uUnknown; // -1 by default
+    int m_nZOrder; // moved from CCNode, why rob
+    int m_uOrderOfArrival; // moved from CCNode, why rob
+    int m_unknown4;
+    int m_unknown5;
 public:
 	GEODE_CUSTOM_CONSTRUCTOR_BEGIN(CCObject)
     CCObject(void);

loader/include/Geode/cocos/layers_scenes_transitions_nodes/CCLayer.h

@@ -207,6 +207,9 @@ private:
     
     int m_nTouchPriority;
     ccTouchesMode m_eTouchMode;
+
+    // 2.2 additions
+    int m_unknown; // no idea
     
     int  excuteScriptTouchHandler(int nEventType, CCTouch *pTouch);
     int  excuteScriptTouchHandler(int nEventType, CCSet *pTouches);

loader/include/Geode/cocos/menu_nodes/CCMenuItem.h

@@ -115,6 +115,9 @@ public:
     CCObject*       m_pListener;
     SEL_MenuHandler m_pfnSelector;
     int             m_nScriptTapHandler;
+
+    // 2.2 additions
+    int m_unknown;
 };
 
 /** @brief An abstract class for "label" CCMenuItemLabel items 

loader/include/Geode/cocos/sprite_nodes/CCSprite.h

@@ -569,7 +569,8 @@ protected:
         CC_SYNTHESIZE_NV(float, m_fBrVertexMod, BrVertexMod);
         PAD(16);
         bool m_bUnknown;
-        int m_nUnknown;
+        // 2.2 additions
+        // int m_nUnknown;
     )
 };
 

loader/test/members/Android.cpp

@@ -6,6 +6,8 @@ using namespace geode::prelude;
 
 // Add known android struct members here
 
+GEODE_MEMBER_CHECK(CCMenuItemSprite, m_pfnSelector, 0x11c);
+
 GEODE_SIZE_CHECK(CCObject, 0x34);
 GEODE_SIZE_CHECK(CCNode, 0x108);
 GEODE_SIZE_CHECK(CCNodeRGBA, 0x118);