tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix c++isms. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6043 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-08-27 04:29:25 +00:00
parent da46f65679
commit a8d606e042
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_parse.c
View File

@ -4774,7 +4774,7 @@ static void CL_ParseStaticProt (int baselinetype)
} }
cl_static_entities[i].mdlidx = es.modelindex; cl_static_entities[i].mdlidx = es.modelindex;
cl_static_entities[i].emit = NULL; cl_static_entities[i].emit = trailkey_null;
cl_static_entities[i].state = es; cl_static_entities[i].state = es;
ent = &cl_static_entities[i].ent; ent = &cl_static_entities[i].ent;

4
engine/client/cl_tent.c
View File

@ -1065,8 +1065,8 @@ void CL_ParseStream (int type)
P_DelinkTrailstate(&b2->trailstate); P_DelinkTrailstate(&b2->trailstate);
P_DelinkTrailstate(&b2->emitstate); P_DelinkTrailstate(&b2->emitstate);
memcpy(b2, b, sizeof(*b2)); memcpy(b2, b, sizeof(*b2));
b2->trailstate = NULL; b2->trailstate = trailkey_null;
b2->emitstate = NULL; b2->emitstate = trailkey_null;
b2->alpha = 0.5; b2->alpha = 0.5;
b2->rflags = RF_TRANSLUCENT|RF_NOSHADOW; b2->rflags = RF_TRANSLUCENT|RF_NOSHADOW;
} }

6
engine/client/p_script.c
View File

@ -4159,7 +4159,7 @@ static void PScript_DelinkTrailstate(trailkey_t *tk)
} }
} }
static trailstate_t *P_NewTrailstate() static trailstate_t *P_NewTrailstate(void)
{ {
trailstate_t *ts; trailstate_t *ts;
@ -4954,7 +4954,7 @@ static int PScript_RunParticleEffectState (vec3_t org, vec3_t dir, float count,
p->rgba[3] += ptype->alpharand*frandom(); p->rgba[3] += ptype->alpharand*frandom();
// p->color = 0; // p->color = 0;
if (ptype->emittime < 0) if (ptype->emittime < 0)
p->state.trailstate = NULL; p->state.trailstate = trailkey_null;
else else
p->state.nextemit = particletime + ptype->emitstart - p->die; p->state.nextemit = particletime + ptype->emitstart - p->die;
@ -5787,7 +5787,7 @@ static void P_ParticleTrailSpawn (vec3_t startpos, vec3_t end, part_type_t *ptyp
VectorClear (p->vel); VectorClear (p->vel);
if (ptype->emittime < 0) if (ptype->emittime < 0)
p->state.trailstate = NULL; // init trailstate p->state.trailstate = trailkey_null; // init trailstate
else else
p->state.nextemit = particletime + ptype->emitstart - p->die; p->state.nextemit = particletime + ptype->emitstart - p->die;

4
engine/client/pr_csqc.c
View File

@ -1048,7 +1048,7 @@ static void QCBUILTIN PF_cs_makestatic (pubprogfuncs_t *prinst, struct globalvar
{ {
entity_state_t *state = &cl_static_entities[cl.num_statics].state; entity_state_t *state = &cl_static_entities[cl.num_statics].state;
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
cl_static_entities[cl.num_statics].emit = NULL; cl_static_entities[cl.num_statics].emit = trailkey_null;
cl_static_entities[cl.num_statics].mdlidx = in->v->modelindex; cl_static_entities[cl.num_statics].mdlidx = in->v->modelindex;
if (cl.worldmodel && cl.worldmodel->funcs.FindTouchedLeafs) if (cl.worldmodel && cl.worldmodel->funcs.FindTouchedLeafs)
cl.worldmodel->funcs.FindTouchedLeafs(cl.worldmodel, &cl_static_entities[cl.num_statics].ent.pvscache, in->v->absmin, in->v->absmax); cl.worldmodel->funcs.FindTouchedLeafs(cl.worldmodel, &cl_static_entities[cl.num_statics].ent.pvscache, in->v->absmin, in->v->absmax);
@ -3672,7 +3672,7 @@ void CSQC_ResetTrails(void)
for (i = 0; i < *prinst->parms->num_edicts; i++) for (i = 0; i < *prinst->parms->num_edicts; i++)
{ {
ent = (csqcedict_t*)EDICT_NUM_PB(prinst, i); ent = (csqcedict_t*)EDICT_NUM_PB(prinst, i);
ent->trailstate = NULL; ent->trailstate = trailkey_null;
} }
} }

2
engine/client/r_surf.c
View File

@ -4703,7 +4703,7 @@ TRACE(("dbg: Surf_NewMap: tp\n"));
} }
if (cl.worldmodel && cl.worldmodel->loadstate == MLS_LOADED) if (cl.worldmodel && cl.worldmodel->loadstate == MLS_LOADED)
cl.worldmodel->funcs.FindTouchedLeafs(cl.worldmodel, &cl_static_entities[i].ent.pvscache, mins, maxs); cl.worldmodel->funcs.FindTouchedLeafs(cl.worldmodel, &cl_static_entities[i].ent.pvscache, mins, maxs);
cl_static_entities[i].emit = NULL; cl_static_entities[i].emit = trailkey_null;
} }
CL_InitDlights(); CL_InitDlights();

1
engine/common/particles.h
View File

@ -167,6 +167,7 @@ extern int pt_q2[];
#endif #endif
typedef quint32_t trailkey_t; typedef quint32_t trailkey_t;
#define trailkey_null 0
#define PARTICLE_Z_CLIP 8.0 #define PARTICLE_Z_CLIP 8.0