From 5f157245dbf16c26dc33e1438f4c9a0fcda185bf Mon Sep 17 00:00:00 2001
From: Amaury <amaury.joly@etu.univ-lyon1.fr>
Date: Tue, 14 Apr 2020 09:18:51 +0200
Subject: [PATCH] Appel de setup scene + mise de Gestion Collison comme ptr

---
 DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp | 3 ++-
 DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
index 502578b..e510f0e 100644
--- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
+++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
@@ -16,6 +16,7 @@ GestionJeu::GestionJeu()
 	gTerrain = GestionTerrain::_new();
 
 	gMobs = new GestionMobs();
+	gCollision = new GestionCollision(gMobs, gPlayer, gTerrain);
 }
 
 GestionJeu::~GestionJeu()
@@ -62,7 +63,7 @@ void GestionJeu::create_scene()
 void GestionJeu::setup_scene()
 {
 	gPlayer->setPosition(15, 150);
-	gTerrain->AjoutSolSolide(1, 1, 10, 300);
+	gTerrain->GenerationCarte();
 }
 
 
diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h
index cb69bf5..2b2899d 100644
--- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h
+++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h
@@ -22,7 +22,7 @@ public:
 	GestionPlayer* gPlayer;
 	GestionMobs* gMobs;
 	GestionTerrain* gTerrain;
-	GestionCollision gCollision;
+	GestionCollision* gCollision;
 	GestionItem gItem;
 	GestionIdentifiant gId;