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

Factor out two pieces of identical code in actors.c into A_HandleBeingSpitOn().

Browse source 
This fixes a bug in passing: 'int32_t j' was assigned to as a temporary inside
one instance of the code, but used as if it were the previous sprite index
further on.  Would only happen with projectiles that "work like" both SPIT
and RPG_IMPACT.

git-svn-id: https://svn.eduke32.com/eduke32@2321 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-02-09 22:42:51 +00:00
parent 5846d73d30
commit 34000a9ed0
1 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2425,6 +2425,29 @@ ACTOR_STATIC void A_DoProjectileBounce(int32_t i)
s->ang = getangle(xvect,yvect); s->ang = getangle(xvect,yvect);
} }
ACTOR_STATIC void A_HandleBeingSpitOn(DukePlayer_t *ps)
{
ps->horiz += 32;
ps->return_to_center = 8;
if (ps->loogcnt == 0)
{
int32_t j, x;
if (!A_CheckSoundPlaying(ps->i, DUKE_LONGTERM_PAIN))
A_PlaySound(DUKE_LONGTERM_PAIN,ps->i);
j = 3+(krand()&3);
ps->numloogs = j;
ps->loogcnt = 24*4;
for (x=0; x < j; x++)
{
ps->loogiex[x] = krand()%xdim;
ps->loogiey[x] = krand()%ydim;
}
}
}
ACTOR_STATIC void G_MoveWeapons(void) ACTOR_STATIC void G_MoveWeapons(void)
{ {
int32_t i = headspritestat[STAT_PROJECTILE], j=0, k, f, nexti, p, q; int32_t i = headspritestat[STAT_PROJECTILE], j=0, k, f, nexti, p, q;
@ -2665,25 +2688,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
A_PlaySound(PISTOL_BODYHIT,j); A_PlaySound(PISTOL_BODYHIT,j);
if (SpriteProjectile[i].workslike & PROJECTILE_SPIT) if (SpriteProjectile[i].workslike & PROJECTILE_SPIT)
{ A_HandleBeingSpitOn(g_player[p].ps);
g_player[p].ps->horiz += 32;
g_player[p].ps->return_to_center = 8;
if (g_player[p].ps->loogcnt == 0)
{
if (!A_CheckSoundPlaying(g_player[p].ps->i, DUKE_LONGTERM_PAIN))
A_PlaySound(DUKE_LONGTERM_PAIN,g_player[p].ps->i);
j = 3+(krand()&3);
g_player[p].ps->numloogs = j;
g_player[p].ps->loogcnt = 24*4;
for (x=0; x < j; x++)
{
g_player[p].ps->loogiex[x] = krand()%xdim;
g_player[p].ps->loogiey[x] = krand()%ydim;
}
}
}
} }
if (SpriteProjectile[i].workslike & PROJECTILE_RPG_IMPACT) if (SpriteProjectile[i].workslike & PROJECTILE_RPG_IMPACT)
@ -3003,25 +3008,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
A_PlaySound(PISTOL_BODYHIT,j); A_PlaySound(PISTOL_BODYHIT,j);
if (s->picnum == SPIT) if (s->picnum == SPIT)
{ A_HandleBeingSpitOn(g_player[p].ps);
g_player[p].ps->horiz += 32;
g_player[p].ps->return_to_center = 8;
if (g_player[p].ps->loogcnt == 0)
{
if (!A_CheckSoundPlaying(g_player[p].ps->i, DUKE_LONGTERM_PAIN))
A_PlaySound(DUKE_LONGTERM_PAIN,g_player[p].ps->i);
j = 3+(krand()&3);
g_player[p].ps->numloogs = j;
g_player[p].ps->loogcnt = 24*4;
for (x=0; x < j; x++)
{
g_player[p].ps->loogiex[x] = krand()%xdim;
g_player[p].ps->loogiey[x] = krand()%ydim;
}
}
}
} }
} }
else if ((j&49152) == 32768) else if ((j&49152) == 32768)
@ -5852,8 +5839,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
while (j >= 0) while (j >= 0)
{ {
if (sprite[j].statnum != STAT_PLAYER && sector[sprite[j].sectnum].lotag != 2 && if (sprite[j].statnum != STAT_PLAYER && sector[sprite[j].sectnum].lotag != 2 &&
(sprite[j].picnum != SECTOREFFECTOR || (sprite[j].picnum != SECTOREFFECTOR || (sprite[j].lotag == 49||sprite[j].lotag == 50))
(sprite[j].picnum == SECTOREFFECTOR && (sprite[j].lotag == 49||sprite[j].lotag == 50)))
&& sprite[j].picnum != LOCATORS) && sprite[j].picnum != LOCATORS)
{ {
// fix interpolation // fix interpolation
@ -5939,8 +5925,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
{ {
// keep this conditional in sync with above! // keep this conditional in sync with above!
if (sprite[j].statnum != STAT_PLAYER && sector[sprite[j].sectnum].lotag != 2 && if (sprite[j].statnum != STAT_PLAYER && sector[sprite[j].sectnum].lotag != 2 &&
(sprite[j].picnum != SECTOREFFECTOR || (sprite[j].picnum != SECTOREFFECTOR || (sprite[j].lotag == 49||sprite[j].lotag == 50))
(sprite[j].picnum == SECTOREFFECTOR && (sprite[j].lotag == 49||sprite[j].lotag == 50)))
&& sprite[j].picnum != LOCATORS) && sprite[j].picnum != LOCATORS)
{ {
actor[j].bposx = sprite[j].x; actor[j].bposx = sprite[j].x;