diff options
| author | Paweł Redman <trem.redman@gmail.com> | 2013-09-13 09:21:57 +0200 |
|---|---|---|
| committer | Paweł Redman <trem.redman@gmail.com> | 2013-09-13 09:21:57 +0200 |
| commit | 09460bd0361b0ad85ea890de6780476cc5fd8a16 (patch) | |
| tree | c7764a42cc60af71aefe67b2562c95f7ab556812 /src | |
| parent | f49e84e3aba12104dce4103e647b33a94134c47a (diff) | |
Missing cross_implanted.tga, proper Helmet texture and mara zap bugfix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 1 | ||||
| -rw-r--r-- | src/cgame/cg_players.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
4 files changed, 5 insertions, 2 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; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 434a0ff..a44a306 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -90,7 +90,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_AREAZAP_REPEAT 1500 #define LEVEL2_AREAZAP_TIME 1000 #define LEVEL2_AREAZAP_MAX_TARGETS 5 -#define LEVEL2_AREAZAP_DMG_MOD 0.66f //versus buildings +#define LEVEL2_AREAZAP_DMG_MOD 1 //versus buildings #define LEVEL2_WALLJUMP_MAXSPEED 1000.0f #define LEVEL3_CLAW_DMG ADM(80) |