summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_local.h4
-rw-r--r--src/cgame/cg_main.c5
-rw-r--r--src/cgame/cg_players.c8
3 files changed, 4 insertions, 13 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 435de800..0ddf6574 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -937,10 +937,8 @@ typedef struct
qhandle_t helmetModel;
qhandle_t helmetSkin;
+ //light armour
qhandle_t larmourLegsSkin;
-
- qhandle_t carmourTorsoSkin;
- qhandle_t clarmourTorsoSkin;
qhandle_t larmourTorsoSkin;
qhandle_t jetpackModel;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index d651f329..f41de737 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -884,10 +884,7 @@ static void CG_RegisterClients( void )
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.carmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_krusade.skin" );
- cgs.media.clarmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_roderic.skin" );
- cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_blue.skin" );
+ cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_red.skin" );
cgs.media.jetpackModel = trap_R_RegisterModel( "models/players/human_base/jetpack.md3" );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index 7d49ae2f..4bfd4969 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2031,7 +2031,7 @@ void CG_Player( centity_t *cent )
{
legs.hModel = ci->legsModel;
- if( held & ( 1 << UP_LIMBARMOUR ) )
+ if( held & ( 1 << UP_LIGHTARMOUR ) )
legs.customSkin = cgs.media.larmourLegsSkin;
else
legs.customSkin = ci->legsSkin;
@@ -2096,11 +2096,7 @@ void CG_Player( centity_t *cent )
//
torso.hModel = ci->torsoModel;
- if( ( held & ( 1 << UP_LIMBARMOUR ) ) && ( held & ( 1 << UP_CHESTARMOUR ) ) )
- torso.customSkin = cgs.media.clarmourTorsoSkin;
- else if( held & ( 1 << UP_CHESTARMOUR ) )
- torso.customSkin = cgs.media.carmourTorsoSkin;
- else if( held & ( 1 << UP_LIMBARMOUR ) )
+ if( held & ( 1 << UP_LIGHTARMOUR ) )
torso.customSkin = cgs.media.larmourTorsoSkin;
else
torso.customSkin = ci->torsoSkin;