diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_local.h | 2 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index f090e928..9bdcb3b9 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1533,6 +1533,8 @@ extern vmCvar_t cg_projectileNudge; extern vmCvar_t cg_voice; +extern vmCvar_t cg_emoticons; + // // cg_main.c // diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index b239236d..9a40a5c3 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -214,6 +214,8 @@ vmCvar_t cg_projectileNudge; vmCvar_t cg_voice; +vmCvar_t cg_emoticons; + typedef struct { @@ -336,7 +338,9 @@ static cvarTable_t cvarTable[ ] = { &pmove_msec, "pmove_msec", "8", 0}, { &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE}, - { &cg_voice, "voice", "default", CVAR_USERINFO|CVAR_ARCHIVE} + { &cg_voice, "voice", "default", CVAR_USERINFO|CVAR_ARCHIVE}, + + { &cg_emoticons, "cg_emoticons", "1", CVAR_LATCH|CVAR_ARCHIVE} }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); @@ -1663,6 +1667,8 @@ void CG_LoadHudMenu( void ) void CG_AssetCache( void ) { + int i; + cgDC.Assets.gradientBar = trap_R_RegisterShaderNoMip( ASSET_GRADIENTBAR ); cgDC.Assets.scrollBar = trap_R_RegisterShaderNoMip( ASSET_SCROLLBAR ); cgDC.Assets.scrollBarArrowDown = trap_R_RegisterShaderNoMip( ASSET_SCROLLBAR_ARROWDOWN ); @@ -1672,6 +1678,17 @@ void CG_AssetCache( void ) cgDC.Assets.scrollBarThumb = trap_R_RegisterShaderNoMip( ASSET_SCROLL_THUMB ); cgDC.Assets.sliderBar = trap_R_RegisterShaderNoMip( ASSET_SLIDER_BAR ); cgDC.Assets.sliderThumb = trap_R_RegisterShaderNoMip( ASSET_SLIDER_THUMB ); + + if( cg_emoticons.integer ) + cgDC.Assets.emoticonCount = BG_LoadEmoticons( cgDC.Assets.emoticons ); + else + cgDC.Assets.emoticonCount = 0; + + for( i = 0; i < cgDC.Assets.emoticonCount; i++ ) + { + cgDC.Assets.emoticonShaders[ i ] = trap_R_RegisterShaderNoMip( + va( "emoticons/%s.tga", cgDC.Assets.emoticons[ i ] ) ); + } } /* |