Remove old/unused stuff

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 08847992870450fdc96adf37df3db21674ec100b..4081a5ced062b44296e88a7be90945d22c566bc2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -490,7 +490,7 @@ seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all
 set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
 set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM"
 
-seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
+seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage_threshold*"
 seta g_mirrordamage 0.700000   "for teamplay 4: mirror damage factor"
 seta g_mirrordamage_virtual 1  "for teamplay 4: do not actually apply mirror damage, just show graphics effect for it"
 seta g_friendlyfire 0.500000   "for teamplay 4: fiendly fire factor"
@@ -511,8 +511,6 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 1      "serverside footstep sounds"
 
-set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"
-
 set g_multijump 0      "Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps"
 set g_multijump_add 0  "0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"
 set g_multijump_speed -999999  "Minimum vertical speed a player must have in order to jump again"

diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh
index cfab348ed65862fd746eb5778058b9599d4105e0..bd75795bbc0cf633cdc0f4ef2c6ee66ccf7b0ad6 100644 (file)
--- a/qcsrc/menu/draw.qh
+++ b/qcsrc/menu/draw.qh
@@ -38,7 +38,5 @@ vector boxToGlobalSize(vector v, vector scale);
 vector globalToBox(vector v, vector shift, vector scale);
 vector globalToBoxSize(vector v, vector scale);
 
-float draw_NeedResizeNotify;
-
 float draw_TextWidth_WithColors(string s, vector size);
 float draw_TextWidth_WithoutColors(string s, vector size);

diff --git a/qcsrc/menu/item/container.c b/qcsrc/menu/item/container.c
index 091891a671a7c5c41e1e87f166b6c93c5575b815..8bc925f1ca1d8594c768d75f719dd15eaf238e54 100644 (file)
--- a/qcsrc/menu/item/container.c
+++ b/qcsrc/menu/item/container.c
@@ -317,8 +317,6 @@ void Container_addItem(entity me, entity other, vector theOrigin, vector theSize
        other.prevSibling = l;
        other.nextSibling = NULL;
        me.lastChild = other;
-
-       draw_NeedResizeNotify = 1;
 }
 
 void Container_removeItem(entity me, entity other)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f55c2658b77ff057a7573c1d098c8880313d31af..cf5722ca490965f5255e3af12aecd7b3a07889e3 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -544,7 +544,6 @@ void PutClientInServer (void)
                
                self.spider_slowness = 0;
 
-               self.statdraintime = time + 5;
                self.BUTTON_ATCK = self.BUTTON_JUMP = self.BUTTON_ATCK2 = 0;
 
                if(self.killcount == -666) {

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index b892e24f2b2f063b363d35ce453e1dfdbc62c49c..1c61de099193f90ab8bfdaacc326f02032cb3142 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -82,7 +82,6 @@ float server_is_dedicated;
 
 .float pain_finished;                  //Added by Supajoe
 .float pain_frame;                     //"
-.float statdraintime;                  // record the one-second intervals between draining health and armour when they're over 100
 .float  crouch;        // Crouching or not?
 
 .float strength_finished;
@@ -494,8 +493,6 @@ void ClientData_Touch(entity e);
 
 float servertime, serverprevtime, serverframetime;
 
-.entity soundentity;
-
 .float ammo_fuel;
 
 .vector prevorigin;