From: Mario <mario.mario@y7mail.com>
Date: Mon, 9 Dec 2019 14:25:07 +0000 (+1000)
Subject: Make simple items static, for consistency (ammo and weapons are visually the same... 
X-Git-Tag: xonotic-v0.8.5~1214
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=857b6344304717fe50ccd4f839297b37ae27ef7e

Make simple items static, for consistency (ammo and weapons are visually the same in simple mode, so making one bob and the other stationary is strange)
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 9d595b9591..7ef728df71 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -88,20 +88,18 @@ void ItemDraw(entity this)
             this.onground_time = time + 0.5;
         }
     }
-    else if (autocvar_cl_animate_items)
+    else if (autocvar_cl_animate_items && !this.item_simple) // no bobbing applied to simple items, for consistency's sake (no visual difference between ammo and weapons)
     {
         if(this.ItemStatus & ITS_ANIMATE1)
         {
-        	if(!this.item_simple)
-            	this.angles += this.avelocity * frametime;
+        	this.angles += this.avelocity * frametime;
             float fade_in = bound(0, time - this.onground_time, 1);
             setorigin(this, this.oldorigin + fade_in * ('0 0 10' + '0 0 8' * sin((time - this.onground_time) * 2)));
         }
 
         if(this.ItemStatus & ITS_ANIMATE2)
         {
-        	if(!this.item_simple)
-            	this.angles += this.avelocity * frametime;
+        	this.angles += this.avelocity * frametime;
             float fade_in = bound(0, time - this.onground_time, 1);
             setorigin(this, this.oldorigin + fade_in * ('0 0 8' + '0 0 4' * sin((time - this.onground_time) * 3)));
         }