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

player.c: factor out more identical code into Proj_DoHitscan().

Browse source 
Also, simplify a couple of other lines.

git-svn-id: https://svn.eduke32.com/eduke32@3464 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-02-07 21:01:06 +00:00
parent b92edcc798
commit 24e6aca5f7
1 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -824,7 +824,6 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
int32_t vel, zvel = 0, x, oldzvel; int32_t vel, zvel = 0, x, oldzvel;
hitdata_t hit; hitdata_t hit;
vec3_t srcvect; vec3_t srcvect;
char sizx,sizy;
spritetype *const s = &sprite[i]; spritetype *const s = &sprite[i];
const int16_t sect = s->sectnum; const int16_t sect = s->sectnum;
@ -928,11 +927,7 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
} }
} }
if (actor[i].shootzvel) zvel = actor[i].shootzvel; Proj_DoHitscan(i, 0, &srcvect, zvel, sa, &hit);
hitscan(&srcvect,sect,
sintable[(sa+512)&2047],
sintable[sa&2047],zvel<<6,
&hit,CLIPMASK1);
if (proj->workslike & PROJECTILE_BLOOD) if (proj->workslike & PROJECTILE_BLOOD)
{ {
@ -1159,11 +1154,7 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
} }
} }
if (actor[i].shootzvel) zvel = actor[i].shootzvel; Proj_DoHitscan(i, 0, &srcvect, zvel, sa, &hit);
hitscan(&srcvect,sect,
sintable[(sa+512)&2047],
sintable[sa&2047],zvel<<6,
&hit,CLIPMASK1);
if (atwith >= BLOODSPLAT1 && atwith <= BLOODSPLAT4) if (atwith >= BLOODSPLAT1 && atwith <= BLOODSPLAT4)
{ {
@ -1246,6 +1237,8 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
case FIRELASER__STATIC: case FIRELASER__STATIC:
case SPIT__STATIC: case SPIT__STATIC:
case COOLEXPLOSION1__STATIC: case COOLEXPLOSION1__STATIC:
{
int32_t tsiz;
if (s->extra >= 0) s->shade = -96; if (s->extra >= 0) s->shade = -96;
@ -1285,26 +1278,26 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
if (atwith == SPIT) if (atwith == SPIT)
{ {
sizx = sizy = 18; tsiz = 18;
srcvect.z -= (10<<8); srcvect.z -= (10<<8);
} }
else if (p >= 0) else if (p >= 0)
sizx = sizy = 7; tsiz = 7;
else else
{ {
if (atwith == FIRELASER) if (atwith == FIRELASER)
{ {
if (p >= 0) if (p >= 0)
sizx = sizy = 34; tsiz = 34;
else else
sizx = sizy = 18; tsiz = 18;
} }
else else
sizx = sizy = 18; tsiz = 18;
} }
j = A_InsertSprite(sect,srcvect.x,srcvect.y,srcvect.z, j = A_InsertSprite(sect,srcvect.x,srcvect.y,srcvect.z,
atwith,-127,sizx,sizy,sa,vel,zvel,i,4); atwith,-127,tsiz,tsiz,sa,vel,zvel,i,4);
sprite[j].extra += (krand()&7); sprite[j].extra += (krand()&7);
if (atwith == COOLEXPLOSION1) if (atwith == COOLEXPLOSION1)
@ -1327,6 +1320,7 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
zvel = oldzvel+512-(krand()&1023); zvel = oldzvel+512-(krand()&1023);
return j; return j;
}
case FREEZEBLAST__STATIC: case FREEZEBLAST__STATIC:
srcvect.z += (3<<8); srcvect.z += (3<<8);
@ -1459,13 +1453,9 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
if (p >= 0) if (p >= 0)
zvel = (100-ps->horiz-ps->horizoff)*32; zvel = (100-ps->horiz-ps->horizoff)*32;
else zvel = 0; else zvel = 0;
if (actor[i].shootzvel) zvel = actor[i].shootzvel;
srcvect.z -= zoff; srcvect.z -= zoff;
hitscan(&srcvect,sect, Proj_DoHitscan(i, 0, &srcvect, zvel, sa, &hit);
sintable[(sa+512)&2047],
sintable[sa&2047],
zvel<<6,&hit,CLIPMASK1);
srcvect.z += zoff; srcvect.z += zoff;
j = 0; j = 0;
@ -1574,14 +1564,7 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
// RESHOOTGROW: // RESHOOTGROW:
if (sect < 0) break; if (sect < 0) break;
s->cstat &= ~257; Proj_DoHitscan(i, 256+1, &srcvect, zvel, sa, &hit);
if (actor[i].shootzvel) zvel = actor[i].shootzvel;
hitscan(&srcvect,sect,
sintable[(sa+512)&2047],
sintable[sa&2047],
zvel<<6,&hit,CLIPMASK1);
s->cstat |= 257;
j = A_InsertSprite(sect,hit.pos.x,hit.pos.y,hit.pos.z,GROWSPARK,-16,28,28,sa,0,0,i,1); j = A_InsertSprite(sect,hit.pos.x,hit.pos.y,hit.pos.z,GROWSPARK,-16,28,28,sa,0,0,i,1);