[Quake2world-dev] r515 - quake2world/trunk/src

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-06-03 03:02:12 +0000 (Wed, 03 Jun 2009)
New Revision: 515

Modified:
   quake2world/trunk/src/cl_effect.c
   quake2world/trunk/src/cl_tentity.c
   quake2world/trunk/src/r_lightmap.c
Log:
Various effect tweaks.

Modified: quake2world/trunk/src/cl_effect.c
===================================================================
--- quake2world/trunk/src/cl_effect.c	2009-06-02 09:54:23 UTC (rev 514)
+++ quake2world/trunk/src/cl_effect.c	2009-06-03 03:02:12 UTC (rev 515)
@@ -243,6 +243,26 @@
 	p->alpha = 2.0;
 	p->alphavel = -1.0 / (2.0 + frand() * 0.3);
 
+	if(!(p = Cl_AllocParticle()))
+		return;
+
+	VectorCopy(org, p->org);
+
+	VectorScale(dir, 200.0, p->vel);
+
+	if(p->vel[2] < 100.0)  // deflect up a bit
+		p->vel[2] = 100.0;
+
+	p->accel[2] -= 4.0 * PARTICLE_GRAVITY;
+
+	p->color = 221 + (rand() & 7);
+
+	p->scale = 1.5;
+	p->scalevel = -4.0;
+
+	p->alpha = 1.0;
+	p->alphavel = -1.0 / (0.7 + crand() * 0.1);
+
 	VectorAdd(org, dir, v);
 	R_AddSustainedLight(v, 0.15, bullet_light, 0.25);
 }
@@ -492,10 +512,10 @@
 	p->image = r_explosiontexture;
 
 	p->scale = 1.0;
-	p->scalevel = 400.0;
+	p->scalevel = 600.0;
 
 	p->alpha = 1.0;
-	p->alphavel = -3.0;
+	p->alphavel = -4.0;
 
 	p->color = 224;
 
@@ -869,6 +889,21 @@
 
 		VectorCopy(p->org, move);
 	}
+
+	if(!(p = Cl_AllocParticle()))
+		return;
+
+	p->image = r_explosiontexture;
+
+	p->scale = 1.0;
+	p->scalevel = 400.0;
+
+	p->alpha = 2.0;
+	p->alphavel = -10.0;
+
+	p->color = color;
+
+	VectorCopy(end, p->org);
 }
 
 

Modified: quake2world/trunk/src/cl_tentity.c
===================================================================
--- quake2world/trunk/src/cl_tentity.c	2009-06-02 09:54:23 UTC (rev 514)
+++ quake2world/trunk/src/cl_tentity.c	2009-06-03 03:02:12 UTC (rev 515)
@@ -141,7 +141,7 @@
 			VectorSubtract(pos2, pos, dir);
 			VectorNormalize(dir);
 			VectorMA(pos2, -12.0, dir, pos2);
-			R_AddSustainedLight(pos2, 1.0, light, 0.75);
+			R_AddSustainedLight(pos2, 1.5, light, 1.25);
 			break;
 
 		case TE_EXPLOSION:  // rocket and grenade explosions

Modified: quake2world/trunk/src/r_lightmap.c
===================================================================
--- quake2world/trunk/src/r_lightmap.c	2009-06-02 09:54:23 UTC (rev 514)
+++ quake2world/trunk/src/r_lightmap.c	2009-06-03 03:02:12 UTC (rev 515)
@@ -522,7 +522,7 @@
 }
 
 
-#define STATIC_LIGHTING_INTERVAL 0.2
+#define STATIC_LIGHTING_INTERVAL 0.1
 
 /*
  * R_LightPointLerp
@@ -571,7 +571,7 @@
 	// do the trace
 	VectorCopy(lighting->origin, start);
 	VectorCopy(lighting->origin, end);
-	end[2] -= 256.0;
+	end[2] -= 512.0;
 
 	R_Trace(start, end, 0.0, MASK_SOLID);