zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-25 00:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow non-player hitscan projectiles to spawn sprites when impacting walls or sectors, and allow them to break sector textures (they could already break wall textures)

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5783 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-06-21 00:32:33 +00:00
parent 3c9f97a58e
commit 74b01416d0
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -760,7 +760,7 @@ SKIPBULLETHOLE:
} }
// Finish shooting hitscan weapon from actor (sprite <i>). // Finish shooting hitscan weapon from actor (sprite <i>).
static int32_t A_PostFireHitscan(const hitdata_t *hit, int32_t i, int32_t atwith, int32_t sa, int32_t extra, static int32_t A_PostFireHitscan(const hitdata_t *hit, int32_t i, int32_t atwith, int32_t zvel, int32_t sa, int32_t extra,
int32_t spawnatimpacttile, int32_t damagewalltile) int32_t spawnatimpacttile, int32_t damagewalltile)
{ {
int32_t k = Proj_InsertShotspark(hit, i, atwith, 24, sa, extra); int32_t k = Proj_InsertShotspark(hit, i, atwith, 24, sa, extra);
@ -775,7 +775,19 @@ static int32_t A_PostFireHitscan(const hitdata_t *hit, int32_t i, int32_t atwith
sprite[k].xrepeat = sprite[k].yrepeat = 0; sprite[k].xrepeat = sprite[k].yrepeat = 0;
} }
else if (hit->wall >= 0) else if (hit->wall >= 0)
{
A_DamageWall(k, hit->wall, &hit->pos, damagewalltile); A_DamageWall(k, hit->wall, &hit->pos, damagewalltile);
Proj_MaybeSpawn(k, spawnatimpacttile, hit);
}
else
{
if (Proj_MaybeDamageCF2(zvel, hit->sect))
{
sprite[k].xrepeat = 0;
sprite[k].yrepeat = 0;
}
else Proj_MaybeSpawn(k, spawnatimpacttile, hit);
}
return k; return k;
} }
@ -929,8 +941,8 @@ static int32_t A_ShootCustom(const int32_t i, const int32_t atwith, int16_t sa,
} }
else else
{ {
k = A_PostFireHitscan(&hit, i, atwith, sa, Proj_GetExtra(atwith), k = A_PostFireHitscan(&hit, i, atwith, zvel, sa,
atwith, atwith); Proj_GetExtra(atwith), atwith, atwith);
} }
if ((krand() & 255) < 4 && proj->isound >= 0) if ((krand() & 255) < 4 && proj->isound >= 0)
@ -1215,8 +1227,8 @@ static int32_t A_ShootHardcoded(int32_t i, int32_t atwith, int16_t sa, vec3_t sr
} }
else else
{ {
k = A_PostFireHitscan(&hit, i, atwith, sa, G_InitialActorStrength(atwith), k = A_PostFireHitscan(&hit, i, atwith, zvel, sa,
-SMALLSMOKE, SHOTSPARK1); G_InitialActorStrength(atwith), -SMALLSMOKE, SHOTSPARK1);
} }
if ((krand()&255) < 4) if ((krand()&255) < 4)