reenabled CL_TeleportSplash (and removed a bogus parameter), reduced teleport light...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5056 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_parse.c b/cl_parse.c
index d7432e0c772d56c74c4d967dab562b6c4c629418..2e920c5de3c5dbc388d69929169c284d7249e017 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1257,8 +1257,8 @@ void CL_ParseTempEntity(void)
        case TE_TELEPORT:
                MSG_ReadVector(pos, cl.protocol);
                Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-               CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-//             CL_TeleportSplash(pos);
+               CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               CL_TeleportSplash(pos);
                break;
 
        case TE_EXPLOSION2:

diff --git a/cl_particles.c b/cl_particles.c
index 639f64e83a643399a5a61aeb95f4221e147b0df6..7280149ca3bf516148ab2c7250647062571a23e7 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -37,6 +37,7 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
 #define CL_ParseParticleEffect R_ParseParticleEffect
 #define CL_ParticleExplosion R_ParticleExplosion
 #define CL_ParticleExplosion2 R_ParticleExplosion2
+#define CL_TeleportSplash R_TeleportSplash
 #define CL_BlobExplosion R_BlobExplosion
 #define CL_RunParticleEffect R_RunParticleEffect
 #define CL_LavaSplash R_LavaSplash
@@ -1091,8 +1092,7 @@ CL_TeleportSplash
 
 ===============
 */
-#if WORKINGLQUAKE
-void R_TeleportSplash (vec3_t org)
+void CL_TeleportSplash (vec3_t org)
 {
        float i, j, k, inc;
        if (!cl_particles.integer) return;
@@ -1101,9 +1101,8 @@ void R_TeleportSplash (vec3_t org)
        for (i = -16;i < 16;i += inc)
                for (j = -16;j < 16;j += inc)
                        for (k = -24;k < 32;k += inc)
-                               particle(pt_static, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, PBLEND_ADD, 10, 10, inc * 32, inc * lhrandom(8, 16), inc * 32, 9999, 0, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 0, 0, 0, 0, 1, 0);
+                               particle(pt_static, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, PBLEND_ADD, 10, 10, inc * lhrandom(8, 16), inc * 32, 9999, 0, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 0, 0, 0, 0, 1, 0);
 }
-#endif
 
 #ifdef WORKINGLQUAKE
 void R_RocketTrail (vec3_t start, vec3_t end, int type)