Merge pull request cocos2d#356 from minggo/master

minggo · minggo · commit 5cede868ec4f · 2011-07-06T05:00:37.000-07:00
fixe cocos2d#580
diff --git a/cocos2dx/actions/CCActionTiledGrid.cpp b/cocos2dx/actions/CCActionTiledGrid.cpp
@@ -296,7 +296,7 @@ namespace cocos2d
 
 	void CCShuffleTiles::shuffle(int *pArray, unsigned int nLen)
 	{
-		unsigned int i;
+		int i;
 		for( i = nLen - 1; i >= 0; i-- )
 		{
 			unsigned int j = rand() % (i+1);
@@ -667,7 +667,7 @@ namespace cocos2d
 
 	void CCTurnOffTiles::shuffle(int *pArray, unsigned int nLen)
 	{
-		unsigned int i;
+		int i;
 		for (i = nLen - 1; i >= 0; i--)
 		{
 			unsigned int j = rand() % (i+1);

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ namespace cocos2d`
`296`	`296`
`297`	`297`	`void CCShuffleTiles::shuffle(int *pArray, unsigned int nLen)`
`298`	`298`	`{`
`299`		`- unsigned int i;`
	`299`	`+ int i;`
`300`	`300`	`for( i = nLen - 1; i >= 0; i-- )`
`301`	`301`	`{`
`302`	`302`	`unsigned int j = rand() % (i+1);`
`@@ -667,7 +667,7 @@ namespace cocos2d`
`667`	`667`
`668`	`668`	`void CCTurnOffTiles::shuffle(int *pArray, unsigned int nLen)`
`669`	`669`	`{`
`670`		`- unsigned int i;`
	`670`	`+ int i;`
`671`	`671`	`for (i = nLen - 1; i >= 0; i--)`
`672`	`672`	`{`
`673`	`673`	`unsigned int j = rand() % (i+1);`