teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

actors.c: factor out 4 instances of id. code (up to args) into nudge_player().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2874 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-10 19:11:49 +00:00
parent 5084d08249
commit 689788c65b
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
polymer/eduke32/source/actors.c
View file

@ -898,16 +898,21 @@ static inline int32_t ifhitsectors(int32_t sectnum)
#define IFHITSECT(Sectnum) if (ifhitsectors(Sectnum) >= 0) #define IFHITSECT(Sectnum) if (ifhitsectors(Sectnum) >= 0)
static void nudge_player(int32_t p, int32_t sn, int32_t shl)
{
g_player[p].ps->vel.x += actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<<shl;
g_player[p].ps->vel.y += actor[sn].extra*(sintable[actor[sn].ang&2047])<<shl;
}
int32_t A_IncurDamage(int32_t sn) int32_t A_IncurDamage(int32_t sn)
{ {
int32_t j,p; int32_t j,p;
spritetype *npc;
if (actor[sn].extra >= 0) if (actor[sn].extra >= 0)
{ {
if (sprite[sn].extra >= 0) if (sprite[sn].extra >= 0)
{ {
npc = &sprite[sn]; spritetype *const npc = &sprite[sn];
if (npc->picnum == APLAYER) if (npc->picnum == APLAYER)
{ {
@ -948,17 +953,11 @@ int32_t A_IncurDamage(int32_t sn)
if (A_CheckSpriteTileFlags(actor[sn].picnum,SPRITE_PROJECTILE) && (SpriteProjectile[sn].workslike & PROJECTILE_RPG)) if (A_CheckSpriteTileFlags(actor[sn].picnum,SPRITE_PROJECTILE) && (SpriteProjectile[sn].workslike & PROJECTILE_RPG))
{ {
g_player[p].ps->vel.x += nudge_player(p, sn, 2);
actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<<2;
g_player[p].ps->vel.y +=
actor[sn].extra*(sintable[actor[sn].ang&2047])<<2;
} }
else if (A_CheckSpriteTileFlags(actor[sn].picnum,SPRITE_PROJECTILE)) else if (A_CheckSpriteTileFlags(actor[sn].picnum,SPRITE_PROJECTILE))
{ {
g_player[p].ps->vel.x += nudge_player(p, sn, 1);
actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<<1;
g_player[p].ps->vel.y +=
actor[sn].extra*(sintable[actor[sn].ang&2047])<<1;
} }
switch (DYNAMICTILEMAP(actor[sn].picnum)) switch (DYNAMICTILEMAP(actor[sn].picnum))
@ -970,16 +969,10 @@ int32_t A_IncurDamage(int32_t sn)
case SEENINE__STATIC: case SEENINE__STATIC:
case OOZFILTER__STATIC: case OOZFILTER__STATIC:
case EXPLODINGBARREL__STATIC: case EXPLODINGBARREL__STATIC:
g_player[p].ps->vel.x += nudge_player(p, sn, 2);
actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<<2;
g_player[p].ps->vel.y +=
actor[sn].extra*(sintable[actor[sn].ang&2047])<<2;
break; break;
default: default:
g_player[p].ps->vel.x += nudge_player(p, sn, 1);
actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<<1;
g_player[p].ps->vel.y +=
actor[sn].extra*(sintable[actor[sn].ang&2047])<<1;
break; break;
} }
} }