joybox 0.0.5 → 0.0.6

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms/iOS}/CCTouchHandler.h

@@ -43,9 +43,9 @@
  Object than contains the delegate and priority of the event handler.
 */
 @interface CCTouchHandler : NSObject {
-	id				delegate;
-	int				priority;
-	ccTouchSelectorFlag		enabledSelectors_;
+	id				_delegate;
+	int				_priority;
+	ccTouchSelectorFlag		_enabledSelectors;
 }
 
 /** delegate */
@@ -62,7 +62,7 @@
 @end
 
 /** CCStandardTouchHandler
- It forwardes each event to the delegate.
+ It forwards each event to the delegate.
  */
 @interface CCStandardTouchHandler : CCTouchHandler
 {
@@ -71,12 +71,12 @@
 
 /**
  CCTargetedTouchHandler
- Object than contains the claimed touches and if it swallos touches.
+ Object than contains the claimed touches and if it swallows touches.
  Used internally by TouchDispatcher
  */
 @interface CCTargetedTouchHandler : CCTouchHandler {
-	BOOL swallowsTouches;
-	NSMutableSet *claimedTouches;
+	BOOL _swallowsTouches;
+	NSMutableSet *_claimedTouches;
 }
 /** whether or not the touches are swallowed */
 @property(nonatomic, readwrite) BOOL swallowsTouches; // default NO

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

@@ -33,7 +33,7 @@
 
 
 /** @def CCARRAY_FOREACH
- A convience macro to iterate over a CCArray using. It is faster than the "fast enumeration" interface.
+ A convenience macro to iterate over a CCArray using. It is faster than the "fast enumeration" interface.
  @since v0.99.4
  */
 

data/vendor/vendor-ios/cocos_2d/include/Support/CCFileUtils.h

@@ -0,0 +1,394 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2008-2010 Ricardo Quesada
+ * Copyright (c) 2011 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+
+#import <Foundation/Foundation.h>
+#import "../ccTypes.h"
+
+// keys used for the suffix or directory dictionaries
+extern NSString const *kCCFileUtilsDefault;
+extern NSString const *kCCFileUtilsiPad;
+extern NSString const *kCCFileUtilsiPadHD;
+extern NSString const *kCCFileUtilsiPhone;
+extern NSString const *kCCFileUtilsiPhoneHD;
+extern NSString const *kCCFileUtilsiPhone5;
+extern NSString const *kCCFileUtilsiPhone5HD;
+extern NSString const *kCCFileUtilsMac;
+extern NSString const *kCCFileUtilsMacHD;
+
+extern NSString const *kCCFileUtilsDefaultSearchPath;
+
+enum {
+	kCCFileUtilsSearchSuffixMode,
+	kCCFileUtilsSearchDirectoryMode,
+};
+
+
+/** Helper class to handle file operations */
+@interface CCFileUtils : NSObject
+{
+	NSFileManager		*_fileManager;
+	NSBundle			*_bundle;
+
+	NSMutableDictionary *_fullPathCache;
+	NSMutableDictionary *_fullPathNoResolutionsCache;
+	NSMutableDictionary *_removeSuffixCache;
+	
+	NSMutableDictionary	*_directoriesDict;
+	NSMutableDictionary	*_suffixesDict;
+	
+	NSMutableDictionary	*_filenameLookup;
+	
+	NSMutableArray		*_searchResolutionsOrder;
+	NSMutableArray		*_searchPath;
+	
+	// it could be suffix (default) or directory
+	int					_searchMode;
+	
+	BOOL				_enableiPhoneResourcesOniPad;
+}
+
+/** NSBundle used by CCFileUtils. By default it uses [NSBundle mainBundle].
+ @since v2.0
+ */
+@property (nonatomic, readwrite, retain) NSBundle	*bundle;
+
+/** NSFileManager used by CCFileUtils. By default it uses its own instance.
+ @since v2.0
+ */
+@property (nonatomic, readwrite, retain) NSFileManager	*fileManager;
+
+/** Whether of not the fallback suffixes is enabled.
+ When enabled it will try to search for the following suffixes in the following order until one is found:
+ * On iPad HD  : iPad HD, iPad, iPhone HD, Resources without resolution
+ * On iPad     : iPad, iPhone HD, Resources without resolution
+ * On iPhone HD: iPhone HD, Resources without resolution
+ * On Mac HD   : Mac HD, Mac, Resources without resolution
+ * On Mac      : Mac, Resources without resolution
+ 
+ By default this functionality is off;
+ */
+@property (nonatomic, readwrite, getter = isEnablediPhoneResourcesOniPad) BOOL enableiPhoneResourcesOniPad;
+
+/** Dictionary that contians the search directories for the different devices. Default values:
+ - iPhone: "resources-iphone"
+ - iPhone HD: "resources-hd"
+ - iPhone5 : "resources-wide"
+ - iPhone5 HD: "resources-widehd"
+ - iPad: "resources-ipad"
+ - iPad HD: "resources-ipadhd"
+ - Mac: "resources-mac"
+ - Mac HD: "resources-machd"
+ 
+ If "search in directories" is enabled (disabled by default), it will try to get the resources from the directories according to the order of "searchResolutionsOrder" array.
+ @since v2.1
+ */
+@property (nonatomic, copy) NSMutableDictionary *directoriesDict;
+
+/** Dictionary that contians the suffix for the different devices. Default values:
+	- iPhone: ""
+	- iPhone HD: "-hd"
+	- iPhone5 : "-wide"
+	- iPhone5 HD: "-widehd"
+	- iPad: "-ipad"
+	- iPad HD: "-ipadhd"
+	- Mac: ""
+	- Mac HD: "-machd"
+
+  If "search with suffixes" is enabled (enabled by default), it will try to get the resources by appending the suffixes according to the order of "searchResolutionsOrder" array.
+ @since v2.1
+ */
+@property (nonatomic, copy) NSMutableDictionary *suffixesDict;
+
+/** Array that contains the search order of the resources based for the device.
+ By default it will try to load resources in the following order until one is found:
+   - On iPad HD: iPad HD resources, iPad resources, resources not associated with any device
+   - On iPad: iPad resources, resources not associated with any device
+   - On iPhone 5 HD: iPhone 5 HD resources, iPhone HD resouces, iPhone 5 resources, iPhone resources, resources not associated with any device
+   - On iPhone HD: iPhone HD resources, iPhone resouces, resources not associated with any device
+   - On iPhone: iPhone resources, resources not associated with any device
+
+   - On Mac HD: Mac HD resources, Mac resources, resources not associated with any device
+   - On Mac: Mac resources, resources not associated with any device
+ 
+ If the property "enableiPhoneResourcesOniPad" is enabled, it will also search for iPhone resources if you are in an iPad.
+ 
+ @since v2.1
+ */
+@property (nonatomic, copy) NSArray *searchResolutionsOrder;
+
+/** Array of search paths.
+ You can use this array to modify the search path of the resources.
+ If you want to use "themes" or search resources in the "cache", you can do it easily by adding new entries in this array.
+ 
+ By default it is an array with only the "" (empty string) element.
+ 
+ @since v2.1
+ */
+@property (nonatomic, copy) NSArray *searchPath;
+
+
+/**  It determines how the "resolution resources"  are to be searched.
+ Possible values:
+	- kCCFileUtilsSearchSuffix: It will search for resources by appending suffixes like "-hd", "-ipad", etc...
+	- kCCFileUtilsSearchDirectory: It will search the resoureces in subdirectories like "resources-hd", "resources-ipad", etc...
+ 
+ Default: kCCFileUtilsSearchSuffix
+ @since v2.1
+ */
+@property (nonatomic, readwrite) int searchMode;
+
+/** Dictionary used to lookup filenames based on a key.
+ It is used internally by the following methods:
+
+  *	-(NSString*) fullPathForFilename:(NSString*)key resolutionType:(ccResolutionType*)resolutionType;
+  *	-(NSString*) fullPathForFilenameIgnoringResolutions:(NSString*)key;
+
+ @since v2.1
+ */
+@property (nonatomic, readwrite, copy) NSMutableDictionary *filenameLookup;
+
+#ifdef __CC_PLATFORM_IOS
+/** The iPhone RetinaDisplay suffixes to load resources.
+ By default it is "-hd" and "" in that order.
+ Only valid on iOS. Not valid for OS X.
+ 
+ @since v1.1
+ */
+-(void) setiPhoneRetinaDisplaySuffix:(NSString*)iPhoneRetinaDisplaySuffix;
+
+/** The iPad suffixes to load resources.
+ By default it is "-ipad", "-hd", "", in that order.
+ Only valid on iOS. Not valid for OS X.
+ 
+ @since v1.1
+ */
+-(void) setiPadSuffix:(NSString*) iPadSuffix;
+
+
+/** Sets the iPad Retina Display suffixes to load resources.
+ By default it is "-ipadhd", "-ipad", "-hd", "", in that order.
+ Only valid on iOS. Not valid for OS X.
+ 
+ @since v2.0
+ */
+-(void)setiPadRetinaDisplaySuffix:(NSString*)iPadRetinaDisplaySuffix;
+
+#endif // __CC_PLATFORM_IOS
+
+
+/** returns the shared file utils instance */
++(CCFileUtils*) sharedFileUtils;
+
+
+/** Purge cached entries.
+ Will be called automatically by the Director when a memory warning is received
+ */
+-(void) purgeCachedEntries;
+
+/** Calling this method will populate the searchResolutionsOrder property depending on the current device.
+ 
+ @since v2.1
+ */
+- (void) buildSearchResolutionsOrder;
+
+/** Returns the fullpath of an filename.
+
+ If in iPhoneRetinaDisplay mode, and a RetinaDisplay file is found, it will return that path.
+ If in iPad mode, and an iPad file is found, it will return that path.
+ 
+ If the filename can't be found, it will return "relPath" instead of nil.
+
+ Examples:
+
+  * In iPad mode: "image.png" -> "/full/path/image-ipad.png" (in case the -ipad file exists)
+  * In iPhone RetinaDisplay mode: "image.png" -> "/full/path/image-hd.png" (in case the -hd file exists)
+  * In iPad RetinaDisplay mode: "image.png" -> "/full/path/image-ipadhd.png" (in case the -ipadhd file exists)
+
+ */
+-(NSString*) fullPathFromRelativePath:(NSString*) relPath;
+
+/** Returns the fullpath of an filename. It will try to get the correct file for the current screen resolution.
+ Useful for loading images and other assets that are related for the screen resolution.
+ 
+ If in iPad mode, and an iPad file is found, it will return that path.
+ If in iPhoneRetinaDisplay mode, and a RetinaDisplay file is found, it will return that path. But if it is not found, it will try load an iPhone Non-RetinaDisplay  file.
+
+ If the filename can't be found, it will return "relPath" instead of nil.
+
+ Examples:
+ 
+ * In iPad mode: "image.png" -> "/full/path/image-ipad.png" (in case the -ipad file exists)
+ * In iPhone RetinaDisplay mode: "image.png" -> "/full/path/image-hd.png" (in case the -hd file exists)
+ * In iPad RetinaDisplay mode: "image.png" -> "/full/path/image-ipadhd.png" (in case the -ipadhd file exists)
+ 
+ */
+-(NSString*) fullPathFromRelativePath:(NSString*)relPath resolutionType:(ccResolutionType*)resolutionType;
+
+/** Returns the fullpath of an filename without taking into account the screen resolution suffixes or directories.
+
+ It will use the "searchPath" though.
+ If the file can't be found, it will return nil.
+
+ Useful for loading music files, shaders, "data" and other files that are not related to the screen resolution of the device.
+ 
+ @since v2.1
+ */
+-(NSString*) fullPathFromRelativePathIgnoringResolutions:(NSString*)relPath;
+
+/** Returns the fullpath for a given filename.
+ 
+ First it will try to get a new filename from the "filenameLookup" dictionary. If a new filename can't be found on the dictionary, it will use the original filename.
+ Then it will try obtain the full path of the filename using the CCFileUtils search rules: resolutions, and search paths
+ 
+ If in iPad mode, and an iPad file is found, it will return that path.
+ If in iPhoneRetinaDisplay mode, and a RetinaDisplay file is found, it will return that path. But if it is not found, it will try load an iPhone Non-RetinaDisplay  file.
+ 
+ If the filename can't be found on the file system, it will return nil.
+ 
+ This method was added to simplify multiplatform support. Whether you are using cocos2d-js or any cross-compilation toolchain like StellaSDK or Apportable,
+ you might need to load differerent resources for a given file in the different platforms.
+ 
+ Examples:
+ 
+ * In iPad mode: "image.png" -> "image.pvr" -> "/full/path/image-ipad.pvr" (in case the -ipad file exists)
+ * In Android: "image.png" -> "image.png" -> "/full/path/image.png"
+ 
+ @since v2.1
+ */
+-(NSString*) fullPathForFilename:(NSString*)filename;
+
+/** Returns the fullpath for a given filename.
+ 
+ First it will try to get a new filename from the "filenameLookup" dictionary. If a new filename can't be found on the dictionary, it will use the original filename.
+ Then it will try obtain the full path of the filename using the CCFileUtils search rules: resolutions, and search paths
+ 
+ If in iPad mode, and an iPad file is found, it will return that path.
+ If in iPhoneRetinaDisplay mode, and a RetinaDisplay file is found, it will return that path. But if it is not found, it will try load an iPhone Non-RetinaDisplay  file.
+ 
+ If the filename can't be found on the file system, it will return nil.
+ 
+ This method was added to simplify multiplatform support. Whether you are using cocos2d-js or any cross-compilation toolchain like StellaSDK or Apportable,
+ you might need to load differerent resources for a given file in the different platforms.
+ 
+ Examples:
+ 
+ * In iPad mode: "image.png" -> "image.pvr" -> "/full/path/image-ipad.pvr" (in case the -ipad file exists)
+ * In Android: "image.png" -> "image.png" -> "/full/path/image.png"
+ 
+ @since v2.1
+ */
+-(NSString*) fullPathForFilename:(NSString*)filename resolutionType:(ccResolutionType*)resolutionType;
+
+/** Returns the fullpath for a given filename, without taking into account device resolution.
+ 
+ It will try to get a new filename from the "filenameLookup" dictionary. If a new filename can't be found on the dictionary, it will use the original filename.
+ 
+ Once it gets the filename, it will try to get the fullpath for the filename, using the "searchPath", but it won't use any resolution search rules.
+ If the file can't be found, it will return nil.
+ 
+ Useful for loading music files, shaders, "data" and other files that are not related to the screen resolution of the device.
+ 
+ This method was added to simplify multiplatform support. Whether you are using cocos2d-js or any cross-compilation toolchain like StellaSDK or Apportable,
+ you might need to load differerent resources for a given file in the different platforms.
+
+ Examples:
+ 
+ * On iOS: "sound.wav" -> "sound.caf" -> "/full/path/sound.caf" (in case the key dictionary says that "sound.wav" should be converted to "sound.caf")
+ * On Android: "sound.wav" -> "sound.wav" -> "/full/path/sound.caf" (in case the key dictionary says that "sound.wav" should be converted to "sound.caf")
+
+ 
+ @since v2.1
+ */
+-(NSString*) fullPathForFilenameIgnoringResolutions:(NSString*)key;
+
+/* Loads the filenameLookup dictionary from the contents of a filename.
+ 
+ @since v2.1
+ */
+-(void) loadFilenameLookupDictionaryFromFile:(NSString*)filename;
+
+/** removes the suffix from a path
+ * On iPhone RetinaDisplay it will remove the -hd suffix
+ * On iPad it will remove the -ipad suffix
+ * On iPad RetinaDisplay it will remove the -ipadhd suffix
+ 
+ @since v0.99.5
+ */
+-(NSString *)removeSuffixFromFile:(NSString*) path;
+
+/* Stadarize a path.
+ 
+ It calls [string stringByStandardizingPath], and if "suffix mode" is on, it will also call [self removeSuffixFromFile:path];
+ 
+ @since v2.1
+ */
+-(NSString*) standarizePath:(NSString*)path;
+
+#ifdef __CC_PLATFORM_IOS
+
+/** Returns whether or not a given path exists with the iPhone RetinaDisplay suffix.
+ Only available on iOS. Not supported on OS X.
+ @since v1.1
+ */
+-(BOOL) iPhoneRetinaDisplayFileExistsAtPath:(NSString*)filename;
+
+/** Returns whether or not a given filename exists with the iPad suffix.
+ Only available on iOS. Not supported on OS X.
+ @since v1.1
+ */
+-(BOOL) iPadFileExistsAtPath:(NSString*)filename;
+
+/** Returns whether or not a given filename exists with the iPad RetinaDisplay suffix.
+ Only available on iOS. Not supported on OS X.
+ @since v2.0
+ */
+-(BOOL) iPadRetinaDisplayFileExistsAtPath:(NSString*)filename;
+
+#endif // __CC_PLATFORM_MAC
+
+/**
+ @deprecated
+ */
+-(void) setEnableFallbackSuffixes:(BOOL)enableFallbackSuffixes;
+
+@end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** loads a file into memory.
+ the caller should release the allocated buffer.
+
+ @returns the size of the allocated buffer
+ @since v0.99.5
+ */
+NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out);
+	
+#ifdef __cplusplus
+}
+#endif

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

@@ -29,7 +29,7 @@
 /** converts a line to a polygon */
 void ccVertexLineToPolygon(CGPoint *points, float stroke, ccVertex2F *vertices, NSUInteger offset, NSUInteger nuPoints);
 
-/** returns wheter or not the line intersects */
+/** returns whether or not the line intersects */
 BOOL ccVertexLineIntersect(float Ax, float Ay,
                              float Bx, float By,
                              float Cx, float Cy,

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

@@ -63,8 +63,10 @@ extern "C" {
  @return CGPoint
  @since v0.7.2
  */
-#define ccp(__X__,__Y__) CGPointMake(__X__,__Y__)
-
+static inline CGPoint ccp( CGFloat x, CGFloat y )
+{
+	return CGPointMake(x, y);
+}
 
 /** Returns opposite of point.
  @return CGPoint

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

@@ -28,7 +28,7 @@ extern "C" {
 		uint8_t			sig[4];				// signature. Should be 'CCZ!' 4 bytes
 		uint16_t		compression_type;	// should 0
 		uint16_t		version;			// should be 2 (although version type==1 is also supported)
-		uint32_t		reserved;			// Reserverd for users.
+		uint32_t		reserved;			// Reserved for users.
 		uint32_t		len;				// size of the uncompressed file
 	};
 
@@ -47,7 +47,7 @@ extern "C" {
  * Inflates either zlib or gzip deflated memory. The inflated memory is
  * expected to be freed by the caller.
  *
- * It will allocate 256k for the destination buffer. If it is not enought it will multiply the previous buffer size per 2, until there is enough memory.
+ * It will allocate 256k for the destination buffer. If it is not enough it will multiply the previous buffer size per 2, until there is enough memory.
  * @returns the length of the deflated buffer
  *
  @since v0.8.1
@@ -58,13 +58,13 @@ int ccInflateMemory(unsigned char *in, unsigned int inLength, unsigned char **ou
  * Inflates either zlib or gzip deflated memory. The inflated memory is
  * expected to be freed by the caller.
  *
- * outLenghtHint is assumed to be the needed room to allocate the inflated buffer.
+ * outlengthHint is assumed to be the needed room to allocate the inflated buffer.
  *
  * @returns the length of the deflated buffer
  *
  @since v1.0.0
  */
-int ccInflateMemoryWithHint(unsigned char *in, unsigned int inLength, unsigned char **out, unsigned int outLenghtHint );
+int ccInflateMemoryWithHint(unsigned char *in, unsigned int inLength, unsigned char **out, unsigned int outlengthHint );
 
 
 /** inflates a GZip file into memory

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

@@ -31,7 +31,7 @@
  - comparisons are done using pointer equality instead of isEqual
 
  There are 2 kind of functions:
- - ccArray functions that manipulates objective-c objects (retain and release are performanced)
+ - ccArray functions that manipulates objective-c objects (retain and release are performed)
  - ccCArray functions that manipulates values like if they were standard C structures (no retain/release is performed)
  */
 
@@ -84,20 +84,20 @@ void ccArrayEnsureExtraCapacity(ccArray *arr, NSUInteger extra);
 /** shrinks the array so the memory footprint corresponds with the number of items */
 void ccArrayShrink(ccArray *arr);
 
-/** Returns index of first occurence of object, NSNotFound if object not found. */
+/** Returns index of first occurrence of object, NSNotFound if object not found. */
 NSUInteger ccArrayGetIndexOfObject(ccArray *arr, id object);
 
 /** Returns a Boolean value that indicates whether object is present in array. */
 BOOL ccArrayContainsObject(ccArray *arr, id object);
 
-/** Appends an object. Bahaviour undefined if array doesn't have enough capacity. */
+/** Appends an object. Behavior undefined if array doesn't have enough capacity. */
 void ccArrayAppendObject(ccArray *arr, id object);
 
 /** Appends an object. Capacity of arr is increased if needed. */
 void ccArrayAppendObjectWithResize(ccArray *arr, id object);
 
 /** Appends objects from plusArr to arr. 
- Behaviour undefined if arr doesn't have enough capacity. */
+ Behavior undefined if arr doesn't have enough capacity. */
 void ccArrayAppendArray(ccArray *arr, ccArray *plusArr);
 
 /** Appends objects from plusArr to arr. Capacity of arr is increased if needed. */
@@ -113,17 +113,17 @@ void ccArraySwapObjectsAtIndexes(ccArray *arr, NSUInteger index1, NSUInteger ind
 void ccArrayRemoveAllObjects(ccArray *arr);
 
 /** Removes object at specified index and pushes back all subsequent objects.
- Behaviour undefined if index outside [0, num-1]. */
+ Behavior undefined if index outside [0, num-1]. */
 void ccArrayRemoveObjectAtIndex(ccArray *arr, NSUInteger index);
 
 /** Removes object at specified index and fills the gap with the last object,
  thereby avoiding the need to push back subsequent objects.
- Behaviour undefined if index outside [0, num-1]. */
+ Behavior undefined if index outside [0, num-1]. */
 void ccArrayFastRemoveObjectAtIndex(ccArray *arr, NSUInteger index);
 
 void ccArrayFastRemoveObject(ccArray *arr, id object);
 
-/** Searches for the first occurance of object and removes it. If object is not
+/** Searches for the first occurrence of object and removes it. If object is not
  found the function has no effect. */
 void ccArrayRemoveObject(ccArray *arr, id object);
 
@@ -160,22 +160,22 @@ void ccCArrayDoubleCapacity(ccCArray *arr);
 /** Increases array capacity such that max >= num + extra. */
 void ccCArrayEnsureExtraCapacity(ccCArray *arr, NSUInteger extra);
 
-/** Returns index of first occurence of value, NSNotFound if value not found. */
+/** Returns index of first occurrence of value, NSNotFound if value not found. */
 NSUInteger ccCArrayGetIndexOfValue(ccCArray *arr, CCARRAY_ID value);
 
 /** Returns a Boolean value that indicates whether value is present in the C array. */
 BOOL ccCArrayContainsValue(ccCArray *arr, CCARRAY_ID value);
 
-/** Inserts a value at a certain position. Behaviour undefined if aray doesn't have enough capacity */
+/** Inserts a value at a certain position. Behavior undefined if array doesn't have enough capacity */
 void ccCArrayInsertValueAtIndex( ccCArray *arr, CCARRAY_ID value, NSUInteger index);
 
-/** Appends an value. Bahaviour undefined if array doesn't have enough capacity. */
+/** Appends an value. Behavior undefined if array doesn't have enough capacity. */
 void ccCArrayAppendValue(ccCArray *arr, CCARRAY_ID value);
 
 /** Appends an value. Capacity of arr is increased if needed. */
 void ccCArrayAppendValueWithResize(ccCArray *arr, CCARRAY_ID value);
 
-/** Appends values from plusArr to arr. Behaviour undefined if arr doesn't have
+/** Appends values from plusArr to arr. Behavior undefined if arr doesn't have
  enough capacity. */
 void ccCArrayAppendArray(ccCArray *arr, ccCArray *plusArr);
 
@@ -186,19 +186,19 @@ void ccCArrayAppendArrayWithResize(ccCArray *arr, ccCArray *plusArr);
 void ccCArrayRemoveAllValues(ccCArray *arr);
 
 /** Removes value at specified index and pushes back all subsequent values.
- Behaviour undefined if index outside [0, num-1].
+ Behavior undefined if index outside [0, num-1].
  @since v0.99.4
  */
 void ccCArrayRemoveValueAtIndex(ccCArray *arr, NSUInteger index);
 
 /** Removes value at specified index and fills the gap with the last value,
  thereby avoiding the need to push back subsequent values.
- Behaviour undefined if index outside [0, num-1].
+ Behavior undefined if index outside [0, num-1].
  @since v0.99.4
  */
 void ccCArrayFastRemoveValueAtIndex(ccCArray *arr, NSUInteger index);
 
-/** Searches for the first occurance of value and removes it. If value is not found the function has no effect.
+/** Searches for the first occurrence of value and removes it. If value is not found the function has no effect.
  @since v0.99.4
  */
 void ccCArrayRemoveValue(ccCArray *arr, CCARRAY_ID value);
@@ -213,7 +213,7 @@ void ccCArrayRemoveArray(ccCArray *arr, ccCArray *minusArr);
  */
 void ccCArrayFullRemoveArray(ccCArray *arr, ccCArray *minusArr);
 
-// iterative mergesort arrd on
+// iterative mergesort
 //  http://www.inf.fh-flensburg.de/lang/algorithmen/sortieren/merge/mergiter.htm  
 int cc_mergesortL(ccCArray* array, size_t width, cc_comparator comparator);