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

Allow negating an action's viewtype 5 or 7, meaning to x-flip the shown sprite.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3859 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-06-07 10:18:21 +00:00
parent 528366da46
commit a57ce255e7
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/source/game.c
View file

@ -6941,9 +6941,10 @@ static int32_t G_MaybeTakeOnFloorPal(spritetype *datspr, int32_t sect)
return 0; return 0;
} }
static int32_t getofs_viewtype5(const spritetype *s, spritetype *t, int32_t a) static int32_t getofs_viewtype5(const spritetype *s, spritetype *t, int32_t a, uint8_t invertp)
{ {
int32_t k = (((s->ang+3072+128-a)&2047)>>8)&7; int32_t angdif = invertp ? a-s->ang : s->ang-a;
int32_t k = (((angdif+3072+128)&2047)>>8)&7;
if (k>4) if (k>4)
{ {
@ -6955,9 +6956,10 @@ static int32_t getofs_viewtype5(const spritetype *s, spritetype *t, int32_t a)
return k; return k;
} }
static int32_t getofs_viewtype7(const spritetype *s, spritetype *t, int32_t a) static int32_t getofs_viewtype7(const spritetype *s, spritetype *t, int32_t a, uint8_t invertp)
{ {
int32_t k = ((s->ang+3072+128-a)&2047)/170; int32_t angdif = invertp ? a-s->ang : s->ang-a;
int32_t k = ((angdif+3072+128)&2047)/170;
if (k>6) if (k>6)
{ {
@ -7133,7 +7135,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
break; break;
} }
#endif #endif
k = getofs_viewtype5(t, t, oura); k = getofs_viewtype5(t, t, oura, 0);
t->picnum = s->picnum+k; t->picnum = s->picnum+k;
break; break;
case BLOODSPLAT1__STATIC: case BLOODSPLAT1__STATIC:
@ -7353,7 +7355,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
break; break;
} }
#endif #endif
k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury)); k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury), 0);
t->picnum = RPG+k; t->picnum = RPG+k;
break; break;
@ -7365,7 +7367,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
break; break;
} }
#endif #endif
k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury)); k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury), 0);
// RECON_T4 // RECON_T4
if (klabs(t_data3) > 64) if (klabs(t_data3) > 64)
@ -7482,7 +7484,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
} }
else else
#endif #endif
k = getofs_viewtype5(s, t, oura); k = getofs_viewtype5(s, t, oura, 0);
if (sector[s->sectnum].lotag == ST_2_UNDERWATER) k += 1795-1405; if (sector[s->sectnum].lotag == ST_2_UNDERWATER) k += 1795-1405;
else if ((actor[i].floorz-s->z) > (64<<8)) k += 60; else if ((actor[i].floorz-s->z) > (64<<8)) k += 60;
@ -7536,7 +7538,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
} }
else else
#endif #endif
k = getofs_viewtype5(s, t, oura); k = getofs_viewtype5(s, t, oura, 0);
if (sector[t->sectnum].lotag == ST_2_UNDERWATER) k += 1795-1405; if (sector[t->sectnum].lotag == ST_2_UNDERWATER) k += 1795-1405;
else if ((actor[i].floorz-s->z) > (64<<8)) k += 60; else if ((actor[i].floorz-s->z) > (64<<8)) k += 60;
@ -7636,10 +7638,12 @@ PALONLY:
break; break;
case 5: case 5:
k = getofs_viewtype5(s, t, getangle(s->x-ourx, s->y-oury)); case -5:
k = getofs_viewtype5(s, t, getangle(s->x-ourx, s->y-oury), l<0);
break; break;
case 7: case 7:
k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury)); case -7:
k = getofs_viewtype7(s, t, getangle(s->x-ourx, s->y-oury), l<0);
break; break;
case 8: case 8:
k = (((s->ang+3072+128-oura)&2047)>>8)&7; k = (((s->ang+3072+128-oura)&2047)>>8)&7;
@ -7803,7 +7807,7 @@ skip:
} }
else else
#endif #endif
k = getofs_viewtype5(t, t, oura); k = getofs_viewtype5(t, t, oura, 0);
t->picnum = s->picnum+k+((T1<4)*5); t->picnum = s->picnum+k+((T1<4)*5);
t->shade = sprite[s->owner].shade; t->shade = sprite[s->owner].shade;
@ -7858,7 +7862,7 @@ skip:
break; break;
} }
#endif #endif
k = getofs_viewtype5(t, t, oura); k = getofs_viewtype5(t, t, oura, 0);
t->picnum = s->picnum+k; t->picnum = s->picnum+k;
break; break;
} }