* 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

4 files changed, 11 insertions, 19 deletions

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 6d062b1d..b9df770d 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1181,10 +1181,9 @@ typedef struct
   qhandle_t   sparkFlareShader;
 
   //TA: media used for armour switching stuff
-  qhandle_t helmetModel;
-  qhandle_t helmetSkin;
 
   //light armour
+  qhandle_t larmourHeadSkin;
   qhandle_t larmourLegsSkin;
   qhandle_t larmourTorsoSkin;
   
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 249b86c9..da6b5cba 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -737,7 +737,7 @@ static void CG_RegisterGraphics( void )
   cgs.media.greenBuildShader          = trap_R_RegisterShader("gfx/2d/greenbuild" );
   cgs.media.redBuildShader            = trap_R_RegisterShader("gfx/2d/redbuild" );
   cgs.media.noPowerShader             = trap_R_RegisterShader("gfx/2d/nopower" );
-  cgs.media.humanSpawningShader       = trap_R_RegisterShader("models/buildables/replicator/rep_cyl" );
+  cgs.media.humanSpawningShader       = trap_R_RegisterShader("models/buildables/telenode/rep_cyl" );
 
   cgs.media.machinegunBrassModel      = trap_R_RegisterModel( "models/weapons2/shells/m_shell.md3" );
   cgs.media.shotgunBrassModel         = trap_R_RegisterModel( "models/weapons2/shells/s_shell.md3" );
@@ -920,11 +920,9 @@ static void CG_RegisterClients( void )
     trap_UpdateScreen( );
   }
 
-  cgs.media.helmetModel        = trap_R_RegisterModel( "models/players/human_base/helmet.md3" );
-  cgs.media.helmetSkin         = trap_R_RegisterSkin( "models/players/human_base/helmet_default.skin" );
-
-  cgs.media.larmourLegsSkin    = trap_R_RegisterSkin( "models/players/sarge/lower_red.skin" );
-  cgs.media.larmourTorsoSkin   = trap_R_RegisterSkin( "models/players/sarge/upper_red.skin" );
+  cgs.media.larmourHeadSkin    = trap_R_RegisterSkin( "models/players/trooper/head_light.skin" );
+  cgs.media.larmourLegsSkin    = trap_R_RegisterSkin( "models/players/trooper/lower_light.skin" );
+  cgs.media.larmourTorsoSkin   = trap_R_RegisterSkin( "models/players/trooper/upper_light.skin" );
   
   cgs.media.jetpackModel       = trap_R_RegisterModel( "models/players/human_base/jetpack.md3" );
   cgs.media.jetpackFlashModel  = trap_R_RegisterModel( "models/players/human_base/jetpack_flash.md3" );
@@ -1634,7 +1632,6 @@ void CG_AssetCache( void )
   cgDC.Assets.sliderBar           = trap_R_RegisterShaderNoMip( ASSET_SLIDER_BAR );
   cgDC.Assets.sliderThumb         = trap_R_RegisterShaderNoMip( ASSET_SLIDER_THUMB );
 }
-//TA: FIXME: preliminary integration of CG TA UI stuff
 
 /*
 =================
@@ -1680,7 +1677,7 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
   //TA: moved up for LoadHudMenu
   String_Init( );
 
-  //TA: FIXME: TA UI
+  //TA: TA UI
   CG_AssetCache( );
   CG_LoadHudMenu( );      // load new hud stuff
 
diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c
index a96ec8db..62405d10 100644
--- a/src/cgame/cg_particles.c
+++ b/src/cgame/cg_particles.c
@@ -1558,8 +1558,8 @@ static void CG_GarbageCollectParticleSystems( void )
       ps->valid = qfalse;
 
     //check systems where the parent cent has left the PVS
-    //( centNum 0 - player entity, is always valid )
-    if( ps->attachment.centValid && ps->attachment.centNum != 0 )
+    //( local player entity is always valid )
+    if( ps->attachment.centValid && ps->attachment.centNum != cg.clientNum )
     {
       if( !cg_entities[ ps->attachment.centNum ].valid )
         ps->valid = qfalse;
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;