game: partically revert "game: add IsMannVsMachineMode stub method, fix rediclaration"

This commit is contained in:
SanyaSho 2022-08-11 04:11:31 +03:00
parent 53a020a61c
commit 78d39515f2
2 changed files with 2 additions and 2 deletions

View File

@ -117,7 +117,7 @@ void cc_GotoNextMapInCycle()
ConCommand skip_next_map( "skip_next_map", cc_SkipNextMapInCycle, "Skips the next map in the map rotation for the server." );
ConCommand changelevel_next( "changelevel_next", cc_GotoNextMapInCycle, "Immediately changes to the next map in the map rotation for the server." );
#ifndef TF_DLL && TF_MOD // TF overrides the default value of this convar
#if !defined( TF_DLL ) && !defined( TF_MOD ) // TF overrides the default value of this convar
ConVar mp_waitingforplayers_time( "mp_waitingforplayers_time", "0", FCVAR_GAMEDLL, "WaitingForPlayers time length in seconds" );
#endif

View File

@ -42,7 +42,6 @@
#include "AI_ResponseSystem.h"
#include "hl2orange.spa.h"
#include "hltvdirector.h"
#include "multiplay_gamerules.h"
#endif
// memdbgon must be the last include file in a .cpp file!!!
@ -84,6 +83,7 @@ ConVar tf_birthday( "tf_birthday", "0", FCVAR_NOTIFY | FCVAR_REPLICATED );
#ifdef GAME_DLL
// TF overrides the default value of this convar
ConVar mp_waitingforplayers_time( "mp_waitingforplayers_time", (IsX360()?"15":"30"), FCVAR_GAMEDLL | FCVAR_DEVELOPMENTONLY, "WaitingForPlayers time length in seconds" );
ConVar tf_gravetalk( "tf_gravetalk", "1", FCVAR_NOTIFY, "Allows living players to hear dead players using text/voice chat." );
ConVar tf_spectalk( "tf_spectalk", "1", FCVAR_NOTIFY, "Allows living players to hear spectators using text chat." );
#endif