From 8306d64bfa116f0cab847cdd85bf9c2a53e59357 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Tue, 1 Mar 2011 07:07:04 +0000
Subject: [PATCH] No more teleportEffect

---
 reaction/code/cgame/cg_effects.c | 34 --------------------------------
 reaction/code/cgame/cg_local.h   |  3 ---
 reaction/code/cgame/cg_main.c    |  3 ---
 3 files changed, 40 deletions(-)

diff --git a/reaction/code/cgame/cg_effects.c b/reaction/code/cgame/cg_effects.c
index ebdb963d..6a733eca 100644
--- a/reaction/code/cgame/cg_effects.c
+++ b/reaction/code/cgame/cg_effects.c
@@ -324,40 +324,6 @@ localEntity_t *CG_SmokePuff(const vec3_t p, const vec3_t vel,
 	return le;
 }
 
-/*
-==================
-CG_SpawnEffect
-
-Player teleporting in or out
-==================
-*/
-void CG_SpawnEffect(vec3_t org)
-{
-	localEntity_t *le;
-	refEntity_t *re;
-
-	le = CG_AllocLocalEntity();
-	le->leFlags = 0;
-	le->leType = LE_FADE_RGB;
-	le->startTime = cg.time;
-	le->endTime = cg.time + 500;
-	le->lifeRate = 1.0 / (le->endTime - le->startTime);
-
-	le->color[0] = le->color[1] = le->color[2] = le->color[3] = 1.0;
-
-	re = &le->refEntity;
-
-	re->reType = RT_MODEL;
-	re->shaderTime = cg.time / 1000.0f;
-
-	re->customShader = cgs.media.teleportEffectShader;
-	re->hModel = cgs.media.teleportEffectModel;
-	AxisClear(re->axis);
-
-	VectorCopy(org, re->origin);
-	re->origin[2] -= 24;
-}
-
 /*
 ==================
 CG_ScorePlum
diff --git a/reaction/code/cgame/cg_local.h b/reaction/code/cgame/cg_local.h
index 0d6ba6ca..8d9e1b34 100644
--- a/reaction/code/cgame/cg_local.h
+++ b/reaction/code/cgame/cg_local.h
@@ -1407,8 +1407,6 @@ typedef struct {
 	qhandle_t bloodExplosionShader;
 
 	// special effects models
-	qhandle_t teleportEffectModel;
-	qhandle_t teleportEffectShader;
 // JBravo: moved out of MISSIONPACK
 	qhandle_t dustPuffShader;
 
@@ -2307,7 +2305,6 @@ localEntity_t *CG_SmokePuff(const vec3_t p,
 			    float r, float g, float b, float a,
 			    float duration, int startTime, int fadeInTime, int leFlags, qhandle_t hShader);
 void CG_BubbleTrail(vec3_t start, vec3_t end, float spacing);
-void CG_SpawnEffect(vec3_t org);
 void CG_ScorePlum(int client, vec3_t org, int score);
 void CG_DrawVisibleLaser( vec3_t origin, int clientNum, vec3_t dir);
 
diff --git a/reaction/code/cgame/cg_main.c b/reaction/code/cgame/cg_main.c
index 4d6087fb..8e84b290 100644
--- a/reaction/code/cgame/cg_main.c
+++ b/reaction/code/cgame/cg_main.c
@@ -2240,9 +2240,6 @@ static void CG_RegisterGraphics(void)
 	cgs.media.hitSparkModel = trap_R_RegisterModel("models/weaphits/tracer/tracer.md3");
 	cgs.media.hitSparkShader = trap_R_RegisterShader("models/weaphits/tracer/tracer");
 
-	cgs.media.teleportEffectModel = trap_R_RegisterModel("models/misc/telep.md3");
-	cgs.media.teleportEffectShader = trap_R_RegisterShader("teleportEffect");
-
 	cgs.media.invulnerabilityPowerupModel = trap_R_RegisterModel("models/powerups/shield/shield.md3");
 	//cgs.media.medalImpressive = trap_R_RegisterShaderNoMip("medal_impressive");
 	//cgs.media.medalExcellent = trap_R_RegisterShaderNoMip("medal_excellent");