archives/dungeonanddeamon
1
0
Fork 0
mirror of https://forge.univ-lyon1.fr/tplifap4/dungeonanddeamon.git synced 2024-02-27 13:31:50 +01:00
Code Issues Projects Releases Wiki Activity

oupsi

Browse Source
This commit is contained in:
Amaury
2020-05-03 15:46:52 +02:00
parent ca7cf2e8c7
commit 1d966ae7d0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
View File

@ -24,14 +24,10 @@ GestionJeu::GestionJeu()
GestionJeu::~GestionJeu() GestionJeu::~GestionJeu()
{ {
<<<<<<< HEAD
delete gTerrain; delete gTerrain;
delete gPlayer; delete gPlayer;
delete gMobs; delete gMobs;
delete gCollision; delete gCollision;
=======
delete gMobs;
>>>>>>> origin/master
} }
/** /**