Change gas grenade hallucination effects

* Fixed radius check to avoid sqrt
* Changed max effect to 10 seconds from 22s
* Minimum now 4s from 12s
* Client effect sped up to accommodate for the server side changes.
* Removed blinding flash effect for smoother transitions.

Author: ensiform

code/cgame/cg_view.c

@@ -401,7 +401,8 @@ static void CG_Q3F_GasEffect( void )
 			cg.gasTime = cg.gasEndTime;
 			memcpy( cg.gasColour, cg.gasEndColour, sizeof(cg.gasColour) );
 		}
-		cg.gasEndTime = cg.time + 3450 + ETF_random() * 3450;
+		// Speed up the effect cycle for the shorter 10s duration
+        cg.gasEndTime = cg.time + 1500 + ETF_random() * 1500;
 		if( (cg.time + 3450) >= gastime || cg.gasEndTime >= gastime )
 		{
 			// Effect is ending
@@ -420,7 +421,7 @@ static void CG_Q3F_GasEffect( void )
 			cg.gasEndColour[0] = ETF_random();
 			cg.gasEndColour[1] = ETF_random();
 			cg.gasEndColour[2] = ETF_random();
-			cg.gasEndColour[3] = 0.34 + ETF_random() * 0.3 * (((float)(gastime - cg.time)) / 20000);
+			cg.gasEndColour[3] = 0.34 + ETF_random() * 0.3 * (((float)(gastime - cg.time)) / 10000);
 			if( cg.gasEndColour[3] > 0.7f )
 				cg.gasEndColour[3] = 0.7f;
 
@@ -449,15 +450,15 @@ static void CG_Q3F_GasEffect( void )
 				}
 			}
 		}
-		cg.gasFlashTime = cg.time + 100;		// Long enough to assure a 'solid' flash
+		//cg.gasFlashTime = cg.time + 100;		// Long enough to assure a 'solid' flash
 	}
 
 		// Calculate a smooth transition from start to end
 	curr = 0.5 - 0.5 * sin( M_PI * (((float)(cg.gasEndTime - cg.time)) / ((float)(cg.gasEndTime - cg.gasTime)) - 0.5) );
 	for( index = 0; index < 4; index++ )		// Screen colour (used later in frame render)
 		cg.gasCurrColour[index] = cg.gasColour[index] + curr * (cg.gasEndColour[index] - cg.gasColour[index]);
-	if( cg.gasFlashTime > cg.time )
-		cg.gasCurrColour[3] = 1;		// "Flash" the screen to opaque this frame
+	//if( cg.gasFlashTime > cg.time )
+	//	cg.gasCurrColour[3] = 1;		// "Flash" the screen to opaque this frame
 }
 
 // Golliwog: A pretty effect to handle 'vibration'.

code/game/g_q3f_grenades.c

@@ -681,16 +681,20 @@ void HallucinogenicBurnThink( gentity_t * gasgren )
 	gasgren->nextthink	= level.time + 300;
 }
 
+#define GASGREN_LIFETIME 6000
+#define GREN_GAS_RADIUS_SQ (GREN_GAS_RADIUS*GREN_GAS_RADIUS)
+
 
 void HallucinogenicExplodeThink( gentity_t *ent )
 {
 	//	Let's gas
 
 	gentity_t *player;
-	int distance, time;
+	int time;
+	float distanceSq;
 	vec3_t distancevec;
 
-	if( (ent->s.time + 6000) < level.time )
+	if( (ent->s.time + GASGREN_LIFETIME) < level.time )
 	{
 		G_FreeEntity( ent );
 		return;
@@ -702,8 +706,8 @@ void HallucinogenicExplodeThink( gentity_t *ent )
 		if( !(player->inuse && player->client && player->health > 0 && !Q3F_IsSpectator( player->client ) && !player->client->noclip) )
 			continue;
 		VectorSubtract( player->s.pos.trBase, ent->s.pos.trBase, distancevec );
-		distance = VectorLength( distancevec );
-		if ( distance >= GREN_GAS_RADIUS )
+		distanceSq = VectorLengthSquared( distancevec );
+		if ( distanceSq >= GREN_GAS_RADIUS_SQ )
 			continue;
 
 		if( player == ent->activator || level.friendlyFire == FF_Q3F_FULL || level.friendlyFire == FF_Q3F_HALF || !G_Q3F_IsAllied( ent->activator, player ) )
@@ -723,13 +727,15 @@ void HallucinogenicExplodeThink( gentity_t *ent )
 				// Gas them
 
 			time = player->client->ps.powerups[PW_Q3F_GAS] - level.time;
-			if( player->client->ps.persistant[PERS_CURRCLASS] == Q3F_CLASS_PARAMEDIC )
-				time /= 0.66;
-			time += 5000;
-			if( time < 12000 )
-				time = 12000;
-			if( time > 22000 )
-				time = 22000;
+			if (time < 0)
+				time = 0;
+			//if( player->client->ps.persistant[PERS_CURRCLASS] == Q3F_CLASS_PARAMEDIC )
+			//	time /= 0.66;
+			time += 2500;
+			if( time < 4000 )
+				time = 4000;
+			if( time > 10000 )
+				time = 10000;
 			if( player->client->ps.persistant[PERS_CURRCLASS] == Q3F_CLASS_PARAMEDIC )
 				time *= 0.66;
 			player->client->ps.powerups[PW_Q3F_GAS] = level.time + time;