vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: server: set mapname globals field before making first call into DLL, as some mods tend to read it too early

Browse source
This commit is contained in:
Alibek Omarov 2024-12-26 02:50:30 +03:00
parent 48bdd4238e
commit 9811988cce
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/server/sv_save.c
View file

@ -1606,6 +1606,10 @@ static int LoadGameState( char const *level, qboolean changelevel )
pSaveData = LoadSaveData( level ); pSaveData = LoadSaveData( level );
if( !pSaveData ) return 0; // couldn't load the file if( !pSaveData ) return 0; // couldn't load the file
// must set mapname before calling into DLL
Q_strncpy( sv.name, level, sizeof( sv.name ));
svgame.globals->mapname = MAKE_STRING( sv.name );
ParseSaveTables( pSaveData, &header, true ); ParseSaveTables( pSaveData, &header, true );
EntityPatchRead( pSaveData, level ); EntityPatchRead( pSaveData, level );
@ -1613,8 +1617,6 @@ static int LoadGameState( char const *level, qboolean changelevel )
sv.loadgame = sv.paused = true; sv.loadgame = sv.paused = true;
Cvar_SetValue( "skill", header.skillLevel ); Cvar_SetValue( "skill", header.skillLevel );
Q_strncpy( sv.name, header.mapName, sizeof( sv.name ));
svgame.globals->mapname = MAKE_STRING( sv.name );
Cvar_Set( "sv_skyname", header.skyName ); Cvar_Set( "sv_skyname", header.skyName );
// restore sky parms // restore sky parms