Mod_FindNonSolidLocation now takes a radius and can output to a different vector...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index fcf885ca07489bfbe02b6c91890e4ce5d47057c5..9863aa3c75e07d65d63c4d19f98327c0b2b76a73 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -106,22 +106,22 @@ CL_ParseStartSoundPacket
 */
 void CL_ParseStartSoundPacket(int largesoundindex)
 {
 */
 void CL_ParseStartSoundPacket(int largesoundindex)
 {

-    vec3_t  pos;
-    int        channel, ent;
-    int        sound_num;
-    int        volume;
-    int        field_mask;
-    float      attenuation;
-       int             i;
+       vec3_t  pos;
+       int     channel, ent;
+       int     sound_num;
+       int     volume;
+       int     field_mask;
+       float   attenuation;
+       int             i;

 
 

-    field_mask = MSG_ReadByte();
+       field_mask = MSG_ReadByte();

 
 

-    if (field_mask & SND_VOLUME)
+       if (field_mask & SND_VOLUME)

                volume = MSG_ReadByte ();
        else
                volume = DEFAULT_SOUND_PACKET_VOLUME;
 
                volume = MSG_ReadByte ();
        else
                volume = DEFAULT_SOUND_PACKET_VOLUME;
 

-    if (field_mask & SND_ATTENUATION)
+       if (field_mask & SND_ATTENUATION)

                attenuation = MSG_ReadByte () / 64.0;
        else
                attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;
                attenuation = MSG_ReadByte () / 64.0;
        else
                attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;


@@ -153,7 +153,7 @@ void CL_ParseStartSoundPacket(int largesoundindex)
        for (i = 0;i < 3;i++)
                pos[i] = MSG_ReadCoord ();
 
        for (i = 0;i < 3;i++)
                pos[i] = MSG_ReadCoord ();
 

-    S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
+       S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);

 }
 
 /*
 }
 
 /*


@@ -1008,7 +1008,8 @@ void CL_ParseTempEntity (void)
        case TE_WIZSPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);
        case TE_WIZSPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+               CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2);

                CL_RunParticleEffect (pos, vec3_origin, 20, 30);
                S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
                break;
                CL_RunParticleEffect (pos, vec3_origin, 20, 30);
                S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
                break;


@@ -1016,7 +1017,8 @@ void CL_ParseTempEntity (void)
        case TE_KNIGHTSPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);
        case TE_KNIGHTSPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+               CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2);

                CL_RunParticleEffect (pos, vec3_origin, 226, 20);
                S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
                break;
                CL_RunParticleEffect (pos, vec3_origin, 226, 20);
                S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
                break;


@@ -1024,7 +1026,7 @@ void CL_ParseTempEntity (void)
        case TE_SPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);
        case TE_SPIKE:
                // spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                // LordHavoc: changed to spark shower
                CL_SparkShower(pos, vec3_origin, 15);
                if ( rand() % 5 )
                // LordHavoc: changed to spark shower
                CL_SparkShower(pos, vec3_origin, 15);
                if ( rand() % 5 )


@@ -1043,7 +1045,7 @@ void CL_ParseTempEntity (void)
        case TE_SPIKEQUAD:
                // quad spike hitting wall
                MSG_ReadVector(pos);
        case TE_SPIKEQUAD:
                // quad spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                // LordHavoc: changed to spark shower
                CL_SparkShower(pos, vec3_origin, 15);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
                // LordHavoc: changed to spark shower
                CL_SparkShower(pos, vec3_origin, 15);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);


@@ -1064,7 +1066,7 @@ void CL_ParseTempEntity (void)
        case TE_SUPERSPIKE:
                // super spike hitting wall
                MSG_ReadVector(pos);
        case TE_SUPERSPIKE:
                // super spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 30);
                if ( rand() % 5 )
                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 30);
                if ( rand() % 5 )


@@ -1083,7 +1085,7 @@ void CL_ParseTempEntity (void)
        case TE_SUPERSPIKEQUAD:
                // quad super spike hitting wall
                MSG_ReadVector(pos);
        case TE_SUPERSPIKEQUAD:
                // quad super spike hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 30);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 30);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);


@@ -1104,6 +1106,7 @@ void CL_ParseTempEntity (void)
        case TE_BLOOD:
                // blood puff
                MSG_ReadVector(pos);
        case TE_BLOOD:
                // blood puff
                MSG_ReadVector(pos);

+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                dir[0] = MSG_ReadChar ();
                dir[1] = MSG_ReadChar ();
                dir[2] = MSG_ReadChar ();
                dir[0] = MSG_ReadChar ();
                dir[1] = MSG_ReadChar ();
                dir[2] = MSG_ReadChar ();


@@ -1113,21 +1116,22 @@ void CL_ParseTempEntity (void)
        case TE_BLOOD2:
                // blood puff
                MSG_ReadVector(pos);
        case TE_BLOOD2:
                // blood puff
                MSG_ReadVector(pos);

+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                CL_BloodPuff(pos, vec3_origin, 10);
                break;
        case TE_SPARK:
                // spark shower
                MSG_ReadVector(pos);
                CL_BloodPuff(pos, vec3_origin, 10);
                break;
        case TE_SPARK:
                // spark shower
                MSG_ReadVector(pos);

+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                dir[0] = MSG_ReadChar ();
                dir[1] = MSG_ReadChar ();
                dir[2] = MSG_ReadChar ();
                count = MSG_ReadByte ();
                dir[0] = MSG_ReadChar ();
                dir[1] = MSG_ReadChar ();
                dir[2] = MSG_ReadChar ();
                count = MSG_ReadByte ();

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);

                CL_SparkShower(pos, dir, count);
                break;
        case TE_PLASMABURN:
                MSG_ReadVector(pos);
                CL_SparkShower(pos, dir, count);
                break;
        case TE_PLASMABURN:
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
                CL_PlasmaBurn(pos);
                break;
                CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
                CL_PlasmaBurn(pos);
                break;


@@ -1175,7 +1179,7 @@ void CL_ParseTempEntity (void)
        case TE_GUNSHOT:
                // bullet hitting wall
                MSG_ReadVector(pos);
        case TE_GUNSHOT:
                // bullet hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 15);
                break;
                // LordHavoc: changed to dust shower
                CL_SparkShower(pos, vec3_origin, 15);
                break;


@@ -1183,7 +1187,7 @@ void CL_ParseTempEntity (void)
        case TE_GUNSHOTQUAD:
                // quad bullet hitting wall
                MSG_ReadVector(pos);
        case TE_GUNSHOTQUAD:
                // quad bullet hitting wall
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                CL_SparkShower(pos, vec3_origin, 15);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
                break;
                CL_SparkShower(pos, vec3_origin, 15);
                CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
                break;


@@ -1191,7 +1195,7 @@ void CL_ParseTempEntity (void)
        case TE_EXPLOSION:
                // rocket explosion
                MSG_ReadVector(pos);
        case TE_EXPLOSION:
                // rocket explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_ParticleExplosion (pos);
                // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
                CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);
                CL_ParticleExplosion (pos);
                // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
                CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5);


@@ -1201,7 +1205,7 @@ void CL_ParseTempEntity (void)
        case TE_EXPLOSIONQUAD:
                // quad rocket explosion
                MSG_ReadVector(pos);
        case TE_EXPLOSIONQUAD:
                // quad rocket explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);


@@ -1210,7 +1214,7 @@ void CL_ParseTempEntity (void)
        case TE_EXPLOSION3:
                // Nehahra movie colored lighting explosion
                MSG_ReadVector(pos);
        case TE_EXPLOSION3:
                // Nehahra movie colored lighting explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);


@@ -1219,7 +1223,7 @@ void CL_ParseTempEntity (void)
        case TE_EXPLOSIONRGB:
                // colored lighting explosion
                MSG_ReadVector(pos);
        case TE_EXPLOSIONRGB:
                // colored lighting explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_ParticleExplosion (pos);
                color[0] = MSG_ReadByte() * (1.0 / 255.0);
                color[1] = MSG_ReadByte() * (1.0 / 255.0);
                CL_ParticleExplosion (pos);
                color[0] = MSG_ReadByte() * (1.0 / 255.0);
                color[1] = MSG_ReadByte() * (1.0 / 255.0);


@@ -1231,7 +1235,7 @@ void CL_ParseTempEntity (void)
        case TE_TAREXPLOSION:
                // tarbaby explosion
                MSG_ReadVector(pos);
        case TE_TAREXPLOSION:
                // tarbaby explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_BlobExplosion (pos);
 
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
                CL_BlobExplosion (pos);
 
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);


@@ -1241,13 +1245,13 @@ void CL_ParseTempEntity (void)
 
        case TE_SMALLFLASH:
                MSG_ReadVector(pos);
 
        case TE_SMALLFLASH:
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
                break;
 
        case TE_CUSTOMFLASH:
                MSG_ReadVector(pos);
                CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
                break;
 
        case TE_CUSTOMFLASH:
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                radius = MSG_ReadByte() * 8;
                velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
                color[0] = MSG_ReadByte() * (1.0 / 255.0);
                radius = MSG_ReadByte() * 8;
                velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
                color[0] = MSG_ReadByte() * (1.0 / 255.0);


@@ -1316,7 +1320,7 @@ void CL_ParseTempEntity (void)
        case TE_EXPLOSION2:
                // color mapped explosion
                MSG_ReadVector(pos);
        case TE_EXPLOSION2:
                // color mapped explosion
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                colorStart = MSG_ReadByte ();
                colorLength = MSG_ReadByte ();
                CL_ParticleExplosion2 (pos, colorStart, colorLength);
                colorStart = MSG_ReadByte ();
                colorLength = MSG_ReadByte ();
                CL_ParticleExplosion2 (pos, colorStart, colorLength);


@@ -1337,13 +1341,13 @@ void CL_ParseTempEntity (void)
                MSG_ReadVector(pos);
                MSG_ReadVector(dir);
                count = MSG_ReadByte ();
                MSG_ReadVector(pos);
                MSG_ReadVector(dir);
                count = MSG_ReadByte ();

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);

                CL_Tei_Smoke(pos, dir, count);
                break;
 
        case TE_TEI_BIGEXPLOSION:
                MSG_ReadVector(pos);
                CL_Tei_Smoke(pos, dir, count);
                break;
 
        case TE_TEI_BIGEXPLOSION:
                MSG_ReadVector(pos);

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);

                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
                CL_ParticleExplosion (pos);
                CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
                S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);


@@ -1353,7 +1357,7 @@ void CL_ParseTempEntity (void)
                MSG_ReadVector(pos);
                MSG_ReadVector(dir);
                count = MSG_ReadByte ();
                MSG_ReadVector(pos);
                MSG_ReadVector(dir);
                count = MSG_ReadByte ();

-               Mod_FindNonSolidLocation(pos, cl.worldmodel);
+               Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5);

                CL_Tei_PlasmaHit(pos, dir, count);
                CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
                break;
                CL_Tei_PlasmaHit(pos, dir, count);
                CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
                break;