Add sv_itemstime cvar so itemstime can be completely disabled by the server

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1e01825b357fa464e87bfeefbfebf19ee2cd0ba2..01c02ce8b0f3dde3cef0950b29a75095a2f7712d 100644 (file)
--- 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 f84eb008b2a7aef5f6ba26a84d6c9218fca563ed..ecbf895739b0ed19f16d0680c9b52353780b0b90 100644 (file)
--- 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 2ad368db12475a86a8cbaf3801d5e3530dcea432..c6d5f1f9f9ce6f53efa0d243151ec20914e45f70 100644 (file)
--- 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 f52643903d953f205ea1021a2d3b3103e7a6d374..b0c8cb1226eaeda11f432629baabccf5dee87f33 100644 (file)
--- 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;
        }