Merge upstream beanch 'devilution/master'

This commit is contained in:
Xadhoom 2019-04-25 20:44:01 +00:00
commit 6856fb74e2
88 changed files with 2384 additions and 2933 deletions

View file

@ -1,6 +1,4 @@
//HEADER_GOES_HERE
#include "../types.h"
#include "diablo.h"
DEVILUTION_BEGIN_NAMESPACE
@ -17,9 +15,7 @@ void LoadDebugGFX()
void FreeDebugGFX()
{
void *temp = pSquareCel;
pSquareCel = NULL;
mem_free_dbg(temp);
MemFreeDbg(pSquareCel);
}
void CheckDungeonClear()