zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bring GROWSPARK a bit more in line with the other hard-coded hitscan projectiles, and give it the same sort of accuracy adjustment as the pistol gets when autoaim is disabled.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3989 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-08-06 23:53:00 +00:00
parent af2e9e8cf1
commit c41efa2a09
1 changed files with 27 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1251,6 +1251,33 @@ int32_t A_ShootWithZvel(int32_t i, int32_t atwith, int32_t override_zvel)
return -1;
case GROWSPARK__STATIC:
if (p >= 0)
P_PreFireHitscan(i, p, atwith, &srcvect, &zvel, &sa, 1, 1);
else
A_PreFireHitscan(s, &srcvect, &zvel, &sa, 1);
if (Proj_DoHitscan(i, 256 + 1, &srcvect, zvel, sa, &hit))
return -1;
j = A_InsertSprite(hit.sect,hit.pos.x,hit.pos.y,hit.pos.z,GROWSPARK,-16,28,28,sa,0,0,i,1);
sprite[j].pal = 2;
sprite[j].cstat |= 130;
sprite[j].xrepeat = sprite[j].yrepeat = 1;
if (hit.wall == -1 && hit.sprite == -1 && hit.sect >= 0)
{
if (zvel < 0 && (sector[hit.sect].ceilingstat&1) == 0)
Sect_DamageCeiling(hit.sect);
}
else if (hit.sprite >= 0) A_DamageObject(hit.sprite,j);
else if (hit.wall >= 0 && wall[hit.wall].picnum != ACCESSSWITCH && wall[hit.wall].picnum != ACCESSSWITCH2)
A_DamageWall(j,hit.wall,&hit.pos,atwith);
break;
case FIRELASER__STATIC:
case SPIT__STATIC:
case COOLEXPLOSION1__STATIC:
@ -1555,75 +1582,6 @@ int32_t A_ShootWithZvel(int32_t i, int32_t atwith, int32_t override_zvel)
break;
}
case GROWSPARK__STATIC:
if (p >= 0)
{
j = GetAutoAimAngle(i, p, atwith, 5<<8, 0+1, &srcvect, 256, &zvel, &sa);
if (j < 0)
{
sa += 16-(krand()&31);
zvel = (100-ps->horiz-ps->horizoff)<<5;
zvel += 128-(krand()&255);
}
srcvect.z -= (2<<8);
}
else
{
j = A_FindPlayer(s, NULL);
srcvect.z -= (4<<8);
hit.pos.x = safeldist(g_player[j].ps->i, s);
zvel = ((g_player[j].ps->pos.z-srcvect.z) <<8) / hit.pos.x;
zvel += 128-(krand()&255);
sa += 32-(krand()&63);
}
k = 0;
// RESHOOTGROW:
if (sect < 0) break;
Proj_DoHitscan(i, 256+1, &srcvect, zvel, sa, &hit);
j = A_InsertSprite(sect,hit.pos.x,hit.pos.y,hit.pos.z,GROWSPARK,-16,28,28,sa,0,0,i,1);
sprite[j].pal = 2;
sprite[j].cstat |= 130;
sprite[j].xrepeat = sprite[j].yrepeat = 1;
if (hit.wall == -1 && hit.sprite == -1 && hit.sect >= 0)
{
if (zvel < 0 && (sector[hit.sect].ceilingstat&1) == 0)
Sect_DamageCeiling(hit.sect);
}
else if (hit.sprite >= 0) A_DamageObject(hit.sprite,j);
else if (hit.wall >= 0 && wall[hit.wall].picnum != ACCESSSWITCH && wall[hit.wall].picnum != ACCESSSWITCH2)
{
/* if(wall[hit.wall].overpicnum == MIRROR && k == 0)
{
l = getangle(
wall[wall[hit.wall].point2].x-wall[hit.wall].x,
wall[wall[hit.wall].point2].y-wall[hit.wall].y);
sx = hit.pos.x;
sy = hit.pos.y;
srcvect.z = hit.pos.z;
sect = hit.sect;
sa = ((l<<1) - sa)&2047;
sx += sintable[(sa+512)&2047]>>12;
sy += sintable[sa&2047]>>12;
k++;
goto RESHOOTGROW;
}
else */
A_DamageWall(j,hit.wall,&hit.pos,atwith);
}
break;
case SHRINKER__STATIC:
if (s->extra >= 0) s->shade = -96;
if (p >= 0)