teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix omission of modules when parsing game-side defs.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5141 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-12 08:07:59 +00:00
parent 896ae2894c
commit 0d5b933bb3
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9217,14 +9217,15 @@ int32_t loaddefinitions_game(const char *fn, int32_t preload)
UNREFERENCED_PARAMETER(preload); UNREFERENCED_PARAMETER(preload);
script = scriptfile_fromfile(fn); script = scriptfile_fromfile(fn);
if (!script) return -1; if (script)
parsegroupfiles(script);
parsegroupfiles(script);
for (i=0; i < g_defModulesNum; ++i) for (i=0; i < g_defModulesNum; ++i)
parsegroupfiles_include(g_defModules[i], NULL, "null"); parsegroupfiles_include(g_defModules[i], NULL, "null");
scriptfile_close(script); if (script)
scriptfile_close(script);
scriptfile_clearsymbols(); scriptfile_clearsymbols();
return 0; return 0;

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

@ -9824,14 +9824,15 @@ int32_t loaddefinitions_game(const char *fn, int32_t preload)
int32_t i; int32_t i;
script = scriptfile_fromfile(fn); script = scriptfile_fromfile(fn);
if (!script) return -1; if (script)
parsedefinitions_game(script, preload);
parsedefinitions_game(script, preload);
for (i=0; i < g_defModulesNum; ++i) for (i=0; i < g_defModulesNum; ++i)
parsedefinitions_game_include(g_defModules[i], NULL, "null", preload); parsedefinitions_game_include(g_defModules[i], NULL, "null", preload);
scriptfile_close(script); if (script)
scriptfile_close(script);
scriptfile_clearsymbols(); scriptfile_clearsymbols();
return 0; return 0;