diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-03-07 00:05:12 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-03-07 00:05:12 +0100 |
| commit | 66c44fc229bf8f2f029985a3d712c2518e4e38a9 (patch) | |
| tree | 9b35dee344f877709bcb050bd7b0ad55e25da081 /src/engine/shared/config_variables.h | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| parent | a42603ba43720b51ba8909d352fc2af88ebba2dd (diff) | |
| download | zcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.tar.gz zcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.zip | |
Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2
Conflicts: src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/config_variables.h src/engine/shared/network.h src/engine/shared/network_server.cpp
Diffstat (limited to 'src/engine/shared/config_variables.h')
| -rw-r--r-- | src/engine/shared/config_variables.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index ac913162..76e4ccd3 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -100,6 +100,8 @@ MACRO_CONFIG_INT(EcBantime, ec_bantime, 0, 0, 1440, CFGFLAG_ECON, "The time a cl MACRO_CONFIG_INT(EcAuthTimeout, ec_auth_timeout, 30, 1, 120, CFGFLAG_ECON, "Time in seconds before the the econ authentification times out") MACRO_CONFIG_INT(EcOutputLevel, ec_output_level, 1, 0, 2, CFGFLAG_ECON, "Adjusts the amount of information in the external console") +MACRO_CONFIG_INT(SvGlobalBantime, sv_global_bantime, 60, 0, 1440, CFGFLAG_SERVER, "The time a client gets banned if the ban server reports it. 0 to disable") + MACRO_CONFIG_INT(Debug, debug, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Debug mode") MACRO_CONFIG_INT(DbgStress, dbg_stress, 0, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Stress systems") MACRO_CONFIG_INT(DbgStressNetwork, dbg_stress_network, 0, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Stress network") |