diff --git a/include/glquake.h b/include/glquake.h
index 06d70a5..2a16bea 100644
--- a/include/glquake.h
+++ b/include/glquake.h
@@ -296,12 +296,14 @@ void R_RotateForEntity (entity_t *e);
 // gl_rlight.c
 //
 
+extern float bubble_sintable[17], bubble_costable[17];
 extern float v_blend[4];
 
 void R_MarkLights (dlight_t *light, int bit, mnode_t *node);
 void R_AnimateLight (void);
 void R_RenderDlights (void);
 int R_LightPoint (vec3_t p);
+void AddLightBlend (float, float, float, float);
 
 //
 // gl_refrag.c
diff --git a/include/render.h b/include/render.h
index 6619c96..90d0eca 100644
--- a/include/render.h
+++ b/include/render.h
@@ -136,7 +136,7 @@ void R_NewMap (void);
 
 void R_ParseParticleEffect (void);
 void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
-void R_RocketTrail (vec3_t start, vec3_t end, int type);
+void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent);
 
 void R_EntityParticles (entity_t *ent);
 void R_BlobExplosion (vec3_t org);
diff --git a/source/cl_ents.c b/source/cl_ents.c
index f767f91..0f94138 100644
--- a/source/cl_ents.c
+++ b/source/cl_ents.c
@@ -557,24 +557,24 @@ void CL_LinkPacketEntities (void)
 			}
 		if (model->flags & EF_ROCKET)
 		{
-			R_RocketTrail (old_origin, ent->origin, 0);
+			R_RocketTrail (old_origin, ent->origin, 0, ent);
 			dl = CL_AllocDlight (s1->number);
 			VectorCopy (ent->origin, dl->origin);
 			dl->radius = 200;
 			dl->die = cl.time + 0.1;
 		}
 		else if (model->flags & EF_GRENADE)
-			R_RocketTrail (old_origin, ent->origin, 1);
+			R_RocketTrail (old_origin, ent->origin, 1, ent);
 		else if (model->flags & EF_GIB)
-			R_RocketTrail (old_origin, ent->origin, 2);
+			R_RocketTrail (old_origin, ent->origin, 2, ent);
 		else if (model->flags & EF_ZOMGIB)
-			R_RocketTrail (old_origin, ent->origin, 4);
+			R_RocketTrail (old_origin, ent->origin, 4, ent);
 		else if (model->flags & EF_TRACER)
-			R_RocketTrail (old_origin, ent->origin, 3);
+			R_RocketTrail (old_origin, ent->origin, 3, ent);
 		else if (model->flags & EF_TRACER2)
-			R_RocketTrail (old_origin, ent->origin, 5);
+			R_RocketTrail (old_origin, ent->origin, 5, ent);
 		else if (model->flags & EF_TRACER3)
-			R_RocketTrail (old_origin, ent->origin, 6);
+			R_RocketTrail (old_origin, ent->origin, 6, ent);
 	}
 }
 
diff --git a/source/gl_part.c b/source/gl_part.c
index e2ab9c1..c772789 100644
--- a/source/gl_part.c
+++ b/source/gl_part.c
@@ -73,7 +73,8 @@ int			r_numparticles;
 
 vec3_t			r_pright, r_pup, r_ppn;
 
-fire_t		r_firs[MAX_FIRES];
+fire_t		r_fires[MAX_FIRES];
+extern cvar_t	*gl_fires;
 
 /*
 ===============
@@ -381,7 +382,7 @@ void R_TeleportSplash (vec3_t org)
 			}
 }
 
-void R_RocketTrail (vec3_t start, vec3_t end, int type)
+void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 {
 	vec3_t	vec;
 	float	len;
@@ -653,7 +654,7 @@ R_AddFire (vec3_t start, vec3_t end, entity_t *ent)
 
 	VectorSubtract (end, start, vec);
 	len = VectorNormalize (vec);
-	key = ent-cl_entities+1;
+	key = ent-cl_visedicts+1;
 
 	if (len)
 	{
diff --git a/source/r_part.c b/source/r_part.c
index 8eb2511..b28a56d 100644
--- a/source/r_part.c
+++ b/source/r_part.c
@@ -360,7 +360,7 @@ void R_TeleportSplash (vec3_t org)
 			}
 }
 
-void R_RocketTrail (vec3_t start, vec3_t end, int type)
+void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 {
 	vec3_t	vec;
 	float	len;