From cfc5d425f68c1a98b86ef91d92ac82785d0f33a2 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 3 May 2015 01:09:19 +0200
Subject: Correct bug on merging and pop number

---
 src/Controllers/ConsoleController/ConsoleController.cpp | 12 ++++++++++--
 src/Controllers/ConsoleController/ConsoleController.hpp |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/Controllers/ConsoleController')

diff --git a/src/Controllers/ConsoleController/ConsoleController.cpp b/src/Controllers/ConsoleController/ConsoleController.cpp
index d91e807..479b25d 100644
--- a/src/Controllers/ConsoleController/ConsoleController.cpp
+++ b/src/Controllers/ConsoleController/ConsoleController.cpp
@@ -33,10 +33,11 @@ void ConsoleController::run()
 		keyPress=this->waitArrowKeyPress();
 
 		//Apply move
-		m_game.swipe(keyPress);
+		bool moveDone=m_game.swipe(keyPress);
 
 		//Pop a random number on the grid
-		m_game.popRandomNumber();
+		if(moveDone)
+			m_game.popRandomNumber();
 
 		//Cout grid
 		m_game.coutGrid();
@@ -95,3 +96,10 @@ kbdh::Direction ConsoleController::waitArrowKeyPress()
 
 	return keyPress;
 }
+
+
+void ConsoleController::clearScreen(){
+	for(int i;i<100;i++){
+		std::cout << std::endl;
+	}
+}
diff --git a/src/Controllers/ConsoleController/ConsoleController.hpp b/src/Controllers/ConsoleController/ConsoleController.hpp
index 8d73f79..f2c19b8 100644
--- a/src/Controllers/ConsoleController/ConsoleController.hpp
+++ b/src/Controllers/ConsoleController/ConsoleController.hpp
@@ -21,6 +21,7 @@ class ConsoleController
 		ConsoleController();
 		~ConsoleController();
 		void run();
+		void clearScreen();
 };
 
 #endif
-- 
cgit v1.2.3