Partially from https://gitlab.com/xonotic/darkplaces/-/merge_requests/85
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12664
d7cf8633-e32d-0410-b094-
e92efae38249
*/
void FS_Init_SelfPack (void)
{
*/
void FS_Init_SelfPack (void)
{
PK3_OpenLibrary ();
fs_mempool = Mem_AllocPool("file management", 0, NULL);
// Load darkplaces.opt from the FS.
if (!COM_CheckParm("-noopt"))
{
PK3_OpenLibrary ();
fs_mempool = Mem_AllocPool("file management", 0, NULL);
// Load darkplaces.opt from the FS.
if (!COM_CheckParm("-noopt"))
{
- char *buf = (char *) FS_SysLoadFile("darkplaces.opt", tempmempool, true, NULL);
+ buf = (char *) FS_SysLoadFile("darkplaces.opt", tempmempool, true, NULL);
}
#ifndef USE_RWOPS
// Provide the SelfPack.
}
#ifndef USE_RWOPS
// Provide the SelfPack.
- if (!COM_CheckParm("-noselfpack"))
+ if (!COM_CheckParm("-noselfpack") && com_selffd >= 0)
+ fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd, true);
+ if(fs_selfpack)
- fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd, true);
- if(fs_selfpack)
+ FS_AddSelfPack();
+ if (!COM_CheckParm("-noopt"))
- FS_AddSelfPack();
- if (!COM_CheckParm("-noopt"))
+ buf = (char *) FS_LoadFile("darkplaces.opt", tempmempool, true, NULL);
+ if(buf)
- char *buf = (char *) FS_LoadFile("darkplaces.opt", tempmempool, true, NULL);
- if(buf)
- COM_InsertFlags(buf);