diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
| commit | 7c02e34b08a4e44a7f7935bf6b1bee45c3a8df6c (patch) | |
| tree | e3ff69394522a6cc7dd11edf27cd69df6c0a5819 /src/cgame/cg_main.c | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 3985834..7ed3bfc 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -226,7 +226,11 @@ vmCvar_t cg_chatTeamPrefix; vmCvar_t cg_drawBubble; vmCvar_t cg_BubbleZoom; -vmCvar_t cg_EDGEFPSFIX; +vmCvar_t cg_EDGEFPSFIX; + +vmCvar_t cg_viewQuake; +vmCvar_t cg_viewQuakeLambda; +vmCvar_t cg_viewQuakeLimit; typedef struct { @@ -371,7 +375,11 @@ static cvarTable_t cvarTable[ ] = // { &cg_chatTeamPrefix, "cg_chatTeamPrefix", "1", CVAR_ARCHIVE} { &cg_chatTeamPrefix, "cg_chatTeamPrefix", "1", CVAR_ARCHIVE}, - { &cg_EDGEFPSFIX, "cg_EDGEFPSFIX", "0", CVAR_ARCHIVE|CVAR_USERINFO } + { &cg_EDGEFPSFIX, "cg_EDGEFPSFIX", "0", CVAR_ARCHIVE|CVAR_USERINFO }, + + { &cg_viewQuake, "cg_viewQuake", "1", CVAR_ARCHIVE }, + { &cg_viewQuakeLambda, "cg_viewQuakeLambda", "-10", CVAR_ARCHIVE }, + { &cg_viewQuakeLimit, "cg_viewQuakeLimit", "5", CVAR_ARCHIVE } }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); @@ -827,6 +835,8 @@ static void CG_RegisterGraphics( void ) cgs.media.alienNoBPFlash = trap_R_RegisterShader( "ui/assets/alien/nobp_flash.tga" ); cgs.media.humanNoBPFlash = trap_R_RegisterShader( "ui/assets/human/nobp_flash.tga" ); + cgs.media.lightningBeam = trap_R_RegisterShader( "gfx/lightning/beam" ); + cgs.media.disconnectPS = CG_RegisterParticleSystem( "disconnectPS" ); CG_UpdateMediaFraction( 0.7f ); @@ -870,6 +880,8 @@ static void CG_RegisterGraphics( void ) cgs.media.humanWoundsBleedPS = CG_RegisterParticleSystem( "humanWoundBleedPS" ); cgs.media.headShotPS = CG_RegisterParticleSystem( "headShotPS" ); + cgs.media.lightningImpactPS = CG_RegisterParticleSystem( "models/weapons/lightning/impactPS" ); + CG_BuildableStatusParse( "ui/assets/human/buildstat.cfg", &cgs.humanBuildStat ); CG_BuildableStatusParse( "ui/assets/alien/buildstat.cfg", &cgs.alienBuildStat ); |