teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the remaining iterators in sectors_r.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-02 20:42:20 +01:00
parent 6a8dc8217f
commit e427668373
1 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1914,13 +1914,13 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
fi.hitradius(targ, 10, 0, 0, 1, 1); fi.hitradius(targ, 10, 0, 0, 1, 1);
if (s->lotag != 0) if (s->lotag != 0)
{ {
short j; DukeSpriteIterator it;
for (j = 0; j < MAXSPRITES; j++) while (auto act = it.Next())
{ {
if (sprite[j].picnum == RRTILE8679 && sprite[j].pal == 4) if (act->s.picnum == RRTILE8679 && act->s.pal == 4)
{ {
if (sprite[j].lotag == s->lotag) if (act->s.lotag == s->lotag)
sprite[j].picnum = RRTILE8680; act->s.picnum = RRTILE8680;
} }
} }
} }
@ -1937,14 +1937,14 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
case RRTILE8099: case RRTILE8099:
if (s->lotag == 5) if (s->lotag == 5)
{ {
short j;
s->lotag = 0; s->lotag = 0;
s->picnum = RRTILE5087; s->picnum = RRTILE5087;
S_PlayActorSound(340, targ); S_PlayActorSound(340, targ);
for (j = 0; j < MAXSPRITES; j++) DukeSpriteIterator it;
while (auto act = it.Next())
{ {
if (sprite[j].picnum == RRTILE8094) if (act->s.picnum == RRTILE8094)
sprite[j].picnum = RRTILE5088; act->s.picnum = RRTILE5088;
} }
} }
break; break;
@ -1954,13 +1954,13 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
s->picnum = RRTILE2451; s->picnum = RRTILE2451;
if (s->lotag != 0) if (s->lotag != 0)
{ {
short j; DukeSpriteIterator it;
for (j = 0; j < MAXSPRITES; j++) while (auto act = it.Next())
{ {
if (sprite[j].picnum == RRTILE2431 && sprite[j].pal == 4) if (act->s.picnum == RRTILE2431 && act->s.pal == 4)
{ {
if (s->lotag == sprite[j].lotag) if (s->lotag == act->s.lotag)
sprite[j].picnum = RRTILE2451; act->s.picnum = RRTILE2451;
} }
} }
} }
@ -1981,17 +1981,17 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
S_PlayActorSound(SQUISHED, targ); S_PlayActorSound(SQUISHED, targ);
if (s->lotag != 0) if (s->lotag != 0)
{ {
short j; DukeSpriteIterator it;
for (j = 0; j < MAXSPRITES; j++) while (auto act = it.Next())
{ {
if (sprite[j].picnum == RRTILE2451 && sprite[j].pal == 4) if (act->s.picnum == RRTILE2451 && act->s.pal == 4)
{ {
if (s->lotag == sprite[j].lotag) if (s->lotag == act->s.lotag)
{ {
fi.guts(targ, RRTILE2460, 12, myconnectindex); fi.guts(targ, RRTILE2460, 12, myconnectindex);
fi.guts(targ, RRTILE2465, 3, myconnectindex); fi.guts(targ, RRTILE2465, 3, myconnectindex);
sprite[j].xrepeat = 0; act->s.xrepeat = 0;
sprite[j].yrepeat = 0; act->s.yrepeat = 0;
s->xrepeat = 0; s->xrepeat = 0;
s->yrepeat = 0; s->yrepeat = 0;
} }
@ -2283,11 +2283,6 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
s->picnum = BROKEFIREHYDRENT; s->picnum = BROKEFIREHYDRENT;
spawn(targ, TOILETWATER); spawn(targ, TOILETWATER);
// for(k=0;k<5;k++)
// {
// j = EGS(s->sectnum,s->x,s->y,s->z-(krand()%(48<<8)),SCRAP3+(krand()&3),-8,48,48,krand()&2047,(krand()&63)+64,-(krand()&4095)-(s->zvel>>2),i,5);
// sprite[j].pal = 2;
// }
S_PlayActorSound(GLASS_HEAVYBREAK, targ); S_PlayActorSound(GLASS_HEAVYBREAK, targ);
break; break;
@ -2370,10 +2365,10 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
spawned->s.ang += 32 - (krand() & 63); spawned->s.ang += 32 - (krand() & 63);
} }
j = pspr->owner; auto Owner = proj->GetOwner();
if (j >= 0 && sprite[j].picnum == APLAYER && s->picnum != DRONE) if (Owner && Owner->s.picnum == APLAYER && s->picnum != DRONE)
if (ps[sprite[j].yvel].curr_weapon == SHOTGUN_WEAPON) if (ps[Owner->PlayerIndex()].curr_weapon == SHOTGUN_WEAPON)
{ {
fi.shoot(targ, BLOODSPLAT3); fi.shoot(targ, BLOODSPLAT3);
fi.shoot(targ, BLOODSPLAT1); fi.shoot(targ, BLOODSPLAT1);
@ -2413,14 +2408,14 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
updatesector(ps[p].posx, ps[p].posy, &ps[p].cursectnum); updatesector(ps[p].posx, ps[p].posy, &ps[p].cursectnum);
setpal(&ps[p]); setpal(&ps[p]);
StatIterator it(STAT_EFFECTOR); DukeStatIterator it(STAT_EFFECTOR);
while ((j = it.NextIndex()) >= 0) while (auto act = it.Next())
{ {
if (sprite[j].picnum == CAMERA1) sprite[j].yvel = 0; if (act->s.picnum == CAMERA1) act->s.yvel = 0;
} }
} }
auto Owner = targ->GetHitOwner();
if (sprite[targ->owner].picnum != APLAYER) if (!Owner || Owner->s.picnum != APLAYER)
if (ud.player_skill >= 3) if (ud.player_skill >= 3)
pspr->extra += (pspr->extra >> 1); pspr->extra += (pspr->extra >> 1);
} }
@ -2736,10 +2731,10 @@ void checksectors_r(int snum)
if (neartagsector >= 0 && (sector[neartagsector].lotag & 16384) == 0 && isanearoperator(sector[neartagsector].lotag)) if (neartagsector >= 0 && (sector[neartagsector].lotag & 16384) == 0 && isanearoperator(sector[neartagsector].lotag))
{ {
short unk = 0; short unk = 0;
SectIterator it(neartagsector); DukeSectIterator it(neartagsector);
while ((i = it.NextIndex()) >= 0) while (auto act = it.Next())
{ {
if (sprite[i].picnum == ACTIVATOR || sprite[i].picnum == MASTERSWITCH) if (act->s.picnum == ACTIVATOR || act->s.picnum == MASTERSWITCH)
return; return;
} }
if (haskey(neartagsector, snum)) if (haskey(neartagsector, snum))
@ -2757,10 +2752,11 @@ void checksectors_r(int snum)
{ {
if (isanunderoperator(sector[p->GetActor()->s.sectnum].lotag)) if (isanunderoperator(sector[p->GetActor()->s.sectnum].lotag))
{ {
SectIterator it(p->GetActor()->s.sectnum); DukeSectIterator it(p->GetActor()->s.sectnum);
while ((i = it.NextIndex()) >= 0) while (auto act = it.Next())
{ {
if (sprite[i].picnum == ACTIVATOR || sprite[i].picnum == MASTERSWITCH) return; if (act->s.picnum == ACTIVATOR || act->s.picnum == MASTERSWITCH)
return;
} }
if (haskey(neartagsector, snum)) if (haskey(neartagsector, snum))
operatesectors(p->GetActor()->s.sectnum, p->GetActor()); operatesectors(p->GetActor()->s.sectnum, p->GetActor());