- cleanup of the old file system initialization.

The real fun part is yet to come, i.e. removing the remaining dependencies on the old file system code.
This commit is contained in:
Christoph Oelckers 2019-11-01 19:25:42 +01:00
parent 24edfbe03b
commit 2d7c0e26d2
30 changed files with 335 additions and 1402 deletions

View file

@ -18,6 +18,8 @@
#include "colmatch.h"
#include "textures.h"
#include "bitmap.h"
#include "m_argv.h"
#include "gamecontrol.h"
#ifdef USE_OPENGL
# include "hightile.h"
@ -327,7 +329,7 @@ static int32_t defsparser(scriptfile *script)
}
case T_INCLUDEDEFAULT:
{
defsparser_include(gi->DefaultDefFile(), script, cmdtokptr);
defsparser_include(G_DefaultDefFile(), script, cmdtokptr);
break;
}
case T_DEFINE:
@ -3414,7 +3416,7 @@ int32_t loaddefinitionsfile(const char *fn)
defsparser(script);
}
for (char const * m : g_defModules)
for (auto& m : *userConfig.AddDefs)
defsparser_include(m, NULL, NULL);
g_logFlushWindow = f;