zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-21 11:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- same for checkhitsprite_r.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-24 06:24:57 +02:00
parent 4443234126
commit 41f2fe5e06
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
source/games/duke/src/sectors_r.cpp
View file

@ -1526,9 +1526,10 @@ bool checkhitceiling_r(int sn)
void checkhitsprite_r(int i, int sn) void checkhitsprite_r(int i, int sn)
{ {
int j, k, p; int j, k, p;
auto targ = &hittype[i];
i &= (MAXSPRITES - 1); auto proj = &hittype[sn];
spritetype* s = &sprite[i]; spritetype* s = &sprite[i];
auto pspr = &sprite[sn];
if (isRRRA()) switch (s->picnum) if (isRRRA()) switch (s->picnum)
{ {
@ -2064,8 +2065,8 @@ void checkhitsprite_r(int i, int sn)
EGS(s->sectnum, s->x, s->y, s->z - (8 << 8), SCRAP6 + (krand() & 15), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (s->zvel >> 2), i, 5); EGS(s->sectnum, s->x, s->y, s->z - (8 << 8), SCRAP6 + (krand() & 15), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (s->zvel >> 2), i, 5);
break; break;
case BOWLINGBALL: case BOWLINGBALL:
sprite[sn].xvel = (s->xvel >> 1) + (s->xvel >> 2); pspr->xvel = (s->xvel >> 1) + (s->xvel >> 2);
sprite[sn].ang -= (krand() & 16); pspr->ang -= (krand() & 16);
S_PlayActorSound(355, i); S_PlayActorSound(355, i);
break; break;
@ -2075,25 +2076,25 @@ void checkhitsprite_r(int i, int sn)
case RRTILE3440 + 1: case RRTILE3440 + 1:
case HENSTAND: case HENSTAND:
case HENSTAND + 1: case HENSTAND + 1:
if (sprite[sn].picnum == QUEBALL || sprite[sn].picnum == STRIPEBALL) if (pspr->picnum == QUEBALL || pspr->picnum == STRIPEBALL)
{ {
sprite[sn].xvel = (s->xvel >> 1) + (s->xvel >> 2); pspr->xvel = (s->xvel >> 1) + (s->xvel >> 2);
sprite[sn].ang -= (s->ang << 1) + 1024; pspr->ang -= (s->ang << 1) + 1024;
s->ang = getangle(s->x - sprite[sn].x, s->y - sprite[sn].y) - 512; s->ang = getangle(s->x - pspr->x, s->y - pspr->y) - 512;
if (S_CheckSoundPlaying(POOLBALLHIT) < 2) if (S_CheckSoundPlaying(POOLBALLHIT) < 2)
S_PlayActorSound(POOLBALLHIT, i); S_PlayActorSound(POOLBALLHIT, i);
} }
else if (sprite[sn].picnum == RRTILE3440 || sprite[sn].picnum == RRTILE3440 + 1) else if (pspr->picnum == RRTILE3440 || pspr->picnum == RRTILE3440 + 1)
{ {
sprite[sn].xvel = (s->xvel >> 1) + (s->xvel >> 2); pspr->xvel = (s->xvel >> 1) + (s->xvel >> 2);
sprite[sn].ang -= ((s->ang << 1) + krand()) & 64; pspr->ang -= ((s->ang << 1) + krand()) & 64;
s->ang = (s->ang + krand()) & 16; s->ang = (s->ang + krand()) & 16;
S_PlayActorSound(355, i); S_PlayActorSound(355, i);
} }
else if (sprite[sn].picnum == HENSTAND || sprite[sn].picnum == HENSTAND + 1) else if (pspr->picnum == HENSTAND || pspr->picnum == HENSTAND + 1)
{ {
sprite[sn].xvel = (s->xvel >> 1) + (s->xvel >> 2); pspr->xvel = (s->xvel >> 1) + (s->xvel >> 2);
sprite[sn].ang -= ((s->ang << 1) + krand()) & 16; pspr->ang -= ((s->ang << 1) + krand()) & 16;
s->ang = (s->ang + krand()) & 16; s->ang = (s->ang + krand()) & 16;
S_PlayActorSound(355, i); S_PlayActorSound(355, i);
} }
@ -2102,7 +2103,7 @@ void checkhitsprite_r(int i, int sn)
if (krand() & 3) if (krand() & 3)
{ {
s->xvel = 164; s->xvel = 164;
s->ang = sprite[sn].ang; s->ang = pspr->ang;
} }
} }
break; break;
@ -2111,7 +2112,7 @@ void checkhitsprite_r(int i, int sn)
case TREE2: case TREE2:
case TIRE: case TIRE:
case BOX: case BOX:
switch (sprite[sn].picnum) switch (pspr->picnum)
{ {
case RPG2: case RPG2:
if (!isRRRA()) break; if (!isRRRA()) break;
@ -2136,7 +2137,7 @@ void checkhitsprite_r(int i, int sn)
case CACTUS: case CACTUS:
// case CACTUSBROKE: // case CACTUSBROKE:
switch (sprite[sn].picnum) switch (pspr->picnum)
{ {
case RPG2: case RPG2:
if (!isRRRA()) break; if (!isRRRA()) break;
@ -2181,7 +2182,7 @@ void checkhitsprite_r(int i, int sn)
case FUELPOD: case FUELPOD:
case SOLARPANNEL: case SOLARPANNEL:
case ANTENNA: case ANTENNA:
if (actorinfo[SHOTSPARK1].scriptaddress && sprite[sn].extra != ScriptCode[actorinfo[SHOTSPARK1].scriptaddress]) if (actorinfo[SHOTSPARK1].scriptaddress && pspr->extra != ScriptCode[actorinfo[SHOTSPARK1].scriptaddress])
{ {
for (j = 0; j < 15; j++) for (j = 0; j < 15; j++)
EGS(s->sectnum, s->x, s->y, sector[s->sectnum].floorz - (12 << 8) - (j << 9), SCRAP1 + (krand() & 15), -8, 64, 64, EGS(s->sectnum, s->x, s->y, sector[s->sectnum].floorz - (12 << 8) - (j << 9), SCRAP1 + (krand() & 15), -8, 64, 64,
@ -2335,19 +2336,19 @@ void checkhitsprite_r(int i, int sn)
if ((s->cstat & 16) && s->hitag == 0 && s->lotag == 0 && s->statnum == 0) if ((s->cstat & 16) && s->hitag == 0 && s->lotag == 0 && s->statnum == 0)
break; break;
if ((sprite[sn].picnum == SHRINKSPARK || sprite[sn].picnum == FREEZEBLAST || sprite[sn].owner != i) && s->statnum != 4) if ((pspr->picnum == SHRINKSPARK || pspr->picnum == FREEZEBLAST || pspr->owner != i) && s->statnum != 4)
{ {
if (badguy(&sprite[i]) == 1) if (badguy(&sprite[i]) == 1)
{ {
if (sprite[sn].picnum == RPG) sprite[sn].extra <<= 1; if (pspr->picnum == RPG) pspr->extra <<= 1;
else if (isRRRA() && sprite[sn].picnum == RPG2) sprite[sn].extra <<= 1; else if (isRRRA() && pspr->picnum == RPG2) pspr->extra <<= 1;
if ((s->picnum != DRONE)) if ((s->picnum != DRONE))
if (sprite[sn].picnum != FREEZEBLAST) if (pspr->picnum != FREEZEBLAST)
//if (actortype[s->picnum] == 0) //TRANSITIONAL. Cannot be done right with EDuke mess backing the engine. //if (actortype[s->picnum] == 0) //TRANSITIONAL. Cannot be done right with EDuke mess backing the engine.
{ {
j = fi.spawn(sn, JIBS6); j = fi.spawn(sn, JIBS6);
if (sprite[sn].pal == 6) if (pspr->pal == 6)
sprite[j].pal = 6; sprite[j].pal = 6;
sprite[j].z += (4 << 8); sprite[j].z += (4 << 8);
sprite[j].xvel = 16; sprite[j].xvel = 16;
@ -2355,7 +2356,7 @@ void checkhitsprite_r(int i, int sn)
sprite[j].ang += 32 - (krand() & 63); sprite[j].ang += 32 - (krand() & 63);
} }
j = sprite[sn].owner; j = pspr->owner;
if (j >= 0 && sprite[j].picnum == APLAYER && s->picnum != DRONE) if (j >= 0 && sprite[j].picnum == APLAYER && s->picnum != DRONE)
if (ps[sprite[j].yvel].curr_weapon == SHOTGUN_WEAPON) if (ps[sprite[j].yvel].curr_weapon == SHOTGUN_WEAPON)
@ -2375,14 +2376,14 @@ void checkhitsprite_r(int i, int sn)
if (s->statnum != 2) if (s->statnum != 2)
{ {
if (sprite[sn].picnum == FREEZEBLAST && ((s->picnum == APLAYER && s->pal == 1) || (freezerhurtowner == 0 && sprite[sn].owner == i))) if (pspr->picnum == FREEZEBLAST && ((s->picnum == APLAYER && s->pal == 1) || (freezerhurtowner == 0 && pspr->owner == i)))
return; return;
hittype[i].picnum = sprite[sn].picnum; hittype[i].picnum = pspr->picnum;
hittype[i].extra += sprite[sn].extra; hittype[i].extra += pspr->extra;
if (s->picnum != COW) if (s->picnum != COW)
hittype[i].ang = sprite[sn].ang; hittype[i].ang = pspr->ang;
hittype[i].owner = sprite[sn].owner; hittype[i].owner = pspr->owner;
} }
if (s->statnum == 10) if (s->statnum == 10)
@ -2407,7 +2408,7 @@ void checkhitsprite_r(int i, int sn)
if (sprite[hittype[i].owner].picnum != APLAYER) if (sprite[hittype[i].owner].picnum != APLAYER)
if (ud.player_skill >= 3) if (ud.player_skill >= 3)
sprite[sn].extra += (sprite[sn].extra >> 1); pspr->extra += (pspr->extra >> 1);
} }
} }