diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-04 03:29:06 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-04 03:29:06 +0000 |
| commit | 5fbfe75aa0cdf3a38b0e30a23156fa5affc33996 (patch) | |
| tree | ae9e5782776c39c8a179331d34eb7956b1273802 /src/cgame/cg_main.c | |
| parent | 48342c98ae336ca268ddbf5acf66bfeb0b18a91b (diff) | |
* 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
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 13 |
1 files changed, 5 insertions, 8 deletions
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 |