zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-23 15:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add assertion for memory error handler in debug builds, add .def load time information to log, call Gv_ResetSystemDefaults() at startup to populate fake tilesizx/tilesizy arrays for CON

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4629 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-09-30 04:15:53 +00:00
parent 8e98cbe083
commit f553d6ad10
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/source/game.c
View file

@ -10869,6 +10869,9 @@ static void G_HandleMemErr(int32_t line, const char *file, const char *func)
{ {
static char msg[128]; static char msg[128];
Bsnprintf(msg, sizeof(msg), "Out of memory in %s:%d (%s)\n", file, line, func); Bsnprintf(msg, sizeof(msg), "Out of memory in %s:%d (%s)\n", file, line, func);
#ifdef DEBUGGINGAIDS
Bassert(0);
#endif
G_GameExit(msg); G_GameExit(msg);
} }
@ -11466,9 +11469,11 @@ int32_t app_main(int32_t argc, const char **argv)
{ {
const char *defsfile = G_DefFile(); const char *defsfile = G_DefFile();
uint32_t stime = getticks();
if (!loaddefinitionsfile(defsfile)) if (!loaddefinitionsfile(defsfile))
{ {
initprintf("Definitions file \"%s\" loaded.\n",defsfile); uint32_t etime = getticks();
initprintf("Definitions file \"%s\" loaded in %d ms.\n", defsfile, etime-stime);
loaddefinitions_game(defsfile, FALSE); loaddefinitions_game(defsfile, FALSE);
} }
} }
@ -11478,6 +11483,8 @@ int32_t app_main(int32_t argc, const char **argv)
Bfree(g_defModules); Bfree(g_defModules);
g_defModules = NULL; g_defModules = NULL;
Gv_ResetSystemDefaults(); // called here to populate our fake tilesizx and tilesizy arrays presented to CON with sizes generated by dummytiles
if (numplayers == 1 && boardfilename[0] != 0) if (numplayers == 1 && boardfilename[0] != 0)
{ {
ud.m_level_number = 7; ud.m_level_number = 7;