Merge upstream beanch 'devilution/master'
This commit is contained in:
commit
6856fb74e2
88 changed files with 2384 additions and 2933 deletions
|
|
@ -1,6 +1,5 @@
|
|||
//HEADER_GOES_HERE
|
||||
|
||||
#include "../types.h"
|
||||
#include "diablo.h"
|
||||
#include "../3rdParty/Storm/Source/storm.h"
|
||||
|
||||
DEVILUTION_BEGIN_NAMESPACE
|
||||
|
||||
|
|
@ -246,11 +245,7 @@ void ShowProgress(unsigned int uMsg)
|
|||
|
||||
void FreeInterface()
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
ptr = sgpBackCel;
|
||||
sgpBackCel = NULL;
|
||||
mem_free_dbg(ptr);
|
||||
MemFreeDbg(sgpBackCel);
|
||||
}
|
||||
|
||||
void InitCutscene(unsigned int uMsg)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue