Merge branch 'newguns'

Conflicts:
	src/cgame/cg_local.h
	src/cgame/cg_main.c

1 files changed, 12 insertions, 0 deletions

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 10e89fd..ab3e9e6 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -787,6 +787,7 @@ typedef struct weaponInfoMode_s
   vec3_t      flashDlightColor;
   sfxHandle_t flashSound[ 4 ];  // fast firing weapons randomly choose
   qboolean    continuousFlash;
+  float       flashQuake;
 
   qhandle_t   missileModel;
   sfxHandle_t missileSound;
@@ -816,6 +817,7 @@ typedef struct weaponInfoMode_s
   qhandle_t   impactMarkSize;
   sfxHandle_t impactSound[ 4 ]; //random impact sound
   sfxHandle_t impactFleshSound[ 4 ]; //random impact sound
+  float       impactQuake;
 } weaponInfoMode_t;
 
 // each WP_* weapon enum has an associated weaponInfo_t
@@ -1159,6 +1161,8 @@ typedef struct
   int           nearUsableBuildable;
   
   int           nextWeaponClickTime;
+
+  float         viewQuake;
 } cg_t;
 
 
@@ -1341,6 +1345,9 @@ typedef struct
   qhandle_t   humanBuildPoolBar;
   qhandle_t   alienNoBPFlash;
   qhandle_t   humanNoBPFlash;
+
+  qhandle_t   lightningBeam;
+  qhandle_t   lightningImpactPS;
 } cgMedia_t;
 
 typedef struct
@@ -1595,6 +1602,10 @@ extern  vmCvar_t    cg_chatTeamPrefix;
 extern  vmCvar_t    cg_drawBubble;
 extern  vmCvar_t    cg_BubbleZoom;
 
+extern  vmCvar_t    cg_viewQuake;
+extern  vmCvar_t    cg_viewQuakeLambda;
+extern  vmCvar_t    cg_viewQuakeLimit;
+
 //
 // cg_main.c
 //
@@ -1636,6 +1647,7 @@ void        CG_TestModelNextSkin_f( void );
 void        CG_TestModelPrevSkin_f( void );
 void        CG_AddBufferedSound( sfxHandle_t sfx );
 void        CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demoPlayback );
+void        CG_InduceViewQuake( vec3_t src, float mag );
 void        CG_OffsetFirstPersonView( void );
 void        CG_OffsetThirdPersonView( void );
 void        CG_OffsetShoulderView( void );