gitattributes

.gitattributes

@@ -1 +1,19 @@
+# Auto detect text files and perform LF normalization
+* text=auto
 
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
+
+*.txt text eol=lf

safari/Classes/mini_games/CatGameScene.cpp

@@ -109,6 +109,7 @@ void CatGame::generateBuildingLayer()
 
 void CatGame::stringGap()
 {
+	_gapNodes.clear();
 	auto text = TextGenerator::getInstance();
 	_randomWord = text->generateAWord();
 	CCLOG("string   %s ", _randomWord.c_str());
@@ -156,7 +157,7 @@ void CatGame::catMovement()
 		hippo1 = new (std::nothrow) Cat();
 		hippo1->_catNode1 = _catLayer;
 		hippo1->_catAnimation1 = _catAnimation;
-		hippo1->_movingPositionX =  0;
+		hippo1->_movingPositionX = _previousX;
 		hippo1->_movingPositionY = _distanceY;
 		hippo1->_stringPositionX1 = _stringPositionX;
 		hippo1->_stringPositionY1 = _stringPositionY;