From 1d09a0fd3ae35ccf51a3b5f929f77a8c8850712c Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 2 May 2015 22:57:08 +0200
Subject: End console clean game

---
 .../ConsoleController/ConsoleController.cpp        | 53 ++++++++--------------
 .../ConsoleController/ConsoleController.hpp        |  4 +-
 2 files changed, 20 insertions(+), 37 deletions(-)

(limited to 'src/Controllers')

diff --git a/src/Controllers/ConsoleController/ConsoleController.cpp b/src/Controllers/ConsoleController/ConsoleController.cpp
index bca3ad8..d91e807 100644
--- a/src/Controllers/ConsoleController/ConsoleController.cpp
+++ b/src/Controllers/ConsoleController/ConsoleController.cpp
@@ -4,62 +4,45 @@
 
 ConsoleController::ConsoleController()
 {
-	m_game = new Game();
 }
 
 ConsoleController::~ConsoleController()
 {
-	delete m_game;
 }
 
-void ConsoleController::play()
+void ConsoleController::run()
 {
-	//Intruction msg
-	std::cout << "Use arrows to play !" << std::endl;
 
 	//Init keyPress
 	kbdh::Direction keyPress;
 
-	//Display the first grid
-	m_game->showGrid();
+	//Intruction msg
+	std::cout << "Use arrows to play !" << std::endl;
+
+	//Pop a random number on the grid
+	m_game.popRandomNumber();
+
+	//First cout grid
+	m_game.coutGrid();
+
 
 	//Start game
-	while (1)
+	while (!m_game.isOver())
 	{
-		std::cout << "Game over : " << m_game->isOver() << "fin";
 		//Get key press
 		keyPress=this->waitArrowKeyPress();
 
-		//New line for the console print arrow press
-		std::cout << std::endl;
-
-
-		//Print keyPress
-		switch(keyPress){
-			case kbdh::Up:
-				std::cout << "Keypress : Up" << std::endl;
-				break;
-			case kbdh::Down:
-				std::cout << "Keypress : Down" << std::endl;
-				break;
-			case kbdh::Left:
-				std::cout << "Keypress : Left" << std::endl;
-				break;
-			case kbdh::Right:
-				std::cout << "Keypress : Right" << std::endl;
-				m_game->swipeRight();
-				break;
-		}
-
-		//Show the Grid
-		m_game->showGrid();
-		std::cout << std::endl;
+		//Apply move
+		m_game.swipe(keyPress);
 
+		//Pop a random number on the grid
+		m_game.popRandomNumber();
 
-		//Pop new number
-		m_game->pop();
+		//Cout grid
+		m_game.coutGrid();
 
 	}
+	m_game.coutGrid();
 }
 
 
diff --git a/src/Controllers/ConsoleController/ConsoleController.hpp b/src/Controllers/ConsoleController/ConsoleController.hpp
index 6ce8df9..8d73f79 100644
--- a/src/Controllers/ConsoleController/ConsoleController.hpp
+++ b/src/Controllers/ConsoleController/ConsoleController.hpp
@@ -15,12 +15,12 @@ class ConsoleController
 {
 	private:
 
-		Game * m_game;
+		Game m_game;
 		kbdh::Direction waitArrowKeyPress();
 	public:
 		ConsoleController();
 		~ConsoleController();
-		void play();
+		void run();
 };
 
 #endif
-- 
cgit v1.2.3