From: terencehill <piuntn@gmail.com>
Date: Tue, 5 Oct 2021 16:39:41 +0000 (+0200)
Subject: Minor cleanups
X-Git-Tag: xonotic-v0.8.5~328
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eab30b8c16d2ff13b65b3a84fc9219f850844cab;p=xonotic%2Fxonotic-data.pk3dir.git

Minor cleanups
---

diff --git a/qcsrc/client/items/items.qc b/qcsrc/client/items/items.qc
index f94d36cf6..4c46ae0c4 100644
--- a/qcsrc/client/items/items.qc
+++ b/qcsrc/client/items/items.qc
@@ -135,9 +135,9 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
 
     if(sf & ISF_LOCATION)
     {
-        this.origin = ReadVector();
-        setorigin(this, this.origin);
-        this.oldorigin = this.origin;
+        vector org = ReadVector();
+        setorigin(this, org);
+        this.oldorigin = org;
     }
 
     if(sf & ISF_ANGLES)
@@ -229,7 +229,7 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
         precache_model(this.mdl);
         _setmodel(this, this.mdl);
 
-	this.skin = ReadByte();
+        this.skin = ReadByte();
 
         setsize(this, '-16 -16 0', '16 16 48');
     }
diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 6a77db8cc..d423337df 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -241,8 +241,7 @@ vector bobmodel_ofs(entity view)
 
 void viewmodel_animate(entity this)
 {
-	if (autocvar_chase_active) return;
-	if (STAT(HEALTH) <= 0) return;
+	if (autocvar_chase_active || STAT(HEALTH) <= 0) return;
 
 	entity view = CSQCModel_server2csqc(player_localentnum - 1);