fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix te_gunshot with only one arg erroring non-fte qw clients.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5340 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-11-19 08:47:26 +00:00
parent cb0f6fa6aa
commit 73d836aaee
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/gl/gl_backend.c
View file

@ -1079,7 +1079,7 @@ qboolean GLBE_BeginShadowMap(int id, int w, int h, int *restorefbo)
if (!TEXVALID(shadowmap[id])) if (!TEXVALID(shadowmap[id]))
{ {
uploadfmt_t encoding = PTI_DEPTH32; uploadfmt_t encoding = PTI_DEPTH16;
texid_t tex = shadowmap[id] = Image_CreateTexture(va("***shadowmap2d%i***", id), NULL, 0); texid_t tex = shadowmap[id] = Image_CreateTexture(va("***shadowmap2d%i***", id), NULL, 0);
qglGenTextures(1, &tex->num); qglGenTextures(1, &tex->num);
GL_MTBind(0, GL_TEXTURE_2D, tex); GL_MTBind(0, GL_TEXTURE_2D, tex);

2
engine/gl/gl_shadow.c
View file

@ -3912,7 +3912,7 @@ void Sh_DrawLights(qbyte *vis)
else else
strength = (v1*(1-frac) + v2*(frac))*(22/255.0)*r_lightstylescale.value; strength = (v1*(1-frac) + v2*(frac))*(22/255.0)*r_lightstylescale.value;
} }
strength *= d_lightstylevalue[0]/255.0f; //a lot of QW mods use lightstyle 0 for a global darkening fade-in thing, so be sure to respect that. strength *= d_lightstylevalue[0]/256.0f; //a lot of QW mods use lightstyle 0 for a global darkening fade-in thing, so be sure to respect that.
colour[0] *= strength; colour[0] *= strength;
colour[1] *= strength; colour[1] *= strength;
colour[2] *= strength; colour[2] *= strength;

5
engine/server/pr_cmds.c
View file

@ -5671,6 +5671,11 @@ void SV_point_tempentity (vec3_t o, int type, int count) //count (usually 1) is
split = PEXT_TE_BULLET; split = PEXT_TE_BULLET;
#endif #endif
break; break;
case TEQW_NQGUNSHOT:
qwtype[0] = TEQW_NQGUNSHOT;
qwtype[1] = TEQW_QWGUNSHOT;
split = PEXT_TE_BULLET;
break;
case TEQW_QWEXPLOSION: case TEQW_QWEXPLOSION:
#ifdef NQPROT #ifdef NQPROT
nqtype[0] = TENQ_QWEXPLOSION; nqtype[0] = TENQ_QWEXPLOSION;