zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 03:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed a few things in animatesprites.

Browse source 
This function will need special handling later, for now let's just reduce the work surface to a few pointers.
This commit is contained in:
Christoph Oelckers 2020-10-23 20:38:45 +02:00
parent ac58dd8017
commit f729f7d7a3
2 changed files with 100 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
source/games/duke/src/animatesprites_d.cpp
View file

@ -49,12 +49,15 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
int l, t1, t3, t4; int l, t1, t3, t4;
spritetype* s; spritetype* s;
tspritetype* t; tspritetype* t;
weaponhit* h;
for (j = 0; j < spritesortcnt; j++) for (j = 0; j < spritesortcnt; j++)
{ {
t = &tsprite[j]; t = &tsprite[j];
i = t->owner; i = t->owner;
s = &sprite[t->owner]; s = &sprite[t->owner];
h = &hittype[t->owner];
auto Owner = &sprite[s->owner];
switch (t->picnum) switch (t->picnum)
{ {
@ -147,6 +150,8 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
t = &tsprite[j]; t = &tsprite[j];
i = t->owner; i = t->owner;
s = &sprite[i]; s = &sprite[i];
h = &hittype[i];
auto Owner = &sprite[s->owner];
switch (s->picnum) switch (s->picnum)
{ {
@ -177,15 +182,15 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
} }
else if (s->picnum != CRANEPOLE) else if (s->picnum != CRANEPOLE)
{ {
t->x -= mulscale16(MaxSmoothRatio - smoothratio, s->x - hittype[i].bposx); t->x -= mulscale16(MaxSmoothRatio - smoothratio, s->x - h->bposx);
t->y -= mulscale16(MaxSmoothRatio - smoothratio, s->y - hittype[i].bposy); t->y -= mulscale16(MaxSmoothRatio - smoothratio, s->y - h->bposy);
t->z -= mulscale16(MaxSmoothRatio - smoothratio, s->z - hittype[i].bposz); t->z -= mulscale16(MaxSmoothRatio - smoothratio, s->z - h->bposz);
} }
sect = s->sectnum; sect = s->sectnum;
t1 = hittype[i].temp_data[1]; t1 = h->temp_data[1];
t3 = hittype[i].temp_data[3]; t3 = h->temp_data[3];
t4 = hittype[i].temp_data[4]; t4 = h->temp_data[4];
switch (s->picnum) switch (s->picnum)
{ {
@ -216,29 +221,29 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
sqa = sqa =
getangle( getangle(
sprite[s->owner].x - ps[screenpeek].posx, Owner->x - ps[screenpeek].posx,
sprite[s->owner].y - ps[screenpeek].posy); Owner->y - ps[screenpeek].posy);
sqb = sqb =
getangle( getangle(
sprite[s->owner].x - t->x, Owner->x - t->x,
sprite[s->owner].y - t->y); Owner->y - t->y);
if (abs(getincangle(sqa, sqb)) > 512) if (abs(getincangle(sqa, sqb)) > 512)
if (ldist(&sprite[s->owner], t) < ldist(&sprite[ps[screenpeek].i], &sprite[s->owner])) if (ldist(Owner, t) < ldist(&sprite[ps[screenpeek].i], Owner))
t->xrepeat = t->yrepeat = 0; t->xrepeat = t->yrepeat = 0;
} }
continue; continue;
case BURNING: case BURNING:
case BURNING2: case BURNING2:
if (sprite[s->owner].statnum == 10) if (Owner->statnum == 10)
{ {
if (display_mirror == 0 && sprite[s->owner].yvel == screenpeek && ps[sprite[s->owner].yvel].over_shoulder_on == 0) if (display_mirror == 0 && Owner->yvel == screenpeek && ps[Owner->yvel].over_shoulder_on == 0)
t->xrepeat = 0; t->xrepeat = 0;
else else
{ {
t->ang = getangle(x - t->x, y - t->y); t->ang = getangle(x - t->x, y - t->y);
t->x = sprite[s->owner].x; t->x = Owner->x;
t->y = sprite[s->owner].y; t->y = Owner->y;
t->x += sintable[(t->ang + 512) & 2047] >> 10; t->x += sintable[(t->ang + 512) & 2047] >> 10;
t->y += sintable[t->ang & 2047] >> 10; t->y += sintable[t->ang & 2047] >> 10;
} }
@ -296,7 +301,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
}*/ }*/
k = getangle(s->x - x, s->y - y); k = getangle(s->x - x, s->y - y);
if (hittype[i].temp_data[0] < 4) if (h->temp_data[0] < 4)
k = (((s->ang + 3072 + 128 - k) & 2047) / 170); k = (((s->ang + 3072 + 128 - k) & 2047) / 170);
else k = (((s->ang + 3072 + 128 - k) & 2047) / 170); else k = (((s->ang + 3072 + 128 - k) & 2047) / 170);
@ -395,7 +400,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
} }
if (sector[t->sectnum].lotag == 2) k += 1795 - 1405; if (sector[t->sectnum].lotag == 2) k += 1795 - 1405;
else if ((hittype[i].floorz - s->z) > (64 << 8)) k += 60; else if ((h->floorz - s->z) > (64 << 8)) k += 60;
t->picnum += k; t->picnum += k;
t->pal = ps[p].palookup; t->pal = ps[p].palookup;
@ -434,8 +439,8 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
if (s->owner == -1) continue; if (s->owner == -1) continue;
if (t->z > hittype[i].floorz && t->xrepeat < 32) if (t->z > h->floorz && t->xrepeat < 32)
t->z = hittype[i].floorz; t->z = h->floorz;
break; break;
@ -470,9 +475,9 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
case SCRAP6 + 6: case SCRAP6 + 6:
case SCRAP6 + 7: case SCRAP6 + 7:
if (hittype[i].picnum == BLIMP && t->picnum == SCRAP1 && s->yvel >= 0) if (h->picnum == BLIMP && t->picnum == SCRAP1 && s->yvel >= 0)
t->picnum = s->yvel; t->picnum = s->yvel;
else t->picnum += hittype[i].temp_data[0]; else t->picnum += h->temp_data[0];
t->shade -= 6; t->shade -= 6;
if (sector[sect].floorpal) if (sector[sect].floorpal)
@ -552,8 +557,8 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0) while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors t->picnum -= l; //Hack, for actors
if (hittype[i].dispicnum >= 0) if (h->dispicnum >= 0)
hittype[i].dispicnum = t->picnum; h->dispicnum = t->picnum;
} }
else if (display_mirror == 1) else if (display_mirror == 1)
t->cstat |= 4; t->cstat |= 4;
@ -563,9 +568,9 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
if (t->statnum != 99 && s->picnum != EXPLOSION2 && s->picnum != HANGLIGHT && s->picnum != DOMELITE) if (t->statnum != 99 && s->picnum != EXPLOSION2 && s->picnum != HANGLIGHT && s->picnum != DOMELITE)
if (s->picnum != HOTMEAT) if (s->picnum != HOTMEAT)
{ {
if (hittype[i].dispicnum < 0) if (h->dispicnum < 0)
{ {
hittype[i].dispicnum++; h->dispicnum++;
continue; continue;
} }
else if (r_shadows && spritesortcnt < (MAXSPRITESONSCREEN - 2)) else if (r_shadows && spritesortcnt < (MAXSPRITESONSCREEN - 2))
@ -575,7 +580,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
if ((sector[sect].lotag & 0xff) > 2 || s->statnum == 4 || s->statnum == 5 || s->picnum == DRONE || s->picnum == COMMANDER) if ((sector[sect].lotag & 0xff) > 2 || s->statnum == 4 || s->statnum == 5 || s->picnum == DRONE || s->picnum == COMMANDER)
daz = sector[sect].floorz; daz = sector[sect].floorz;
else else
daz = hittype[i].floorz; daz = h->floorz;
if ((s->z - daz) < (8 << 8) && ps[screenpeek].posz < daz) if ((s->z - daz) < (8 << 8) && ps[screenpeek].posz < daz)
@ -629,7 +634,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
{ {
case LASERLINE: case LASERLINE:
if (sector[t->sectnum].lotag == 2) t->pal = 8; if (sector[t->sectnum].lotag == 2) t->pal = 8;
t->z = sprite[s->owner].z - (3 << 8); t->z = Owner->z - (3 << 8);
if (lasermode == 2 && ps[screenpeek].heat_on == 0) if (lasermode == 2 && ps[screenpeek].heat_on == 0)
t->yrepeat = 0; t->yrepeat = 0;
case EXPLOSION2: case EXPLOSION2:
@ -655,7 +660,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
t->cstat |= 128; t->cstat |= 128;
case BURNING: case BURNING:
case BURNING2: case BURNING2:
if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2) if (Owner->picnum != TREE1 && Owner->picnum != TREE2)
t->z = sector[t->sectnum].floorz; t->z = sector[t->sectnum].floorz;
t->shade = -127; t->shade = -127;
break; break;
@ -677,8 +682,8 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
else t->cstat &= ~4; else t->cstat &= ~4;
} }
t->picnum = s->picnum + k + ((hittype[i].temp_data[0] < 4) * 5); t->picnum = s->picnum + k + ((h->temp_data[0] < 4) * 5);
t->shade = sprite[s->owner].shade; t->shade = Owner->shade;
break; break;
@ -686,32 +691,32 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
t->picnum = WATERSPLASH2 + t1; t->picnum = WATERSPLASH2 + t1;
break; break;
case REACTOR2: case REACTOR2:
t->picnum = s->picnum + hittype[i].temp_data[2]; t->picnum = s->picnum + h->temp_data[2];
break; break;
case SHELL: case SHELL:
t->picnum = s->picnum + (hittype[i].temp_data[0] & 1); t->picnum = s->picnum + (h->temp_data[0] & 1);
case SHOTGUNSHELL: case SHOTGUNSHELL:
t->cstat |= 12; t->cstat |= 12;
if (hittype[i].temp_data[0] > 1) t->cstat &= ~4; if (h->temp_data[0] > 1) t->cstat &= ~4;
if (hittype[i].temp_data[0] > 2) t->cstat &= ~12; if (h->temp_data[0] > 2) t->cstat &= ~12;
break; break;
case FRAMEEFFECT1: case FRAMEEFFECT1:
if (s->owner >= 0 && sprite[s->owner].statnum < MAXSTATUS) if (s->owner >= 0 && Owner->statnum < MAXSTATUS)
{ {
if (sprite[s->owner].picnum == APLAYER) if (Owner->picnum == APLAYER)
if (ud.camerasprite == -1) if (ud.camerasprite == -1)
if (screenpeek == sprite[s->owner].yvel && display_mirror == 0) if (screenpeek == Owner->yvel && display_mirror == 0)
{ {
t->owner = -1; t->owner = -1;
break; break;
} }
if ((sprite[s->owner].cstat & 32768) == 0) if ((Owner->cstat & 32768) == 0)
{ {
t->picnum = hittype[s->owner].dispicnum; t->picnum = hittype[s->owner].dispicnum;
t->pal = sprite[s->owner].pal; t->pal = Owner->pal;
t->shade = sprite[s->owner].shade; t->shade = Owner->shade;
t->ang = sprite[s->owner].ang; t->ang = Owner->ang;
t->cstat = 2 | sprite[s->owner].cstat; t->cstat = 2 | Owner->cstat;
} }
} }
break; break;
@ -734,7 +739,7 @@ void animatesprites_d(int x, int y, int a, int smoothratio)
break; break;
} }
hittype[i].dispicnum = t->picnum; h->dispicnum = t->picnum;
if (sector[t->sectnum].floorpicnum == MIRROR) if (sector[t->sectnum].floorpicnum == MIRROR)
t->xrepeat = t->yrepeat = 0; t->xrepeat = t->yrepeat = 0;
} }

99
source/games/duke/src/animatesprites_r.cpp
View file

@ -42,6 +42,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
int l, t1, t3, t4; int l, t1, t3, t4;
spritetype* s; spritetype* s;
tspritetype* t; tspritetype* t;
weaponhit* h;
int bg = 0; int bg = 0;
@ -49,7 +50,9 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
{ {
t = &tsprite[j]; t = &tsprite[j];
i = t->owner; i = t->owner;
s = &sprite[t->owner]; s = &sprite[i];
h = &hittype[i];
auto Owner = &sprite[s->owner];
switch (t->picnum) switch (t->picnum)
{ {
@ -136,6 +139,8 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
t = &tsprite[j]; t = &tsprite[j];
i = t->owner; i = t->owner;
s = &sprite[i]; s = &sprite[i];
h = &hittype[i];
auto Owner = & sprite[s->owner];
switch (s->picnum) switch (s->picnum)
{ {
@ -164,15 +169,15 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
} }
else if (s->picnum != CRANEPOLE) else if (s->picnum != CRANEPOLE)
{ {
t->x -= mulscale16(MaxSmoothRatio - smoothratio, s->x - hittype[i].bposx); t->x -= mulscale16(MaxSmoothRatio - smoothratio, s->x - h->bposx);
t->y -= mulscale16(MaxSmoothRatio - smoothratio, s->y - hittype[i].bposy); t->y -= mulscale16(MaxSmoothRatio - smoothratio, s->y - h->bposy);
t->z -= mulscale16(MaxSmoothRatio - smoothratio, s->z - hittype[i].bposz); t->z -= mulscale16(MaxSmoothRatio - smoothratio, s->z - h->bposz);
} }
sect = s->sectnum; sect = s->sectnum;
t1 = hittype[i].temp_data[1]; t1 = h->temp_data[1];
t3 = hittype[i].temp_data[3]; t3 = h->temp_data[3];
t4 = hittype[i].temp_data[4]; t4 = h->temp_data[4];
switch (s->picnum) switch (s->picnum)
{ {
@ -214,28 +219,28 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
sqa = sqa =
getangle( getangle(
sprite[s->owner].x - ps[screenpeek].posx, Owner->x - ps[screenpeek].posx,
sprite[s->owner].y - ps[screenpeek].posy); Owner->y - ps[screenpeek].posy);
sqb = sqb =
getangle( getangle(
sprite[s->owner].x - t->x, Owner->x - t->x,
sprite[s->owner].y - t->y); Owner->y - t->y);
if (abs(getincangle(sqa, sqb)) > 512) if (abs(getincangle(sqa, sqb)) > 512)
if (ldist(&sprite[s->owner], t) < ldist(&sprite[ps[screenpeek].i], &sprite[s->owner])) if (ldist(Owner, t) < ldist(&sprite[ps[screenpeek].i], Owner))
t->xrepeat = t->yrepeat = 0; t->xrepeat = t->yrepeat = 0;
} }
continue; continue;
case BURNING: case BURNING:
if (sprite[s->owner].statnum == 10) if (Owner->statnum == 10)
{ {
if (display_mirror == 0 && sprite[s->owner].yvel == screenpeek && ps[sprite[s->owner].yvel].over_shoulder_on == 0) if (display_mirror == 0 && Owner->yvel == screenpeek && ps[Owner->yvel].over_shoulder_on == 0)
t->xrepeat = 0; t->xrepeat = 0;
else else
{ {
t->ang = getangle(x - t->x, y - t->y); t->ang = getangle(x - t->x, y - t->y);
t->x = sprite[s->owner].x; t->x = Owner->x;
t->y = sprite[s->owner].y; t->y = Owner->y;
t->x += sintable[(t->ang + 512) & 2047] >> 10; t->x += sintable[(t->ang + 512) & 2047] >> 10;
t->y += sintable[t->ang & 2047] >> 10; t->y += sintable[t->ang & 2047] >> 10;
} }
@ -249,7 +254,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
t->shade = (sintable[(ud.levelclock << 4) & 2047] >> 10); t->shade = (sintable[(ud.levelclock << 4) & 2047] >> 10);
break; break;
case SHRINKSPARK: case SHRINKSPARK:
if ((sprite[s->owner].picnum == CHEER || sprite[s->owner].picnum == CHEERSTAYPUT) && isRRRA()) if ((Owner->picnum == CHEER || Owner->picnum == CHEERSTAYPUT) && isRRRA())
{ {
t->picnum = CHEERBLADE + ((ud.levelclock >> 4) & 3); t->picnum = CHEERBLADE + ((ud.levelclock >> 4) & 3);
t->shade = -127; t->shade = -127;
@ -267,14 +272,14 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
case SPIT: case SPIT:
if (isRRRA()) if (isRRRA())
{ {
if (sprite[s->owner].picnum == MINION && sprite[s->owner].pal == 8) if (Owner->picnum == MINION && Owner->pal == 8)
t->picnum = RRTILE3500 + ((ud.levelclock >> 4) % 6); t->picnum = RRTILE3500 + ((ud.levelclock >> 4) % 6);
else if (sprite[s->owner].picnum == MINION && sprite[s->owner].pal == 19) else if (Owner->picnum == MINION && Owner->pal == 19)
{ {
t->picnum = RRTILE5090 + ((ud.levelclock >> 4) & 3); t->picnum = RRTILE5090 + ((ud.levelclock >> 4) & 3);
t->shade = -127; t->shade = -127;
} }
else if (sprite[s->owner].picnum == MAMA) else if (Owner->picnum == MAMA)
{ {
k = getangle(s->x - x, s->y - y); k = getangle(s->x - x, s->y - y);
k = (((s->ang + 3072 + 128 - k) & 2047) >> 8) & 7; k = (((s->ang + 3072 + 128 - k) & 2047) >> 8) & 7;
@ -343,7 +348,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
case RECON: case RECON:
k = getangle(s->x - x, s->y - y); k = getangle(s->x - x, s->y - y);
if (hittype[i].temp_data[0] < 4) if (h->temp_data[0] < 4)
k = (((s->ang + 3072 + 128 - k) & 2047) / 170); k = (((s->ang + 3072 + 128 - k) & 2047) / 170);
else k = (((s->ang + 3072 + 128 - k) & 2047) / 170); else k = (((s->ang + 3072 + 128 - k) & 2047) / 170);
@ -446,7 +451,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
} }
if (sector[t->sectnum].lotag == 2) k += 1795 - 1405; if (sector[t->sectnum].lotag == 2) k += 1795 - 1405;
else if ((hittype[i].floorz - s->z) > (64 << 8)) k += 60; else if ((h->floorz - s->z) > (64 << 8)) k += 60;
t->picnum += k; t->picnum += k;
t->pal = ps[p].palookup; t->pal = ps[p].palookup;
@ -485,8 +490,8 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
if (s->owner == -1) continue; if (s->owner == -1) continue;
if (t->z > hittype[i].floorz && t->xrepeat < 32) if (t->z > h->floorz && t->xrepeat < 32)
t->z = hittype[i].floorz; t->z = h->floorz;
if (ps[p].OnMotorcycle && p == screenpeek) if (ps[p].OnMotorcycle && p == screenpeek)
{ {
@ -610,7 +615,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
if (t->picnum == SCRAP1 && s->yvel >= 0) if (t->picnum == SCRAP1 && s->yvel >= 0)
t->picnum = s->yvel; t->picnum = s->yvel;
else t->picnum += hittype[i].temp_data[0]; else t->picnum += h->temp_data[0];
if (sector[sect].floorpal) if (sector[sect].floorpal)
t->pal = sector[sect].floorpal; t->pal = sector[sect].floorpal;
@ -704,8 +709,8 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0) while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors t->picnum -= l; //Hack, for actors
if (hittype[i].dispicnum >= 0) if (h->dispicnum >= 0)
hittype[i].dispicnum = t->picnum; h->dispicnum = t->picnum;
} }
else if (display_mirror == 1) else if (display_mirror == 1)
t->cstat |= 4; t->cstat |= 4;
@ -718,9 +723,9 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
if ((s->cstat & 48) == 0 && t->statnum != 99) if ((s->cstat & 48) == 0 && t->statnum != 99)
if (s->picnum != EXPLOSION2 && s->picnum != DOMELITE && s->picnum != TORNADO && s->picnum != EXPLOSION3 && (s->picnum != SBMOVE || isRRRA())) if (s->picnum != EXPLOSION2 && s->picnum != DOMELITE && s->picnum != TORNADO && s->picnum != EXPLOSION3 && (s->picnum != SBMOVE || isRRRA()))
{ {
if (hittype[i].dispicnum < 0) if (h->dispicnum < 0)
{ {
hittype[i].dispicnum++; h->dispicnum++;
continue; continue;
} }
else if (r_shadows && spritesortcnt < (MAXSPRITESONSCREEN - 2)) else if (r_shadows && spritesortcnt < (MAXSPRITESONSCREEN - 2))
@ -731,7 +736,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
if ((sector[sect].lotag & 0xff) > 2 || s->statnum == 4 || s->statnum == 5 || s->picnum == DRONE) if ((sector[sect].lotag & 0xff) > 2 || s->statnum == 4 || s->statnum == 5 || s->picnum == DRONE)
daz = sector[sect].floorz; daz = sector[sect].floorz;
else else
daz = hittype[i].floorz; daz = h->floorz;
if ((s->z - daz) < (8 << 8)) if ((s->z - daz) < (8 << 8))
if (ps[screenpeek].posz < daz) if (ps[screenpeek].posz < daz)
@ -814,7 +819,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
break; break;
case FIRE: case FIRE:
case BURNING: case BURNING:
if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2) if (Owner->picnum != TREE1 && Owner->picnum != TREE2)
t->z = sector[t->sectnum].floorz; t->z = sector[t->sectnum].floorz;
t->shade = -127; t->shade = -127;
break; break;
@ -911,8 +916,8 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
} }
else t->cstat &= ~4; else t->cstat &= ~4;
t->picnum = s->picnum + k + ((hittype[i].temp_data[0] < 4) * 5); t->picnum = s->picnum + k + ((h->temp_data[0] < 4) * 5);
t->shade = sprite[s->owner].shade; t->shade = Owner->shade;
break; break;
case MUD: case MUD:
t->picnum = MUD + t1; t->picnum = MUD + t1;
@ -921,35 +926,35 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
t->picnum = WATERSPLASH2 + t1; t->picnum = WATERSPLASH2 + t1;
break; break;
case REACTOR2: case REACTOR2:
t->picnum = s->picnum + hittype[i].temp_data[2]; t->picnum = s->picnum + h->temp_data[2];
break; break;
case SHELL: case SHELL:
t->picnum = s->picnum + (hittype[i].temp_data[0] & 1); t->picnum = s->picnum + (h->temp_data[0] & 1);
case SHOTGUNSHELL: case SHOTGUNSHELL:
t->cstat |= 12; t->cstat |= 12;
if (hittype[i].temp_data[0] > 1) t->cstat &= ~4; if (h->temp_data[0] > 1) t->cstat &= ~4;
if (hittype[i].temp_data[0] > 2) t->cstat &= ~12; if (h->temp_data[0] > 2) t->cstat &= ~12;
break; break;
case FRAMEEFFECT1: case FRAMEEFFECT1:
if (s->owner >= 0 && sprite[s->owner].statnum < MAXSTATUS) if (s->owner >= 0 && Owner->statnum < MAXSTATUS)
{ {
if (sprite[s->owner].picnum == APLAYER) if (Owner->picnum == APLAYER)
if (ud.camerasprite == -1) if (ud.camerasprite == -1)
if (screenpeek == sprite[s->owner].yvel && display_mirror == 0) if (screenpeek == Owner->yvel && display_mirror == 0)
{ {
t->owner = -1; t->owner = -1;
break; break;
} }
if ((sprite[s->owner].cstat & 32768) == 0) if ((Owner->cstat & 32768) == 0)
{ {
if (sprite[s->owner].picnum == APLAYER) if (Owner->picnum == APLAYER)
t->picnum = 1554; t->picnum = 1554;
else else
t->picnum = hittype[s->owner].dispicnum; t->picnum = hittype[s->owner].dispicnum;
t->pal = sprite[s->owner].pal; t->pal = Owner->pal;
t->shade = sprite[s->owner].shade; t->shade = Owner->shade;
t->ang = sprite[s->owner].ang; t->ang = Owner->ang;
t->cstat = 2 | sprite[s->owner].cstat; t->cstat = 2 | Owner->cstat;
} }
} }
break; break;
@ -967,7 +972,7 @@ void animatesprites_r(int x, int y, int a, int smoothratio)
break; break;
} }
hittype[i].dispicnum = t->picnum; h->dispicnum = t->picnum;
if (sector[t->sectnum].floorpicnum == MIRROR) if (sector[t->sectnum].floorpicnum == MIRROR)
t->xrepeat = t->yrepeat = 0; t->xrepeat = t->yrepeat = 0;
} }