- moved the last remaining function out of baselayer.cpp and removed that file.

g_logFlushWindow was deleted entirely because with the current console this is not needed anymore.
This commit is contained in:
Christoph Oelckers 2020-01-01 12:01:26 +01:00
parent 7ec8368688
commit d09b83d4a5
10 changed files with 39 additions and 77 deletions

View file

@ -158,9 +158,7 @@ static void defsparser_include(const char *fn, const scriptfile *script, const c
{
if (!cmdtokptr)
{
g_logFlushWindow = 1;
initprintf("Loading module \"%s\"\n",fn);
g_logFlushWindow = 0;
}
defsparser(included);
@ -299,9 +297,7 @@ static int32_t defsparser(scriptfile *script)
#ifdef USE_DEF_PROGRESS
if (++iter >= 50)
{
g_logFlushWindow = 1;
initprintf(".");
g_logFlushWindow = 0;
iter = 0;
}
#endif
@ -3443,15 +3439,12 @@ static int32_t defsparser(scriptfile *script)
int32_t loaddefinitionsfile(const char *fn)
{
scriptfile *script;
int32_t f = g_logFlushWindow;
script = scriptfile_fromfile(fn);
if (script)
{
g_logFlushWindow = 1;
initprintf("Loading \"%s\"\n",fn);
g_logFlushWindow = 0;
defsparser(script);
}
@ -3459,8 +3452,6 @@ int32_t loaddefinitionsfile(const char *fn)
if (userConfig.AddDefs) for (auto& m : *userConfig.AddDefs)
defsparser_include(m, NULL, NULL);
g_logFlushWindow = f;
if (script)
scriptfile_close(script);