diff options
| author | Alfred Eriksson <somerunce@gmail.com> | 2009-01-11 10:40:14 +0000 |
|---|---|---|
| committer | Alfred Eriksson <somerunce@gmail.com> | 2009-01-11 10:40:14 +0000 |
| commit | 39a12060d68b1a5169d643a8c6f56df3d82ac4c1 (patch) | |
| tree | bb104b9b446a00687e533924b5765ff3918780cc /src/engine | |
| parent | 371e8623161095b8f74d51d37f3de368b5cd584c (diff) | |
| download | zcatch-39a12060d68b1a5169d643a8c6f56df3d82ac4c1.tar.gz zcatch-39a12060d68b1a5169d643a8c6f56df3d82ac4c1.zip | |
removed the tuning filtering and warning. modded servers can use tuning for free. added pure server checking - ctf, dm and tdm gametypes are not allowed to have different tuning.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/ec_srvbrowse.c | 4 | ||||
| -rw-r--r-- | src/engine/e_config_variables.h | 2 | ||||
| -rw-r--r-- | src/engine/e_if_mods.h | 3 | ||||
| -rw-r--r-- | src/engine/e_if_other.h | 2 | ||||
| -rw-r--r-- | src/engine/server/es_server.c | 2 |
5 files changed, 3 insertions, 10 deletions
diff --git a/src/engine/client/ec_srvbrowse.c b/src/engine/client/ec_srvbrowse.c index cf36f62b..99389c1d 100644 --- a/src/engine/client/ec_srvbrowse.c +++ b/src/engine/client/ec_srvbrowse.c @@ -164,7 +164,7 @@ static void client_serverbrowse_filter() filtered = 1; else if(config.b_filter_pw && serverlist[i]->info.flags&SRVFLAG_PASSWORD) filtered = 1; - else if(config.b_filter_tuned && serverlist[i]->info.flags&SRVFLAG_TUNED) + else if(config.b_filter_pure && (strcmp(serverlist[i]->info.gametype, "DM") != 0 && strcmp(serverlist[i]->info.gametype, "TDM") != 0 && strcmp(serverlist[i]->info.gametype, "CTF") != 0)) filtered = 1; else if(config.b_filter_ping < serverlist[i]->info.latency) filtered = 1; @@ -228,7 +228,7 @@ static int client_serverbrowse_sorthash() i |= config.b_filter_pw<<6; i |= config.b_sort_order<<7; i |= config.b_filter_compatversion<<8; - i |= config.b_filter_tuned<<9; + i |= config.b_filter_pure<<9; i |= config.b_filter_ping<<16; return i; } diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h index c4ccfd3d..69002a50 100644 --- a/src/engine/e_config_variables.h +++ b/src/engine/e_config_variables.h @@ -19,7 +19,7 @@ MACRO_CONFIG_INT(b_filter_empty, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter o MACRO_CONFIG_INT(b_filter_pw, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out password protected servers in browser") MACRO_CONFIG_INT(b_filter_ping, 999, 0, 999, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Ping to filter by in the server browser") MACRO_CONFIG_STR(b_filter_gametype, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Game types to filter") -MACRO_CONFIG_INT(b_filter_tuned, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out tuned servers in browser") +MACRO_CONFIG_INT(b_filter_pure, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out non-pure servers in browser") MACRO_CONFIG_INT(b_filter_compatversion, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out non-compatible servers in browser") MACRO_CONFIG_INT(b_sort, 0, 0, 256, CFGFLAG_SAVE|CFGFLAG_CLIENT, "") diff --git a/src/engine/e_if_mods.h b/src/engine/e_if_mods.h index 31bf075f..08d0ec37 100644 --- a/src/engine/e_if_mods.h +++ b/src/engine/e_if_mods.h @@ -165,7 +165,4 @@ const char *mods_version(); */ void mods_message(int msg, int client_id); - -int mods_is_tuned(); - #endif diff --git a/src/engine/e_if_other.h b/src/engine/e_if_other.h index 76e86b3e..5c839750 100644 --- a/src/engine/e_if_other.h +++ b/src/engine/e_if_other.h @@ -31,8 +31,6 @@ enum enum { SRVFLAG_PASSWORD = 0x1, - SRVFLAG_TUNED = 0x2, - SRVFLAG_MOD = 0x4 }; /* diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c index 0fe6562a..d6b986a5 100644 --- a/src/engine/server/es_server.c +++ b/src/engine/server/es_server.c @@ -859,8 +859,6 @@ static void server_send_serverinfo(NETADDR *addr, int token) i = 0; if(config.password[0]) /* password set */ i |= SRVFLAG_PASSWORD; - if (mods_is_tuned()) /* is tuned */ - i |= SRVFLAG_TUNED; str_format(buf, sizeof(buf), "%d", i); packer_add_string(&p, buf, 2); |