Merge branch 'master' into terencehill/directmenu_options

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b43b67656c1ddbdb35a1c24ee6a4d06047cebac0..35eaad6ddab9bb6886386cfc75b3fd99df405bb2 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -17,10 +17,11 @@
 
 float  autocvar_cl_ghost_items;
 vector autocvar_cl_ghost_items_color;
-float  autocvar_cl_simple_items;
 float  autocvar_cl_fullbright_items;
 vector autocvar_cl_staywep_color;
 float  autocvar_cl_staywep_alpha;
+float  autocvar_cl_simple_items;
+float  cl_simple_items;
 
 .float  spawntime;
 .float  gravity;
@@ -130,7 +131,7 @@ void ItemRead(float _IsNew)
         self.mdl = "";
         string _fn = ReadString();
         
-        if(autocvar_cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
+        if(cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
         {
             string _fn2 = substring(_fn, 0 , strlen(_fn) -4);
                         
@@ -166,7 +167,6 @@ void ItemRead(float _IsNew)
     
     if(sf & ISF_DROP)
     {
-        self.effects |= EF_FLAME;
         self.gravity = 1;
         self.move_movetype = MOVETYPE_TOSS;
         self.move_velocity_x = ReadCoord();