From fa88c91351388c4b2e1791ccab2cd8a959dc976b Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Thu, 30 Apr 2015 09:07:40 +0200
Subject: Fix some things

---
 src/CTController/CTConsole.cpp                     | 48 ----------------------
 src/CTController/CTConsole.hpp                     | 26 ------------
 .../ConsoleController/ConsoleController.cpp        | 48 ++++++++++++++++++++++
 .../ConsoleController/ConsoleController.hpp        | 26 ++++++++++++
 src/View/MainController.cpp                        |  0
 src/ViewController/MainController.cpp              |  0
 src/main.cpp                                       | 33 +++++++++------
 7 files changed, 94 insertions(+), 87 deletions(-)
 delete mode 100644 src/CTController/CTConsole.cpp
 delete mode 100644 src/CTController/CTConsole.hpp
 create mode 100644 src/Controller/ConsoleController/ConsoleController.cpp
 create mode 100644 src/Controller/ConsoleController/ConsoleController.hpp
 create mode 100644 src/View/MainController.cpp
 delete mode 100644 src/ViewController/MainController.cpp

diff --git a/src/CTController/CTConsole.cpp b/src/CTController/CTConsole.cpp
deleted file mode 100644
index 44b598e..0000000
--- a/src/CTController/CTConsole.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "CTConsole.hpp"
-
-CTConsole::CTConsole()
-{
-    m_game = new Game();
-}
-
-CTConsole::~CTConsole()
-{
-    delete m_game;
-}
-
-void CTConsole::play()
-{
-    while (!m_game->isOver())
-    {
-        m_game->showGrid();
-        char moveChoice = ' ';
-        
-        std::cin >> moveChoice;
-        
-        switch (moveChoice)
-        {
-            case 'z':
-                std::cout << "up" << std::endl;
-                break;
-                
-            case 's':
-                std::cout << "down" << std::endl;
-                break;
-                
-            case 'q':
-                std::cout << "left" << std::endl;
-                break;
-                
-            case 'd':
-                std::cout << "right" << std::endl;
-                break;
-                
-            default:
-                break;
-        }
-        
-        std::cout << std::endl;
-        
-        m_game->pop();
-    }
-}
\ No newline at end of file
diff --git a/src/CTController/CTConsole.hpp b/src/CTController/CTConsole.hpp
deleted file mode 100644
index 9534877..0000000
--- a/src/CTController/CTConsole.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef DEF_CTCONSOLE
-#define DEF_CTCONSOLE
-
-/* CTConsole.hpp
- * Defines the class CTConsole
- * CTConsole is a controller which displays a game in a terminal
- * Creators : krilius, manzerbredes
- * Date : 29/04/2915 */
-
-#include <iostream>
-
-#include "../Model/Game.hpp"
-
-class CTConsole
-{
-private:
-    Game * m_game;
-    
-public:
-    CTConsole();
-    ~CTConsole();
-    
-    void play();
-};
-
-#endif
\ No newline at end of file
diff --git a/src/Controller/ConsoleController/ConsoleController.cpp b/src/Controller/ConsoleController/ConsoleController.cpp
new file mode 100644
index 0000000..44b598e
--- /dev/null
+++ b/src/Controller/ConsoleController/ConsoleController.cpp
@@ -0,0 +1,48 @@
+#include "CTConsole.hpp"
+
+CTConsole::CTConsole()
+{
+    m_game = new Game();
+}
+
+CTConsole::~CTConsole()
+{
+    delete m_game;
+}
+
+void CTConsole::play()
+{
+    while (!m_game->isOver())
+    {
+        m_game->showGrid();
+        char moveChoice = ' ';
+        
+        std::cin >> moveChoice;
+        
+        switch (moveChoice)
+        {
+            case 'z':
+                std::cout << "up" << std::endl;
+                break;
+                
+            case 's':
+                std::cout << "down" << std::endl;
+                break;
+                
+            case 'q':
+                std::cout << "left" << std::endl;
+                break;
+                
+            case 'd':
+                std::cout << "right" << std::endl;
+                break;
+                
+            default:
+                break;
+        }
+        
+        std::cout << std::endl;
+        
+        m_game->pop();
+    }
+}
\ No newline at end of file
diff --git a/src/Controller/ConsoleController/ConsoleController.hpp b/src/Controller/ConsoleController/ConsoleController.hpp
new file mode 100644
index 0000000..9534877
--- /dev/null
+++ b/src/Controller/ConsoleController/ConsoleController.hpp
@@ -0,0 +1,26 @@
+#ifndef DEF_CTCONSOLE
+#define DEF_CTCONSOLE
+
+/* CTConsole.hpp
+ * Defines the class CTConsole
+ * CTConsole is a controller which displays a game in a terminal
+ * Creators : krilius, manzerbredes
+ * Date : 29/04/2915 */
+
+#include <iostream>
+
+#include "../Model/Game.hpp"
+
+class CTConsole
+{
+private:
+    Game * m_game;
+    
+public:
+    CTConsole();
+    ~CTConsole();
+    
+    void play();
+};
+
+#endif
\ No newline at end of file
diff --git a/src/View/MainController.cpp b/src/View/MainController.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/ViewController/MainController.cpp b/src/ViewController/MainController.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main.cpp b/src/main.cpp
index 206b47a..91a1fe6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,22 +1,29 @@
+
+//----- STD include -----
 #include <iostream>
 #include <string>
 #include <time.h>
+//----------------------
 
-<<<<<<< HEAD
+//----- Personnal include -----
 #include "./Model/Grid.hpp"
-=======
-#include "CTController/CTConsole.hpp"
->>>>>>> 71ebf1235ed023425c2539eabf1d15ba922c1dda
+#include "./Controller/ConsoleController/ConsoleController.hpp"
+//-----------------------------
+
+
+//----- Start -----
 
 int main()
 {
-    srand(time(NULL));
-    
-    CTConsole * controller = new CTConsole();
-    
-    controller->play();
-    
-    delete controller;
-    
-    return 0;
+    	//Init random
+	srand(time(NULL));
+
+	//Init console controller
+	ConsoleController * controller = new ConsoleController();
+
+	controller->play();
+
+	delete controller;
+
+	return 0;
 }
-- 
cgit v1.2.3