Merge branch 'drjaska/mayhem' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / items / items.qc

diff --git a/qcsrc/client/items/items.qc b/qcsrc/client/items/items.qc
index 06135a9f2962591fd2b833d01aa164c85ef9e6ba..4c46ae0c4ae7d9455e6374ed944be6dfc3e9df12 100644 (file)
--- a/qcsrc/client/items/items.qc
+++ b/qcsrc/client/items/items.qc
@@ -1,8 +1,7 @@
 #include "items.qh"
 
-#include <common/items/_mod.qh>
-
 #include <client/main.qh>
+#include <common/items/_mod.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/weapons/_all.qh>
 #include <lib/csqcmodel/cl_model.qh>
@@ -136,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)
@@ -230,6 +229,8 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
         precache_model(this.mdl);
         _setmodel(this, this.mdl);
 
+        this.skin = ReadByte();
+
         setsize(this, '-16 -16 0', '16 16 48');
     }