diff options
| author | Paweł Redman <trem.redman@gmail.com> | 2013-09-12 23:34:27 +0200 |
|---|---|---|
| committer | Paweł Redman <trem.redman@gmail.com> | 2013-09-12 23:34:27 +0200 |
| commit | f49e84e3aba12104dce4103e647b33a94134c47a (patch) | |
| tree | 7120de44a55dd59619f3ff30eacc6322721a2726 /src/cgame | |
| parent | e36075a420f446225ae8632fb2df3cf2ad6bec47 (diff) | |
0.1.5
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 10 | ||||
| -rw-r--r-- | src/cgame/cg_local.h | 8 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 8fde56f..84c49a5 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -858,6 +858,8 @@ static void CG_DrawPlayerHealthCross( rectDef_t *rect, vec4_t ref_color ) // Pick the current icon shader = cgs.media.healthCross; + if( cg.snap->ps.stats[ STAT_STATE ] & SS_IMPLANTED ) + shader = cgs.media.healthCrossImplanted; if( cg.snap->ps.stats[ STAT_STATE ] & SS_HEALING_3X ) shader = cgs.media.healthCross3X; else if( cg.snap->ps.stats[ STAT_STATE ] & SS_HEALING_2X ) @@ -872,7 +874,13 @@ static void CG_DrawPlayerHealthCross( rectDef_t *rect, vec4_t ref_color ) // Pick the alpha value Vector4Copy( ref_color, color ); - if( cg.snap->ps.stats[ STAT_TEAM ] == TEAM_HUMANS && + if( cg.snap->ps.stats[ STAT_STATE ] & SS_IMPLANTED ) + { + color[ 0 ] = 0.0f; + color[ 1 ] = 0.8f; + color[ 2 ] = 0.0f; + } + else if( cg.snap->ps.stats[ STAT_TEAM ] == TEAM_HUMANS && cg.snap->ps.stats[ STAT_HEALTH ] < 10 ) { color[ 0 ] = 1.0f; diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 43e1701..2821bc4 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1347,7 +1347,8 @@ typedef struct qhandle_t healthCross3X; qhandle_t healthCrossMedkit; qhandle_t healthCrossPoisoned; - + qhandle_t healthCrossImplanted; + qhandle_t cuboidCracks[CUBOID_CRACK_TEXTURES-1]; qhandle_t cuboidModel; qhandle_t cuboidRedBuildShader; @@ -2183,13 +2184,14 @@ typedef enum // mod version data -#define MODVER_CURRENT 5 +#define MODVER_CURRENT 6 +#define MODVER_C2_0_1_5 6 #define MODVER_C2_0_1_4 5 #define MODVER_C2_0_1_3 4 #define MODVER_C2_0_1_2 3 #define MODVER_C2_0_1_1 2 #define MODVER_C2_0_1_0 1 -#define MODVER_TITLE "0.1.4 (Sep 12)" +#define MODVER_TITLE "0.1.5 (Sep 12)" diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 427a571..7157061 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -848,6 +848,7 @@ static void CG_RegisterGraphics( void ) cgs.media.healthCross3X = trap_R_RegisterShader( "ui/assets/neutral/cross3.tga" ); cgs.media.healthCrossMedkit = trap_R_RegisterShader( "ui/assets/neutral/cross_medkit.tga" ); cgs.media.healthCrossPoisoned = trap_R_RegisterShader( "ui/assets/neutral/cross_poison.tga" ); + cgs.media.healthCrossImplanted = trap_R_RegisterShader( "ui/assets/neutral/cross_implanted.tga" ); cgs.media.upgradeClassIconShader = trap_R_RegisterShader( "icons/icona_upgrade.tga" ); |