diff options
| author | mtiusane <mtiusane@users.noreply.github.com> | 2015-04-03 19:24:01 +0300 |
|---|---|---|
| committer | mtiusane <mtiusane@users.noreply.github.com> | 2015-04-03 19:24:01 +0300 |
| commit | d22b446abfa0d98d7b69511d6c4bbe555d2cb7bf (patch) | |
| tree | 89d08c55bbd6ee8bcb035fa6226c6de9793d572d /src/cgame/cg_main.c | |
| parent | 216fc980dd8221198e491745a0eaa029c37f74d3 (diff) | |
| parent | 7f984114f2e19b0579e1d55e3c1a8925a88c35d0 (diff) | |
Merge pull request #24 from mtiusane/damage-feedback
Damage feedback
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 7ed3bfc..0fdb028 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -232,6 +232,12 @@ vmCvar_t cg_viewQuake; vmCvar_t cg_viewQuakeLambda; vmCvar_t cg_viewQuakeLimit; +vmCvar_t cg_damageBlobSize; +vmCvar_t cg_damageBlobAlpha; + +vmCvar_t cg_healthBarSize; +vmCvar_t cg_healthBarAlpha; + typedef struct { vmCvar_t *vmCvar; @@ -379,7 +385,13 @@ static cvarTable_t cvarTable[ ] = { &cg_viewQuake, "cg_viewQuake", "1", CVAR_ARCHIVE }, { &cg_viewQuakeLambda, "cg_viewQuakeLambda", "-10", CVAR_ARCHIVE }, - { &cg_viewQuakeLimit, "cg_viewQuakeLimit", "5", CVAR_ARCHIVE } + { &cg_viewQuakeLimit, "cg_viewQuakeLimit", "5", CVAR_ARCHIVE }, + + { &cg_damageBlobSize, "cg_damageBlobSize", "400", CVAR_ARCHIVE }, + { &cg_damageBlobAlpha, "cg_damageBlobAlpha", "0.8", CVAR_ARCHIVE }, + + { &cg_healthBarSize, "cg_healthBarSize", "2000", CVAR_ARCHIVE }, + { &cg_healthBarAlpha, "cg_healthBarAlpha", "0.5", CVAR_ARCHIVE } }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); @@ -769,6 +781,20 @@ static void CG_RegisterGraphics( void ) "gfx/2d/numbers/nine_32b", "gfx/2d/numbers/minus_32b", }; + static char *sb_nums_alt[ 11 ] = + { + "gfx/2d/numbers_alt/0", + "gfx/2d/numbers_alt/1", + "gfx/2d/numbers_alt/2", + "gfx/2d/numbers_alt/3", + "gfx/2d/numbers_alt/4", + "gfx/2d/numbers_alt/5", + "gfx/2d/numbers_alt/6", + "gfx/2d/numbers_alt/7", + "gfx/2d/numbers_alt/8", + "gfx/2d/numbers_alt/9", + "gfx/2d/numbers_alt/minus", + }; static char *buildWeaponTimerPieShaders[ 8 ] = { "ui/assets/neutral/1_5pie", @@ -791,6 +817,9 @@ static void CG_RegisterGraphics( void ) for( i = 0; i < 11; i++ ) cgs.media.numberShaders[ i ] = trap_R_RegisterShader( sb_nums[ i ] ); + for( i = 0; i < 11; i++ ) + cgs.media.numberShadersAlt[ i ] = trap_R_RegisterShader( sb_nums_alt[ i ] ); + cgs.media.viewBloodShader = trap_R_RegisterShader( "gfx/damage/fullscreen_painblend" ); cgs.media.connectionShader = trap_R_RegisterShader( "gfx/2d/net" ); |