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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Amaury
2020-05-03 15:28:08 +02:00
parent fd81b857fd c85ccf4f8f
commit ca7cf2e8c7
10 changed files with 449 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
View File

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