* Rather serious remote client particle system bug fixed

* Buildable overrides now actually work
* Helmet is now a skin replacement instead of model
* Model destinations fixed up in the entities.def file

1 files changed, 3 insertions, 7 deletions

diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index e5e2ec28..dd62695a 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2040,16 +2040,12 @@ void CG_Player( centity_t *cent )
     //
     // add the head
     //
+    head.hModel = ci->headModel;
+
     if( held & ( 1 << UP_HELMET ) )
-    {
-      head.hModel = cgs.media.helmetModel;
-      head.customSkin = cgs.media.helmetSkin;
-    }
+      head.customSkin = cgs.media.larmourHeadSkin;
     else
-    {
-      head.hModel = ci->headModel;
       head.customSkin = ci->headSkin;
-    }
     
     if( !head.hModel )
       return;