From 16a0ac83b039c198b5b042041e758ba4f777d411 Mon Sep 17 00:00:00 2001 From: Amaury Date: Tue, 14 Apr 2020 09:20:41 +0200 Subject: [PATCH] Ajout Constructeur gCollision --- .../DungeonAndDemaonScript/GestionCollision.cpp | 7 +++++++ .../DungeonAndDemaonScript/GestionCollision.h | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.cpp index 7002ac0..6f66697 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.cpp @@ -1,7 +1,14 @@ #include "GestionCollision.h" +GestionCollision::GestionCollision(GestionMobs* m, GestionPlayer* p, GestionTerrain* t) : gMobs(m), gPlayer(p), gTerrain(t) +{ +} + std::vector GestionCollision::CheckCollisonSol() { + /*for (MobsIA m : gMobs->mobs) + { + }*/ return std::vector(); } diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h index 62c10a4..b7eab3b 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h @@ -8,11 +8,13 @@ class GestionCollision { public : - GestionTerrain gTerrain; - GestionMobs gMobs; - GestionPlayer gPlayer; + GestionTerrain* gTerrain; + GestionMobs* gMobs; + GestionPlayer* gPlayer; public: + GestionCollision(GestionMobs* m, GestionPlayer* p, GestionTerrain* t); + std::vector CheckCollisonSol(); std::vector CheckCollisonMur(); std::vector CheckCollisonToit();