summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-04 16:55:32 +0200
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-04 16:55:32 +0200
commit1570bc62105de67871e98599506f7bee6f1b400d (patch)
tree4c3db08b701958442bae22f20ba43d95037ad926 /src/main.cpp
parent8488827025f25743ef18eca8c55cfdff5767341b (diff)
parenta1c9b58c29746793f00520d46e1397abe2b0e711 (diff)
Merge branch 'develop'HEADmaster
apply SFML develop change
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 48c1766..70f3a6b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,7 @@
//----------------------
//----- Personnal include -----
-#include "./Controllers/ConsoleController/ConsoleController.hpp"
+#include "./Controllers/SFMLController/SFMLController.hpp"
//-----------------------------
@@ -20,7 +20,7 @@ int main()
srand(time(NULL));
//Init controller
- ConsoleController controller;
+ SFMLController controller;
//Run the game
controller.run();