zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-16 07:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- implement 'loadacs' option for MAPINFO.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-10 10:21:17 +01:00
parent 1e193206bf
commit 39cdb7cf30
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/edf.cpp
View file

@ -47,6 +47,7 @@
#include "p_tags.h" #include "p_tags.h"
#include "p_terrain.h" #include "p_terrain.h"
#include "v_palette.h" #include "v_palette.h"
#include "p_acs.h"
#include "r_data/colormaps.h" #include "r_data/colormaps.h"
@ -770,4 +771,14 @@ void ProcessEDFSectors()
} }
} }
delete[] edfsectorrecord; delete[] edfsectorrecord;
} }
void LoadMapinfoACSLump()
{
FEdfOptions *opt = level.info->GetOptData<FEdfOptions>("EDF", false);
if (opt != NULL)
{
int lump = Wads.CheckNumForName(opt->acsName);
if (lump >= 0) FBehavior::StaticLoadModule(lump);
}
}

4
src/p_setup.cpp
View file

@ -3702,6 +3702,10 @@ void P_SetupLevel (const char *lumpname, int position)
} }
FBehavior::StaticLoadDefaultModules (); FBehavior::StaticLoadDefaultModules ();
#ifndef NO_EDF
LoadMapinfoACSLump();
#endif
P_LoadStrifeConversations (map, lumpname); P_LoadStrifeConversations (map, lumpname);