summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_view.c7
-rw-r--r--src/cgame/cg_weapons.c7
2 files changed, 9 insertions, 5 deletions
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 3442f09b..712e5422 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -980,10 +980,9 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
}
}
- if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_DROIDS )
- {
- trap_R_AddAdditiveLightToScene( cg.predictedPlayerState.origin, 300, 0.4, 0.2, 0.0 );
- }
+ if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_DROIDS &&
+ cg.predictedPlayerState.persistant[PERS_TEAM] != TEAM_SPECTATOR )
+ trap_R_AddAdditiveLightToScene( cg.predictedPlayerState.origin, 500, 0.2, 0.2, 0.2 );
// actually issue the rendering calls
CG_DrawActive( stereoView );
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index a3a3d315..74a1ef6a 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -596,7 +596,12 @@ void CG_RegisterWeapon( int weaponNum ) {
weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/melee/fstatck.wav", qfalse );
break;
- case WP_ABUILD:
+ case WP_GRABANDCSAW:
+ MAKERGB( weaponInfo->flashDlightColor, 0, 0, 0 );
+ weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/melee/fstatck.wav", qfalse );
+ break;
+
+ case WP_DBUILD:
case WP_HBUILD:
case WP_SCANNER:
//nowt