From 857b6344304717fe50ccd4f839297b37ae27ef7e Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 10 Dec 2019 00:25:07 +1000 Subject: [PATCH] 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) --- qcsrc/common/t_items.qc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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))); } -- 2.39.2