nzp-team/glquake
0
0
Fork 0
mirror of https://github.com/nzp-team/glquake.git synced 2025-02-15 00:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly re-direct cl_tent to QMB; Add defines for TE_RAYSPLASH

Browse source
This commit is contained in:
Steam Deck User 2022-12-28 14:58:22 -05:00
parent 8b40a3e8dd
commit d2147b6e35
3 changed files with 67 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
source/cl_tent.c
View file

@ -161,6 +161,37 @@ void CL_ParseTEnt (void)
dl->die = cl.time + 0.5;
dl->decay = 300;
break;
case TE_RAYSPLASHGREEN:
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
dl = CL_AllocDlight (0);
VectorCopy (pos, dl->origin);
dl->radius = 65;
dl->die = cl.time + 0.3;
dl->decay = 300;
dl->color[0] = 0;
dl->color[1] = 255;
dl->color[2] = 0;
R_RunParticleEffect (pos, vec3_origin, 0, 256);
//S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 0.5); // NZPFIXME - add raygun hum
break;
case TE_RAYSPLASHRED:
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
dl = CL_AllocDlight (0);
VectorCopy (pos, dl->origin);
dl->radius = 65;
dl->die = cl.time + 0.3;
dl->decay = 300;
dl->color[0] = 255;
dl->color[1] = 0;
dl->color[2] = 0;
R_RunParticleEffect (pos, vec3_origin, 0, 512);
//S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 0.5); // NZPFIXME - add raygun hum
break;
case TE_TAREXPLOSION: // tarbaby explosion
pos[0] = MSG_ReadCoord ();
@ -214,32 +245,6 @@ void CL_ParseTEnt (void)
dl->die = cl.time + 0.5;
dl->decay = 300;
break;
#ifdef QUAKE2
case TE_IMPLOSION:
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
break;
case TE_RAILTRAIL:
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
endpos[0] = MSG_ReadCoord ();
endpos[1] = MSG_ReadCoord ();
endpos[2] = MSG_ReadCoord ();
S_StartSound (-1, 0, cl_sfx_rail, pos, 1, 1);
S_StartSound (-1, 1, cl_sfx_r_exp3, endpos, 1, 1);
R_RocketTrail (pos, endpos, 0+128);
R_ParticleExplosion (endpos);
dl = CL_AllocDlight (-1);
VectorCopy (endpos, dl->origin);
dl->radius = 350;
dl->die = cl.time + 0.5;
dl->decay = 300;
break;
#endif
default:
Sys_Error ("CL_ParseTEnt: bad type");

6
source/protocol.h
View file

@ -182,7 +182,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TE_BEAM 13
// PGM 01/21/97
#ifdef QUAKE2
#define TE_IMPLOSION 14
#define TE_RAILTRAIL 15
#endif
#define TE_RAYSPLASHGREEN 14
#define TE_RAYSPLASHRED 15

34
source/r_part.c
View file

@ -403,7 +403,41 @@ R_RunParticleEffect
===============
*/
#define RunParticleEffect(var, org, dir, color, count) \
if (qmb_initialized) \
QMB_RunParticleEffect (org, dir, color, count); \
else \
Run_Classic_ParticleEffect (org, dir, color, count);
void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
{
if (color == 73 || color == 225)
{
RunParticleEffect(/*blood*/0, org, dir, color, count);
return;
}
switch (count)
{
case 10:
case 20:
case 30:
RunParticleEffect(/*sparks*/0, org, dir, color, count);
break;
default:
RunParticleEffect(/*gunshots*/0, org, dir, color, count);
}
}
/*
===============
Run_Classic_ParticleEffect
===============
*/
void Run_Classic_ParticleEffect (vec3_t org, vec3_t dir, int color, int count)
{
int i, j;
particle_t *p;