team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stuff I needed to fix 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@898 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-03-15 02:57:02 +00:00
parent dc5809c208
commit 7af6a2b9e7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/client/cl_tent.c
View File

@ -876,9 +876,8 @@ void CL_ParseTEnt (void)
// count
cnt = MSG_ReadByte ();
rnd = FindParticleType("te_flamejet");
if (R_RunParticleEffectType(pos, pos2, cnt, rnd))
R_RunParticleEffect (pos, pos2, 232, cnt);
if (P_RunParticleEffectTypeString(pos, pos2, cnt, "te_flamejet"))
P_RunParticleEffect (pos, pos2, 232, cnt);
break;
case 75://TE_PLASMABURN

9
engine/client/r_part.c
View File

@ -1551,6 +1551,15 @@ void P_BlobExplosion (vec3_t org)
P_RunParticleEffectType(org, NULL, 1, pt_blob);
}
int P_RunParticleEffectTypeString (vec3_t org, vec3_t dir, float count, char *name)
{
int type = P_FindParticleType(name);
if (type < 0)
return 1;
return P_RunParticleEffectType(org, dir, count, type);
}
int P_RunParticleEffectType (vec3_t org, vec3_t dir, float count, int typenum)
{
part_type_t *ptype = &part_type[typenum];

2
engine/common/particles.h
View File

@ -130,7 +130,7 @@ void P_DefaultTrail (struct model_s *model); //fills in the default particle pro
//the core spawn function for point effects
int P_RunParticleEffectType(vec3_t org, vec3_t dir, float count, int type); //1 if failed.
int P_RunParticleEffectTypeString (vec3_t org, vec3_t dir, float count, char *name); //1 if failed.
void P_EmitSkyEffectTris(struct model_s *mod, struct msurface_s *fa);