aboutsummaryrefslogtreecommitdiff
path: root/sp/src/game/server/gameinterface.cpp
diff options
context:
space:
mode:
authorJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
committerJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
commit53e78c503e6e9c7d15e2eefc480755fe37dd7077 (patch)
treec8cc106eb4c0a2b2b5d79f534f2facb0514f5f55 /sp/src/game/server/gameinterface.cpp
parentAdded many shader source files (diff)
downloadsource-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.tar.xz
source-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.zip
General:
* Upgraded Steamworks SDK to v1.29 * Fixed mod compatibility problem with Multiplayer Base that was introduced in September. * In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid. Virtual Reality: * Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled. * VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode. Windows: * Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line. OSX: * Upgraded to XCode 5.
Diffstat (limited to 'sp/src/game/server/gameinterface.cpp')
-rw-r--r--sp/src/game/server/gameinterface.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/sp/src/game/server/gameinterface.cpp b/sp/src/game/server/gameinterface.cpp
index c9357138..ff077ea5 100644
--- a/sp/src/game/server/gameinterface.cpp
+++ b/sp/src/game/server/gameinterface.cpp
@@ -1888,9 +1888,13 @@ void CServerGameDLL::SetServerHibernation( bool bHibernating )
const char *CServerGameDLL::GetServerBrowserMapOverride()
{
#ifdef TF_DLL
- if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() && g_pPopulationManager && g_pPopulationManager->GetPopulationFilenameShort() != '\0' )
+ if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
{
- return g_pPopulationManager->GetPopulationFilenameShort();
+ const char *pszFilenameShort = g_pPopulationManager ? g_pPopulationManager->GetPopulationFilenameShort() : NULL;
+ if ( pszFilenameShort && pszFilenameShort[0] )
+ {
+ return pszFilenameShort;
+ }
}
#endif
return NULL;
@@ -2964,17 +2968,20 @@ void CServerGameClients::ClientSetupVisibility( edict_t *pViewEntity, edict_t *p
// Flush the remaining areaportal states.
engine->SetAreaPortalStates( portalNums, isOpen, iOutPortal );
- // Update the area bits that get sent to the client.
- pPlayer->m_Local.UpdateAreaBits( pPlayer, portalBits );
+ if ( pPlayer )
+ {
+ // Update the area bits that get sent to the client.
+ pPlayer->m_Local.UpdateAreaBits( pPlayer, portalBits );
#ifdef PORTAL
- // *After* the player's view has updated its area bits, add on any other areas seen by portals
- CPortal_Player* pPortalPlayer = dynamic_cast<CPortal_Player*>( pPlayer );
- if ( pPortalPlayer )
- {
- pPortalPlayer->UpdatePortalViewAreaBits( pvs, pvssize );
- }
+ // *After* the player's view has updated its area bits, add on any other areas seen by portals
+ CPortal_Player* pPortalPlayer = dynamic_cast<CPortal_Player*>( pPlayer );
+ if ( pPortalPlayer )
+ {
+ pPortalPlayer->UpdatePortalViewAreaBits( pvs, pvssize );
+ }
#endif //PORTAL
+ }
}