fix for parsetent - added the extra particle types.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@503 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-11-22 22:19:12 +00:00
parent e79177657d
commit 27aea7b7ba

View file

@ -47,7 +47,9 @@ int pt_explosion,
pt_teleportsplash, pt_teleportsplash,
pt_blasterparticles, pt_blasterparticles,
pt_superbullet, pt_superbullet,
pt_bullet; pt_bullet,
pt_spark,
pt_plasma;
int pe_default, int pe_default,
pe_size2, pe_size2,
@ -928,6 +930,9 @@ void R_InitParticles (void)
pe_default = AllocateParticleType("pe_default"); pe_default = AllocateParticleType("pe_default");
pe_size2 = AllocateParticleType("pe_size2"); pe_size2 = AllocateParticleType("pe_size2");
pe_size3 = AllocateParticleType("pe_size3"); pe_size3 = AllocateParticleType("pe_size3");
pt_spark = AllocateParticleType("pe_spark");
pt_plasma = AllocateParticleType("pe_plasma");
} }
@ -2394,6 +2399,8 @@ void GL_DrawTrifanParticle(particle_t *p, part_type_t *type)
vec3_t v; vec3_t v;
float scale; float scale;
glEnd();
if (lasttype != type) if (lasttype != type)
{ {
lasttype = type; lasttype = type;
@ -2406,7 +2413,6 @@ void GL_DrawTrifanParticle(particle_t *p, part_type_t *type)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
} }
glEnd();
scale = (p->org[0] - r_origin[0])*vpn[0] + (p->org[1] - r_origin[1])*vpn[1] scale = (p->org[0] - r_origin[0])*vpn[0] + (p->org[1] - r_origin[1])*vpn[1]
+ (p->org[2] - r_origin[2])*vpn[2]; + (p->org[2] - r_origin[2])*vpn[2];