aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/shared/multiplay_gamerules.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'mp/src/game/shared/multiplay_gamerules.cpp')
-rw-r--r--mp/src/game/shared/multiplay_gamerules.cpp98
1 files changed, 65 insertions, 33 deletions
diff --git a/mp/src/game/shared/multiplay_gamerules.cpp b/mp/src/game/shared/multiplay_gamerules.cpp
index 16cfe297..ae26bde6 100644
--- a/mp/src/game/shared/multiplay_gamerules.cpp
+++ b/mp/src/game/shared/multiplay_gamerules.cpp
@@ -85,7 +85,8 @@ ConVar mp_show_voice_icons( "mp_show_voice_icons", "1", FCVAR_REPLICATED, "Show
#ifdef GAME_DLL
-ConVar tv_delaymapchange( "tv_delaymapchange", "0", 0, "Delays map change until broadcast is complete" );
+ConVar tv_delaymapchange( "tv_delaymapchange", "0", FCVAR_NONE, "Delays map change until broadcast is complete" );
+ConVar tv_delaymapchange_protect( "tv_delaymapchange_protect", "1", FCVAR_NONE, "Protect against doing a manual map change if HLTV is broadcasting and has not caught up with a major game event such as round_end" );
ConVar mp_restartgame( "mp_restartgame", "0", FCVAR_GAMEDLL, "If non-zero, game will restart in the specified number of seconds" );
ConVar mp_restartgame_immediate( "mp_restartgame_immediate", "0", FCVAR_GAMEDLL, "If non-zero, game will restart immediately" );
@@ -278,7 +279,7 @@ CMultiplayRules::CMultiplayRules()
if ( cfgfile && cfgfile[0] )
{
- char szCommand[256];
+ char szCommand[MAX_PATH];
Log( "Executing dedicated server config file %s\n", cfgfile );
Q_snprintf( szCommand,sizeof(szCommand), "exec %s\n", cfgfile );
@@ -292,7 +293,7 @@ CMultiplayRules::CMultiplayRules()
if ( cfgfile && cfgfile[0] )
{
- char szCommand[256];
+ char szCommand[MAX_PATH];
Log( "Executing listen server config file %s\n", cfgfile );
Q_snprintf( szCommand,sizeof(szCommand), "exec %s\n", cfgfile );
@@ -1164,7 +1165,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
void CMultiplayRules::GetNextLevelName( char *pszNextMap, int bufsize, bool bRandom /* = false */ )
{
- char mapcfile[256];
+ char mapcfile[MAX_PATH];
DetermineMapCycleFilename( mapcfile, sizeof(mapcfile), false );
// Check the time of the mapcycle file and re-populate the list of level names if the file has been modified
@@ -1182,10 +1183,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
// If map cycle file has changed or this is the first time through ...
if ( m_nMapCycleTimeStamp != nMapCycleTimeStamp )
{
- // Reset map index and map cycle timestamp
- m_nMapCycleTimeStamp = nMapCycleTimeStamp;
- m_nMapCycleindex = 0;
-
+ // Reload
LoadMapCycleFile();
}
}
@@ -1209,7 +1207,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
void CMultiplayRules::DetermineMapCycleFilename( char *pszResult, int nSizeResult, bool bForceSpew )
{
- static char szLastResult[ 256];
+ static char szLastResult[ MAX_PATH ];
const char *pszVar = mapcyclefile.GetString();
if ( *pszVar == '\0' )
@@ -1223,7 +1221,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
return;
}
- char szRecommendedName[ 256 ];
+ char szRecommendedName[ MAX_PATH ];
V_sprintf_safe( szRecommendedName, "cfg/%s", pszVar );
// First, look for a mapcycle file in the cfg directory, which is preferred
@@ -1274,7 +1272,12 @@ ConVarRef suitcharger( "sk_suitcharger" );
}
}
- void CMultiplayRules::LoapMapCycleFileIntoVector( const char *pszMapCycleFile, CUtlVector<char *> &mapList )
+ void CMultiplayRules::LoadMapCycleFileIntoVector( const char *pszMapCycleFile, CUtlVector<char *> &mapList )
+ {
+ CMultiplayRules::RawLoadMapCycleFileIntoVector( pszMapCycleFile, mapList );
+ }
+
+ void CMultiplayRules::RawLoadMapCycleFileIntoVector( const char *pszMapCycleFile, CUtlVector<char *> &mapList )
{
CUtlBuffer buf;
if ( !filesystem->ReadFile( pszMapCycleFile, "GAME", buf ) )
@@ -1293,13 +1296,6 @@ ConVarRef suitcharger( "sk_suitcharger" );
{
bIgnore = true;
}
- else if ( !engine->IsMapValid( mapList[i] ) )
- {
- bIgnore = true;
-
- // If the engine doesn't consider it a valid map remove it from the lists
- Warning( "Invalid map '%s' included in map cycle file. Ignored.\n", mapList[i] );
- }
if ( bIgnore )
{
@@ -1321,6 +1317,27 @@ ConVarRef suitcharger( "sk_suitcharger" );
mapList.RemoveAll();
}
+ bool CMultiplayRules::IsManualMapChangeOkay( const char **pszReason )
+ {
+ if ( HLTVDirector()->IsActive() && ( HLTVDirector()->GetDelay() >= HLTV_MIN_DIRECTOR_DELAY ) )
+ {
+ if ( tv_delaymapchange.GetBool() && tv_delaymapchange_protect.GetBool() )
+ {
+ float flLastEvent = GetLastMajorEventTime();
+ if ( flLastEvent > -1 )
+ {
+ if ( flLastEvent > ( gpGlobals->curtime - ( HLTVDirector()->GetDelay() + 3 ) ) ) // +3 second delay to prevent instant change after a major event
+ {
+ *pszReason = "\n***WARNING*** Map change blocked. HLTV is broadcasting and has not caught up to the last major game event yet.\nYou can disable this check by setting the value of the server convar \"tv_delaymapchange_protect\" to 0.\n";
+ return false;
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
bool CMultiplayRules::IsMapInMapCycle( const char *pszName )
{
for ( int i = 0; i < m_MapList.Count(); i++ )
@@ -1338,7 +1355,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
{
char szNextMap[MAX_MAP_NAME];
- if ( nextlevel.GetString() && *nextlevel.GetString() && engine->IsMapValid( nextlevel.GetString() ) )
+ if ( nextlevel.GetString() && *nextlevel.GetString() )
{
Q_strncpy( szNextMap, nextlevel.GetString(), sizeof( szNextMap ) );
}
@@ -1353,13 +1370,19 @@ ConVarRef suitcharger( "sk_suitcharger" );
void CMultiplayRules::LoadMapCycleFile( void )
{
- char mapcfile[256];
+ int nOldCycleIndex = m_nMapCycleindex;
+ m_nMapCycleindex = 0;
+
+ char mapcfile[MAX_PATH];
DetermineMapCycleFilename( mapcfile, sizeof(mapcfile), false );
FreeMapCycleFileVector( m_MapList );
+ const int nMapCycleTimeStamp = filesystem->GetPathTime( mapcfile, "GAME" );
+ m_nMapCycleTimeStamp = nMapCycleTimeStamp;
+
// Repopulate map list from mapcycle file
- LoapMapCycleFileIntoVector( mapcfile, m_MapList );
+ LoadMapCycleFileIntoVector( mapcfile, m_MapList );
// Load server's mapcycle into network string table for client-side voting
if ( g_pStringTableServerMapCycle )
@@ -1466,16 +1489,29 @@ ConVarRef suitcharger( "sk_suitcharger" );
}
#endif
- // If the current map selection is in the list, set m_nMapCycleindex to the map that follows it.
- for ( int i = 0; i < m_MapList.Count(); i++ )
+ // If the current map is in the same location in the new map cycle, keep that index. This gives better behavior
+ // when reloading a map cycle that has the current map in it multiple times.
+ int nOldPreviousMap = ( nOldCycleIndex == 0 ) ? ( m_MapList.Count() - 1 ) : ( nOldCycleIndex - 1 );
+ if ( nOldCycleIndex >= 0 && nOldCycleIndex < m_MapList.Count() &&
+ nOldPreviousMap >= 0 && nOldPreviousMap < m_MapList.Count() &&
+ V_strcmp( STRING( gpGlobals->mapname ), m_MapList[ nOldPreviousMap ] ) == 0 )
{
- if ( V_strcmp( STRING( gpGlobals->mapname ), m_MapList[i] ) == 0 )
+ // The old index is still valid, and falls after our current map in the new cycle, use it
+ m_nMapCycleindex = nOldCycleIndex;
+ }
+ else
+ {
+ // Otherwise, if the current map selection is in the list, set m_nMapCycleindex to the map that follows it.
+ for ( int i = 0; i < m_MapList.Count(); i++ )
{
- m_nMapCycleindex = i;
- IncrementMapCycleIndex();
- break;
+ if ( V_strcmp( STRING( gpGlobals->mapname ), m_MapList[i] ) == 0 )
+ {
+ m_nMapCycleindex = i;
+ IncrementMapCycleIndex();
+ break;
+ }
}
- }
+ }
}
void CMultiplayRules::ChangeLevelToMap( const char *pszMap )
@@ -1556,7 +1592,7 @@ ConVarRef suitcharger( "sk_suitcharger" );
Msg( "Skipping: %s\tNext map: %s\n", szSkippedMap, szNextMap );
- if ( nextlevel.GetString() && *nextlevel.GetString() && engine->IsMapValid( nextlevel.GetString() ) )
+ if ( nextlevel.GetString() && *nextlevel.GetString() )
{
Msg( "Warning! \"nextlevel\" is set to \"%s\" and will override the next map to be played.\n", nextlevel.GetString() );
}
@@ -1624,10 +1660,6 @@ ConVarRef suitcharger( "sk_suitcharger" );
pPlayer->OnAchievementEarned( nAchievementID );
}
}
- else if ( FStrEq( pszCommand, "SendServerMapCycle" ) )
- {
- LoadMapCycleFile();
- }
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 08:00:28 +0000