From 53b471636ca180bbaa788777ed705b9b12a0427c Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 26 May 2015 16:24:10 +0200 Subject: [PATCH] Add sv_itemstime cvar so itemstime can be completely disabled by the server --- defaultXonotic.cfg | 2 ++ qcsrc/server/autocvars.qh | 1 + qcsrc/server/t_items.qc | 4 ++++ qcsrc/server/waypointsprites.qc | 2 ++ 4 files changed, 9 insertions(+) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 1e01825b35..01c02ce8b0 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -779,6 +779,8 @@ seta g_waypointsprite_turrets 1 "disable turret waypoints" seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites" seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle" +set sv_itemstime 1 "enable networking of left time until respawn for items such as mega health and large armor" + // so it can be stuffcmd-ed still set cl_gravity 800 "but ignored anyway" diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index f84eb008b2..ecbf895739 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -638,6 +638,7 @@ float autocvar_sv_gameplayfix_q2airaccelerate; int autocvar_sv_gentle; #define autocvar_sv_gravity cvar("sv_gravity") string autocvar_sv_intermission_cdtrack; +float autocvar_sv_itemstime; string autocvar_sv_jumpspeedcap_max; float autocvar_sv_jumpspeedcap_max_disable_on_ramps; string autocvar_sv_jumpspeedcap_min; diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 2ad368db12..c6d5f1f9f9 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -506,11 +506,15 @@ void Item_ItemsTime_UpdateTime(entity e, float t) switch(e.items) { case IT_HEALTH: + if(!autocvar_sv_itemstime) + break; //if (e.classname == "item_health_mega") if(Item_ItemsTime_UpdateTime_Check(it_health_mega_time, t)) it_health_mega_time = t; break; case IT_ARMOR: + if(!autocvar_sv_itemstime) + break; if (e.classname == "item_armor_large") if(Item_ItemsTime_UpdateTime_Check(it_armor_large_time, t)) it_armor_large_time = t; diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc index f52643903d..b0c8cb1226 100644 --- a/qcsrc/server/waypointsprites.qc +++ b/qcsrc/server/waypointsprites.qc @@ -201,6 +201,8 @@ float WaypointSprite_visible_for_player(entity e) // team waypoints if(self.rule == SPRITERULE_SPECTATOR) { + if(!autocvar_sv_itemstime) + return FALSE; if(!warmup_stage && e.classname == "player") return FALSE; } -- 2.39.2