FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

engine: don't release DLL that wasn't loaded during settings.scr parsing. This should be deleted as soon as possible!

This commit is contained in:
Alibek Omarov 2023-08-03 01:11:06 +03:00
parent bf03f739bb
commit aee99f6094
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/common/common.h
View File

@ -747,7 +747,7 @@ void SV_ShutdownGame( void );
void SV_ExecLoadLevel( void ); void SV_ExecLoadLevel( void );
void SV_ExecLoadGame( void ); void SV_ExecLoadGame( void );
void SV_ExecChangeLevel( void ); void SV_ExecChangeLevel( void );
void SV_InitGameProgs( void ); qboolean SV_InitGameProgs( void );
void SV_FreeGameProgs( void ); void SV_FreeGameProgs( void );
void CL_WriteMessageHistory( void ); void CL_WriteMessageHistory( void );
void CL_SendCmd( void ); void CL_SendCmd( void );

8
engine/common/con_utils.c
View File

@ -1423,12 +1423,14 @@ save serverinfo variables into server.cfg (using for dedicated server too)
*/ */
void GAME_EXPORT Host_WriteServerConfig( const char *name ) void GAME_EXPORT Host_WriteServerConfig( const char *name )
{ {
qboolean already_loaded;
file_t *f; file_t *f;
string newconfigfile; string newconfigfile;
Q_snprintf( newconfigfile, MAX_STRING, "%s.new", name ); Q_snprintf( newconfigfile, MAX_STRING, "%s.new", name );
SV_InitGameProgs(); // collect user variables // TODO: remove this mechanism, make it safer for now
already_loaded = SV_InitGameProgs(); // collect user variables
// FIXME: move this out until menu parser is done // FIXME: move this out until menu parser is done
CSCR_LoadDefaultCVars( "settings.scr" ); CSCR_LoadDefaultCVars( "settings.scr" );
@ -1447,7 +1449,9 @@ void GAME_EXPORT Host_WriteServerConfig( const char *name )
} }
else Con_DPrintf( S_ERROR "Couldn't write %s.\n", name ); else Con_DPrintf( S_ERROR "Couldn't write %s.\n", name );
SV_FreeGameProgs(); // release progs with all variables // don't unload library that wasn't loaded by us
if( already_loaded )
SV_FreeGameProgs(); // release progs with all variables
} }
/* /*

6
engine/server/sv_init.c
View File

@ -1115,16 +1115,18 @@ int SV_GetMaxClients( void )
return svs.maxclients; return svs.maxclients;
} }
void SV_InitGameProgs( void ) qboolean SV_InitGameProgs( void )
{ {
string dllpath; string dllpath;
if( svgame.hInstance ) return; // already loaded if( svgame.hInstance ) return true; // already loaded
COM_GetCommonLibraryPath( LIBRARY_SERVER, dllpath, sizeof( dllpath )); COM_GetCommonLibraryPath( LIBRARY_SERVER, dllpath, sizeof( dllpath ));
// just try to initialize // just try to initialize
SV_LoadProgs( dllpath ); SV_LoadProgs( dllpath );
return false;
} }
void SV_FreeGameProgs( void ) void SV_FreeGameProgs( void )