zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-12 03:41:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up bloodsplat and decal positioning a bit. Nasty hacks removed. Yay.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5392 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-10-20 07:15:18 +00:00
parent 45644d25e5
commit 72cea8b6b8
1 changed files with 6 additions and 13 deletions

19
polymer/eduke32/source/player.c
View file

@ -736,17 +736,15 @@ static int32_t P_PostFireHitscan(int32_t p, int32_t k, hitdata_t *hit, int32_t i
if (!A_CheckSpriteFlags(l, SFLAG_DECAL)) if (!A_CheckSpriteFlags(l, SFLAG_DECAL))
actor[l].flags |= SFLAG_DECAL; actor[l].flags |= SFLAG_DECAL;
sprite[l].xvel = -1; sprite[l].ang = (getangle(hitwal->x - wall[hitwal->point2].x,
sprite[l].ang = getangle(hitwal->x-wall[hitwal->point2].x, hitwal->y - wall[hitwal->point2].y) + 1536) & 2047;
hitwal->y-wall[hitwal->point2].y)+512;
if (flags&1) if (flags & 1)
Proj_DoRandDecalSize(l, atwith); Proj_DoRandDecalSize(l, atwith);
if (flags&2) if (flags&2)
sprite[l].cstat = 16+(krand()&(8+4)); sprite[l].cstat = 16+(krand()&(8+4));
sprite[l].x -= sintable[(sprite[l].ang+2560)&2047]>>13;
sprite[l].y -= sintable[(sprite[l].ang+2048)&2047]>>13;
A_SetSprite(l, CLIPMASK0); A_SetSprite(l, CLIPMASK0);
@ -1081,7 +1079,6 @@ static int32_t A_ShootCustom(const int32_t i, const int32_t atwith, int16_t sa,
if (!A_CheckSpriteFlags(k, SFLAG_DECAL)) if (!A_CheckSpriteFlags(k, SFLAG_DECAL))
actor[k].flags |= SFLAG_DECAL; actor[k].flags |= SFLAG_DECAL;
sprite[k].xvel = -1;
sprite[k].ang = getangle(hitwal->x - wall[hitwal->point2].x, sprite[k].ang = getangle(hitwal->x - wall[hitwal->point2].x,
hitwal->y - wall[hitwal->point2].y) + 512; hitwal->y - wall[hitwal->point2].y) + 512;
Bmemcpy(&sprite[k], &hit.pos, sizeof(vec3_t)); Bmemcpy(&sprite[k], &hit.pos, sizeof(vec3_t));
@ -1101,9 +1098,6 @@ static int32_t A_ShootCustom(const int32_t i, const int32_t atwith, int16_t sa,
sprite[k].shade = sector[sprite[k].sectnum].floorshade; sprite[k].shade = sector[sprite[k].sectnum].floorshade;
sprite[k].x -= sintable[(sprite[k].ang + 2560) & 2047] >> 13;
sprite[k].y -= sintable[(sprite[k].ang + 2048) & 2047] >> 13;
A_SetSprite(k, CLIPMASK0); A_SetSprite(k, CLIPMASK0);
A_AddToDeleteQueue(k); A_AddToDeleteQueue(k);
changespritestat(k, 5); changespritestat(k, 5);
@ -1239,9 +1233,8 @@ int32_t A_ShootWithZvel(int32_t i, int32_t atwith, int32_t override_zvel)
if (hitwal->hitag == 0) if (hitwal->hitag == 0)
{ {
k = A_Spawn(i,atwith); k = A_Spawn(i,atwith);
sprite[k].xvel = -12; sprite[k].ang = (getangle(hitwal->x - wall[hitwal->point2].x,
sprite[k].ang = getangle(hitwal->x-wall[hitwal->point2].x, hitwal->y - wall[hitwal->point2].y) + 1536) & 2047;
hitwal->y-wall[hitwal->point2].y)+512;
Bmemcpy(&sprite[k], &hit.pos, sizeof(vec3_t)); Bmemcpy(&sprite[k], &hit.pos, sizeof(vec3_t));
sprite[k].cstat |= (krand()&4); sprite[k].cstat |= (krand()&4);