MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-26 21:57:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301 from Blixibon/mapbase/feature/sky-camera-multi-saverestore-fix

Browse Source 
Fix maps with multiple sky_cameras not using the correct sky_camera after loading a save
This commit is contained in:
Blixibon 2025-01-02 08:36:03 -06:00 committed by GitHub
commit 98816adacc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sp/src/game/server/SkyCamera.cpp
View File

@ -211,6 +211,11 @@ void CSkyCamera::Activate( )
}
}
#endif
#ifdef MAPBASE
if (HasSpawnFlags( SF_SKY_MASTER ))
g_hActiveSkybox = this;
#endif
}
#ifdef MAPBASE
@ -368,9 +373,11 @@ void CSkyCamera::InputActivateSkybox( inputdata_t &inputdata )
// Deactivate that skybox
pActiveSky->SetThink( NULL );
pActiveSky->SetNextThink( TICK_NEVER_THINK );
pActiveSky->RemoveSpawnFlags( SF_SKY_MASTER );
}
g_hActiveSkybox = this;
AddSpawnFlags( SF_SKY_MASTER );
if (HasSpawnFlags( SF_SKY_START_UPDATING ))
InputStartUpdating( inputdata );
@ -384,6 +391,7 @@ void CSkyCamera::InputDeactivateSkybox( inputdata_t &inputdata )
if (GetCurrentSkyCamera() == this)
{
g_hActiveSkybox = NULL;
RemoveSpawnFlags( SF_SKY_MASTER );
// ClientData doesn't catch this immediately
CBasePlayer *pPlayer = NULL;