Fixed one more memory leak
This was SVN commit r683.
This commit is contained in:
parent
7db0a92bfd
commit
77fbf1ab6d
@ -52,6 +52,8 @@
|
|||||||
#include "gui/GUI.h"
|
#include "gui/GUI.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "NPFontManager.h"
|
||||||
|
|
||||||
|
|
||||||
CConsole* g_Console = 0;
|
CConsole* g_Console = 0;
|
||||||
extern int conInputHandler(const SDL_Event* ev);
|
extern int conInputHandler(const SDL_Event* ev);
|
||||||
@ -414,8 +416,6 @@ static void Render()
|
|||||||
glDisable(GL_CULL_FACE);
|
glDisable(GL_CULL_FACE);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glAlphaFunc(GL_GREATER, 0.5);
|
|
||||||
glEnable(GL_ALPHA_TEST);
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glPushMatrix();
|
glPushMatrix();
|
||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
@ -597,7 +597,6 @@ static void psInit()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void psShutdown()
|
static void psShutdown()
|
||||||
{
|
{
|
||||||
#ifndef NO_GUI
|
#ifndef NO_GUI
|
||||||
@ -615,6 +614,9 @@ extern u64 PREVTSC;
|
|||||||
int main(int argc, char* argv[])
|
int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// If you ever want to catch a particular allocation:
|
||||||
|
//_CrtSetBreakAlloc(4128);
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
u64 TSC=rdtsc();
|
u64 TSC=rdtsc();
|
||||||
debug_out(
|
debug_out(
|
||||||
@ -914,6 +916,10 @@ PREVTSC=CURTSC;
|
|||||||
|
|
||||||
delete &g_ConfigDB;
|
delete &g_ConfigDB;
|
||||||
|
|
||||||
|
// Not particularly consistent with all the other singletons,
|
||||||
|
// but the GUI currently uses it and so it needs to be unloaded
|
||||||
|
NPFontManager::release();
|
||||||
|
|
||||||
exit(0);
|
exit(0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user