joybox 0.0.5 → 0.0.6

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionInterval.h

@@ -49,8 +49,8 @@ Example:
 */
 @interface CCActionInterval: CCFiniteTimeAction <NSCopying>
 {
-	ccTime	elapsed_;
-	BOOL	firstTick_;
+	ccTime	_elapsed;
+	BOOL	_firstTick;
 }
 
 /** how many seconds had elapsed since the actions started to run. */
@@ -70,13 +70,15 @@ Example:
  */
 @interface CCSequence : CCActionInterval <NSCopying>
 {
-	CCFiniteTimeAction *actions_[2];
-	ccTime split_;
-	int last_;
+	CCFiniteTimeAction *_actions[2];
+	ccTime _split;
+	int _last;
 }
-/** helper contructor to create an array of sequenceable actions */
+/** helper constructor to create an array of sequence-able actions */
 +(id) actions: (CCFiniteTimeAction*) action1, ... NS_REQUIRES_NIL_TERMINATION;
-/** helper contructor to create an array of sequenceable actions given an array */
+/** helper constructor to create an array of sequence-able actions */
++(id) actions: (CCFiniteTimeAction*) action1 vaList:(va_list) args;
+/** helper constructor to create an array of sequence-able actions given an array */
 +(id) actionWithArray: (NSArray*) arrayOfActions;
 /** creates the action */
 +(id) actionOne:(CCFiniteTimeAction*)actionOne two:(CCFiniteTimeAction*)actionTwo;
@@ -90,11 +92,11 @@ Example:
  */
 @interface CCRepeat : CCActionInterval <NSCopying>
 {
-	NSUInteger times_;
-	NSUInteger total_;
-	ccTime nextDt_;
-	BOOL isActionInstant_;
-	CCFiniteTimeAction *innerAction_;
+	NSUInteger _times;
+	NSUInteger _total;
+	ccTime _nextDt;
+	BOOL _isActionInstant;
+	CCFiniteTimeAction *_innerAction;
 }
 
 /** Inner action */
@@ -111,12 +113,14 @@ Example:
  */
 @interface CCSpawn : CCActionInterval <NSCopying>
 {
-	CCFiniteTimeAction *one_;
-	CCFiniteTimeAction *two_;
+	CCFiniteTimeAction *_one;
+	CCFiniteTimeAction *_two;
 }
 /** helper constructor to create an array of spawned actions */
 +(id) actions: (CCFiniteTimeAction*) action1, ... NS_REQUIRES_NIL_TERMINATION;
-/** helper contructor to create an array of spawned actions given an array */
+/** helper constructor to create an array of spawned actions */
++(id) actions: (CCFiniteTimeAction*) action1 vaList:(va_list)args;
+/** helper constructor to create an array of spawned actions given an array */
 +(id) actionWithArray: (NSArray*) arrayOfActions;
 /** creates the Spawn action */
 +(id) actionOne: (CCFiniteTimeAction*) one two:(CCFiniteTimeAction*) two;
@@ -130,54 +134,74 @@ Example:
 */
 @interface CCRotateTo : CCActionInterval <NSCopying>
 {
-	float dstAngle_;
-	float startAngle_;
-	float diffAngle_;
+	float _dstAngleX;
+	float _startAngleX;
+	float _diffAngleX;
+  
+	float _dstAngleY;
+	float _startAngleY;
+	float _diffAngleY;
 }
 /** creates the action */
 +(id) actionWithDuration:(ccTime)duration angle:(float)angle;
 /** initializes the action */
 -(id) initWithDuration:(ccTime)duration angle:(float)angle;
+
+/** creates the action with separate rotation angles */
++(id) actionWithDuration: (ccTime) t angleX:(float) aX angleY:(float) aY;
+-(id) initWithDuration: (ccTime) t angleX:(float) aX angleY:(float) aY;
 @end
 
-/** Rotates a CCNode object clockwise a number of degrees by modiying its rotation attribute.
+/** Rotates a CCNode object clockwise a number of degrees by modifying its rotation attribute.
 */
 @interface CCRotateBy : CCActionInterval <NSCopying>
 {
-	float angle_;
-	float startAngle_;
+	float _angleX;
+	float _startAngleX;
+	float _angleY;
+	float _startAngleY;
 }
 /** creates the action */
 +(id) actionWithDuration:(ccTime)duration angle:(float)deltaAngle;
 /** initializes the action */
 -(id) initWithDuration:(ccTime)duration angle:(float)deltaAngle;
+
+/** creates the action with separate rotation angles */
++(id) actionWithDuration: (ccTime) t angleX:(float) aX angleY:(float) aY;
+-(id) initWithDuration: (ccTime) t angleX:(float) aX angleY:(float) aY;
 @end
 
-/** Moves a CCNode object to the position x,y. x and y are absolute coordinates by modifying its position attribute.
-*/
-@interface CCMoveTo : CCActionInterval <NSCopying>
+/**  Moves a CCNode object x,y pixels by modifying it's position attribute.
+ x and y are relative to the position of the object.
+ Several CCMoveBy actions can be concurrently called, and the resulting
+ movement will be the sum of individual movements.
+ @since v2.1beta2-custom
+ */
+@interface CCMoveBy : CCActionInterval <NSCopying>
 {
-	CGPoint endPosition_;
-	CGPoint startPosition_;
-	CGPoint delta_;
+	CGPoint _positionDelta;
+	CGPoint _startPos;
+	CGPoint _previousPos;
 }
 /** creates the action */
-+(id) actionWithDuration:(ccTime)duration position:(CGPoint)position;
++(id) actionWithDuration: (ccTime)duration position:(CGPoint)deltaPosition;
 /** initializes the action */
--(id) initWithDuration:(ccTime)duration position:(CGPoint)position;
+-(id) initWithDuration: (ccTime)duration position:(CGPoint)deltaPosition;
 @end
 
-/**  Moves a CCNode object x,y pixels by modifying its position attribute.
- x and y are relative to the position of the object.
- Duration is is seconds.
-*/
-@interface CCMoveBy : CCMoveTo <NSCopying>
+/** Moves a CCNode object to the position x,y. x and y are absolute coordinates by modifying it's position attribute.
+ Several CCMoveTo actions can be concurrently called, and the resulting
+ movement will be the sum of individual movements.
+ @since v2.1beta2-custom
+ */
+@interface CCMoveTo : CCMoveBy
 {
+	CGPoint _endPosition;
 }
 /** creates the action */
-+(id) actionWithDuration: (ccTime)duration position:(CGPoint)deltaPosition;
++(id) actionWithDuration:(ccTime)duration position:(CGPoint)position;
 /** initializes the action */
--(id) initWithDuration: (ccTime)duration position:(CGPoint)deltaPosition;
+-(id) initWithDuration:(ccTime)duration position:(CGPoint)position;
 @end
 
 /** Skews a CCNode object to given angles by modifying its skewX and skewY attributes
@@ -185,18 +209,18 @@ Example:
  */
 @interface CCSkewTo : CCActionInterval <NSCopying>
 {
-	float skewX_;
-	float skewY_;
-	float startSkewX_;
-	float startSkewY_;
-	float endSkewX_;
-	float endSkewY_;
-	float deltaX_;
-	float deltaY_;
+	float _skewX;
+	float _skewY;
+	float _startSkewX;
+	float _startSkewY;
+	float _endSkewX;
+	float _endSkewY;
+	float _deltaX;
+	float _deltaY;
 }
 /** creates the action */
 +(id) actionWithDuration:(ccTime)t skewX:(float)sx skewY:(float)sy;
-/** initializes the action */
+/** initializes the action with duration, skew X and skew Y */
 -(id) initWithDuration:(ccTime)t skewX:(float)sx skewY:(float)sy;
 @end
 
@@ -206,16 +230,19 @@ Example:
 @interface CCSkewBy : CCSkewTo <NSCopying>
 {
 }
+/** initializes the action with duration, skew X and skew Y */
+-(id) initWithDuration:(ccTime)t skewX:(float)sx skewY:(float)sy;
 @end
 
 /** Moves a CCNode object simulating a parabolic jump movement by modifying its position attribute.
 */
- @interface CCJumpBy : CCActionInterval <NSCopying>
+@interface CCJumpBy : CCActionInterval <NSCopying>
 {
-	CGPoint startPosition_;
-	CGPoint delta_;
-	ccTime height_;
-	NSUInteger jumps_;
+	CGPoint _startPosition;
+	CGPoint _delta;
+	ccTime	_height;
+	NSUInteger _jumps;
+	CGPoint _previousPos;
 }
 /** creates the action */
 +(id) actionWithDuration: (ccTime)duration position:(CGPoint)position height:(ccTime)height jumps:(NSUInteger)jumps;
@@ -225,9 +252,11 @@ Example:
 
 /** Moves a CCNode object to a parabolic position simulating a jump movement by modifying its position attribute.
 */
- @interface CCJumpTo : CCJumpBy <NSCopying>
+@interface CCJumpTo : CCJumpBy <NSCopying>
 {
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) startWithTarget:(CCNode *)aTarget;
 @end
 
 /** bezier configuration structure
@@ -245,8 +274,9 @@ typedef struct _ccBezierConfig {
  */
 @interface CCBezierBy : CCActionInterval <NSCopying>
 {
-	ccBezierConfig config_;
-	CGPoint startPosition_;
+	ccBezierConfig _config;
+	CGPoint _startPosition;
+	CGPoint _previousPosition;
 }
 
 /** creates the action with a duration and a bezier configuration */
@@ -261,7 +291,10 @@ typedef struct _ccBezierConfig {
  */
 @interface CCBezierTo : CCBezierBy
 {
+	ccBezierConfig _toConfig;
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) startWithTarget:(CCNode *)aTarget;
 @end
 
 /** Scales a CCNode object to a zoom factor by modifying its scale attribute.
@@ -269,14 +302,14 @@ typedef struct _ccBezierConfig {
  */
 @interface CCScaleTo : CCActionInterval <NSCopying>
 {
-	float scaleX_;
-	float scaleY_;
-	float startScaleX_;
-	float startScaleY_;
-	float endScaleX_;
-	float endScaleY_;
-	float deltaX_;
-	float deltaY_;
+	float _scaleX;
+	float _scaleY;
+	float _startScaleX;
+	float _startScaleY;
+	float _endScaleX;
+	float _endScaleY;
+	float _deltaX;
+	float _deltaY;
 }
 /** creates the action with the same scale factor for X and Y */
 +(id) actionWithDuration: (ccTime)duration scale:(float) s;
@@ -293,17 +326,20 @@ typedef struct _ccBezierConfig {
 @interface CCScaleBy : CCScaleTo <NSCopying>
 {
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) startWithTarget:(CCNode *)aTarget;
 @end
 
 /** Blinks a CCNode object by modifying its visible attribute
 */
 @interface CCBlink : CCActionInterval <NSCopying>
 {
-	NSUInteger times_;
+	NSUInteger _times;
+	BOOL _originalState;
 }
 /** creates the action */
 +(id) actionWithDuration: (ccTime)duration blinks:(NSUInteger)blinks;
-/** initilizes the action */
+/** initializes the action */
 -(id) initWithDuration: (ccTime)duration blinks:(NSUInteger)blinks;
 @end
 
@@ -313,6 +349,8 @@ typedef struct _ccBezierConfig {
 @interface CCFadeIn : CCActionInterval <NSCopying>
 {
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) update:(ccTime)dt;
 @end
 
 /** Fades Out an object that implements the CCRGBAProtocol protocol. It modifies the opacity from 255 to 0.
@@ -321,6 +359,8 @@ typedef struct _ccBezierConfig {
 @interface CCFadeOut : CCActionInterval <NSCopying>
 {
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) update:(ccTime)dt;
 @end
 
 /** Fades an object that implements the CCRGBAProtocol protocol. It modifies the opacity from the current value to a custom one.
@@ -328,10 +368,10 @@ typedef struct _ccBezierConfig {
  */
 @interface CCFadeTo : CCActionInterval <NSCopying>
 {
-	GLubyte toOpacity_;
-	GLubyte fromOpacity_;
+	GLubyte _toOpacity;
+	GLubyte _fromOpacity;
 }
-/** creates an action with duration and opactiy */
+/** creates an action with duration and opacity */
 +(id) actionWithDuration:(ccTime)duration opacity:(GLubyte)opactiy;
 /** initializes the action with duration and opacity */
 -(id) initWithDuration:(ccTime)duration opacity:(GLubyte)opacity;
@@ -343,8 +383,8 @@ typedef struct _ccBezierConfig {
 */
 @interface CCTintTo : CCActionInterval <NSCopying>
 {
-	ccColor3B to_;
-	ccColor3B from_;
+	ccColor3B _to;
+	ccColor3B _from;
 }
 /** creates an action with duration and color */
 +(id) actionWithDuration:(ccTime)duration red:(GLubyte)red green:(GLubyte)green blue:(GLubyte)blue;
@@ -357,8 +397,8 @@ typedef struct _ccBezierConfig {
  */
 @interface CCTintBy : CCActionInterval <NSCopying>
 {
-	GLshort deltaR_, deltaG_, deltaB_;
-	GLshort fromR_, fromG_, fromB_;
+	GLshort _deltaR, _deltaG, _deltaB;
+	GLshort _fromR, _fromG, _fromB;
 }
 /** creates an action with duration and color */
 +(id) actionWithDuration:(ccTime)duration red:(GLshort)deltaRed green:(GLshort)deltaGreen blue:(GLshort)deltaBlue;
@@ -371,18 +411,20 @@ typedef struct _ccBezierConfig {
 @interface CCDelayTime : CCActionInterval <NSCopying>
 {
 }
+// XXX: Added to prevent bug on BridgeSupport
+-(void) update:(ccTime)dt;
 @end
 
 /** Executes an action in reverse order, from time=duration to time=0
 
  @warning Use this action carefully. This action is not
- sequenceable. Use it as the default "reversed" method
+ sequence-able. Use it as the default "reversed" method
  of your own actions, but using it outside the "reversed"
  scope is not recommended.
 */
 @interface CCReverseTime : CCActionInterval <NSCopying>
 {
-	CCFiniteTimeAction * other_;
+	CCFiniteTimeAction * _other;
 }
 /** creates the action */
 +(id) actionWithAction: (CCFiniteTimeAction*) action;
@@ -396,18 +438,18 @@ typedef struct _ccBezierConfig {
 /** Animates a sprite given the name of an Animation */
 @interface CCAnimate : CCActionInterval <NSCopying>
 {
-	NSMutableArray		*splitTimes_;
-	NSInteger			nextFrame_;
-	CCAnimation			*animation_;
-	id					origFrame_;
-	NSUInteger			executedLoops_;
+	NSMutableArray		*_splitTimes;
+	NSInteger			_nextFrame;
+	CCAnimation			*_animation;
+	id					_origFrame;
+	NSUInteger			_executedLoops;
 }
-/** animation used for the animage */
+/** animation used for the image */
 @property (readwrite,nonatomic,retain) CCAnimation * animation;
 
 /** creates the action with an Animation and will restore the original frame when the animation is over */
 +(id) actionWithAnimation:(CCAnimation*)animation;
-/** initializes the action with an Animation and will restore the original frame when the animtion is over */
+/** initializes the action with an Animation and will restore the original frame when the animation is over */
 -(id) initWithAnimation:(CCAnimation*)animation;
 @end
 
@@ -416,8 +458,8 @@ typedef struct _ccBezierConfig {
  */
 @interface CCTargetedAction : CCActionInterval <NSCopying>
 {
-	id forcedTarget_;
-	CCFiniteTimeAction* action_;
+	id _forcedTarget;
+	CCFiniteTimeAction* _action;
 }
 /** This is the target that the action will be forced to run with */
 @property(readwrite,nonatomic,retain) id forcedTarget;

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionManager.h

@@ -47,7 +47,7 @@ typedef struct _hashElement
 
 /** CCActionManager the object that manages all the actions.
  Normally you won't need to use this API directly. 99% of the cases you will use the CCNode interface, which uses this object.
- But there are some cases where you might need to use this API dirctly:
+ But there are some cases where you might need to use this API directly:
  Examples:
 	- When you want to run an action where the target is different from a CCNode.
 	- When you want to pause / resume the actions
@@ -70,7 +70,7 @@ typedef struct _hashElement
  When the target is paused, the queued actions won't be 'ticked'.
  */
 -(void) addAction: (CCAction*) action target:(id)target paused:(BOOL)paused;
-/** Removes all actions from all the targers.
+/** Removes all actions from all the targets.
  */
 -(void) removeAllActions;
 

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionPageTurn3D.h

@@ -38,5 +38,6 @@
 @interface CCPageTurn3D : CCGrid3DAction
 {
 }
-
+// XXX: To make BridgeSupport happy
+-(void)update:(ccTime)time;
 @end

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionProgressTimer.h

@@ -34,8 +34,8 @@
 */
 @interface CCProgressTo : CCActionInterval <NSCopying>
 {
-	float to_;
-	float from_;
+	float _to;
+	float _from;
 }
 /** Creates and initializes with a duration and a percent */
 +(id) actionWithDuration:(ccTime)duration percent:(float)percent;
@@ -49,8 +49,8 @@
  */
 @interface CCProgressFromTo : CCActionInterval <NSCopying>
 {
-	float to_;
-	float from_;
+	float _to;
+	float _from;
 }
 /** Creates and initializes the action with a duration, a "from" percentage and a "to" percentage */
 +(id) actionWithDuration:(ccTime)duration from:(float)fromPercentage to:(float) toPercentage;

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionTiledGrid.h

@@ -28,14 +28,14 @@
 /** CCShakyTiles3D action */
 @interface CCShakyTiles3D : CCTiledGrid3DAction
 {
-	int		randrange;
-	BOOL	shakeZ;
+	int		_randrange;
+	BOOL	_shakeZ;
 }
 
 /** creates the action with a range, whether or not to shake Z vertices, a grid size, and duration */
-+(id)actionWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shakeZ:(BOOL)shakeZ;
 /** initializes the action with a range, whether or not to shake Z vertices, a grid size, and duration */
--(id)initWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shakeZ:(BOOL)shakeZ;
 
 @end
 
@@ -44,15 +44,15 @@
 /** CCShatteredTiles3D action */
 @interface CCShatteredTiles3D : CCTiledGrid3DAction
 {
-	int		randrange;
-	BOOL	once;
-	BOOL	shatterZ;
+	int		_randrange;
+	BOOL	_once;
+	BOOL	_shatterZ;
 }
 
 /** creates the action with a range, whether of not to shatter Z vertices, a grid size and duration */
-+(id)actionWithRange:(int)range shatterZ:(BOOL)shatterZ grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shatterZ:(BOOL)shatterZ;
 /** initializes the action with a range, whether or not to shatter Z vertices, a grid size and duration */
--(id)initWithRange:(int)range shatterZ:(BOOL)shatterZ grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize range:(int)range shatterZ:(BOOL)shatterZ;
 
 @end
 
@@ -63,16 +63,16 @@
  */
 @interface CCShuffleTiles : CCTiledGrid3DAction
 {
-	int	seed;
-	NSUInteger tilesCount;
-	int *tilesOrder;
-	void *tiles;
+	unsigned	_seed;
+	NSUInteger _tilesCount;
+	NSUInteger *_tilesOrder;
+	void *_tiles;
 }
 
 /** creates the action with a random seed, the grid size and the duration */
-+(id)actionWithSeed:(int)s grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize seed:(unsigned)seed;
 /** initializes the action with a random seed, the grid size and the duration */
--(id)initWithSeed:(int)s grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize seed:(unsigned)seed;
 
 @end
 
@@ -84,6 +84,8 @@
 @interface CCFadeOutTRTiles : CCTiledGrid3DAction
 {
 }
+// XXX: private, but added to make BridgeSupport happy
+-(float)testFunc:(CGSize)pos time:(ccTime)time;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -94,6 +96,8 @@
 @interface CCFadeOutBLTiles : CCFadeOutTRTiles
 {
 }
+// XXX: private, but added to make BridgeSupport happy
+-(float)testFunc:(CGSize)pos time:(ccTime)time;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -104,6 +108,8 @@
 @interface CCFadeOutUpTiles : CCFadeOutTRTiles
 {
 }
+// XXX: private, but added to make BridgeSupport happy
+-(float)testFunc:(CGSize)pos time:(ccTime)time;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -114,6 +120,8 @@
 @interface CCFadeOutDownTiles : CCFadeOutUpTiles
 {
 }
+// XXX: private, but added to make BridgeSupport happy
+-(float)testFunc:(CGSize)pos time:(ccTime)time;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -123,15 +131,15 @@
  */
 @interface CCTurnOffTiles : CCTiledGrid3DAction
 {
-	int	seed;
-	NSUInteger tilesCount;
-	int *tilesOrder;
+	unsigned	_seed;
+	NSUInteger _tilesCount;
+	NSUInteger *_tilesOrder;
 }
 
 /** creates the action with a random seed, the grid size and the duration */
-+(id)actionWithSeed:(int)s grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize seed:(unsigned)seed;
 /** initializes the action with a random seed, the grid size and the duration */
--(id)initWithSeed:(int)s grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize seed:(unsigned)seed;
 @end
 
 ////////////////////////////////////////////////////////////
@@ -139,9 +147,9 @@
 /** CCWavesTiles3D action. */
 @interface CCWavesTiles3D : CCTiledGrid3DAction
 {
-	int waves;
-	float amplitude;
-	float amplitudeRate;
+	NSUInteger _waves;
+	float _amplitude;
+	float _amplitudeRate;
 }
 
 /** waves amplitude */
@@ -150,9 +158,9 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** creates the action with a number of waves, the waves amplitude, the grid size and the duration */
-+(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
 /** initializes the action with a number of waves, the waves amplitude, the grid size and the duration */
--(id)initWithWaves:(int)wav amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize waves:(NSUInteger)wav amplitude:(float)amp;
 
 @end
 
@@ -163,9 +171,9 @@
  */
 @interface CCJumpTiles3D : CCTiledGrid3DAction
 {
-	int jumps;
-	float amplitude;
-	float amplitudeRate;
+	NSUInteger _jumps;
+	float _amplitude;
+	float _amplitudeRate;
 }
 
 /** amplitude of the sin*/
@@ -174,9 +182,9 @@
 @property (nonatomic,readwrite) float amplitudeRate;
 
 /** creates the action with the number of jumps, the sin amplitude, the grid size and the duration */
-+(id)actionWithJumps:(int)j amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
++(id)actionWithDuration:(ccTime)duration size:(CGSize)gridSize jumps:(NSUInteger)numberOfJumps amplitude:(float)amplitude;
 /** initializes the action with the number of jumps, the sin amplitude, the grid size and the duration */
--(id)initWithJumps:(int)j amplitude:(float)amp grid:(ccGridSize)gridSize duration:(ccTime)d;
+-(id)initWithDuration:(ccTime)duration size:(CGSize)gridSize jumps:(NSUInteger)numberOfJumps amplitude:(float)amplitude;
 
 @end
 
@@ -185,13 +193,13 @@
 /** CCSplitRows action */
 @interface CCSplitRows : CCTiledGrid3DAction
 {
-	int		rows;
-	CGSize	winSize;
+	NSUInteger	_rows;
+	CGSize	_winSize;
 }
 /** creates the action with the number of rows to split and the duration */
-+(id)actionWithRows:(int)rows duration:(ccTime)duration;
++(id)actionWithDuration:(ccTime)duration rows:(NSUInteger)rows;
 /** initializes the action with the number of rows to split and the duration */
--(id)initWithRows:(int)rows duration:(ccTime)duration;
+-(id)initWithDuration:(ccTime)duration rows:(NSUInteger)rows;
 
 @end
 
@@ -200,12 +208,12 @@
 /** CCSplitCols action */
 @interface CCSplitCols : CCTiledGrid3DAction
 {
-	int		cols;
-	CGSize	winSize;
+	NSUInteger	_cols;
+	CGSize	_winSize;
 }
 /** creates the action with the number of columns to split and the duration */
-+(id)actionWithCols:(int)cols duration:(ccTime)duration;
++(id)actionWithDuration:(ccTime)duration cols:(NSUInteger)cols;
 /** initializes the action with the number of columns to split and the duration */
--(id)initWithCols:(int)cols duration:(ccTime)duration;
+-(id)initWithDuration:(ccTime)duration cols:(NSUInteger)cols;
 
 @end

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCActionTween.h

@@ -47,10 +47,10 @@
  */
 @interface CCActionTween : CCActionInterval
 {
-	NSString		*key_;
+	NSString		*_key;
 
-	float			from_, to_;
-	float			delta_;
+	float			_from, _to;
+	float			_delta;
 }
 
 /** creates an initializes the action with the property name (key), and the from and to parameters. */