summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_local.h1
-rw-r--r--src/cgame/cg_main.c1
-rw-r--r--src/cgame/cg_players.c3
3 files changed, 4 insertions, 1 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 2821bc4..a8316c5 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1308,6 +1308,7 @@ typedef struct
qhandle_t larmourLegsSkin;
qhandle_t larmourTorsoSkin;
+ qhandle_t headMk2Model;
qhandle_t jetpackModel;
qhandle_t jetpackFlashModel;
qhandle_t battpackModel;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 7157061..c1c7a0d 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1002,6 +1002,7 @@ static void CG_RegisterClients( void )
cgs.media.larmourLegsSkin = trap_R_RegisterSkin( "models/players/human_base/lower_light.skin" );
cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/human_base/upper_light.skin" );
+ cgs.media.headMk2Model = trap_R_RegisterModel( "models/players/human_base/head_mk2.md3" );
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" );
cgs.media.battpackModel = trap_R_RegisterModel( "models/players/human_base/battpack.md3" );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index 03601f6..99f9f9e 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2094,7 +2094,8 @@ void CG_Player( centity_t *cent )
if( held & ( 1 << UP_HELMET_MK1 ) )
head.customSkin = cgs.media.larmourHeadSkin;
else if( held & ( 1 << UP_HELMET_MK2 ) )
- head.customSkin = cgs.media.larmourMk2HeadSkin;
+ head.customSkin = cgs.media.larmourMk2HeadSkin,
+ head.hModel = cgs.media.headMk2Model; //hack
else
head.customSkin = ci->headSkin;