teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-03 22:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- iterators in quake.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-02 18:55:08 +01:00
parent 0e629eb322
commit 4661f6d7c5
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/games/sw/src/quake.cpp
View file

@ -76,13 +76,10 @@ short CopyQuakeSpotToOn(SPRITEp sp)
void DoQuakeMatch(short match)
{
int i;
SPRITEp sp;
StatIterator it(STAT_QUAKE_SPOT);
while ((i = it.NextIndex()) >= 0)
SWStatIterator it(STAT_QUAKE_SPOT);
while (auto actor = it.Next())
{
sp = &sprite[i];
auto sp = &actor->s();
if (QUAKE_Match(sp) == match)
{
@ -96,7 +93,7 @@ void DoQuakeMatch(short match)
CopyQuakeSpotToOn(sp);
if (QUAKE_KillAfterQuake(sp))
{
KillSprite(i);
KillActor(actor);
continue;
}
}
@ -107,19 +104,16 @@ void DoQuakeMatch(short match)
void ProcessQuakeOn(void)
{
int i;
SPRITEp sp;
StatIterator it(STAT_QUAKE_ON);
while ((i = it.NextIndex()) >= 0)
{
sp = &sprite[i];
SWStatIterator it(STAT_QUAKE_ON);
while (auto actor = it.Next())
{
auto sp = &actor->s();
// get rid of quake when timer runs out
QUAKE_Duration(sp) -= synctics*4;
if (QUAKE_Duration(sp) < 0)
{
KillSprite(i);
KillActor(actor);
continue;
}
}
@ -190,10 +184,10 @@ void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *a
return;
// find the closest quake - should be a strength value
StatIterator it(STAT_QUAKE_ON);
while ((i = it.NextIndex()) >= 0)
{
sp = &sprite[i];
SWStatIterator it(STAT_QUAKE_ON);
while (auto actor = it.Next())
{
auto sp = &actor->s();
dist = FindDistance3D(pp->posx - sp->x, pp->posy - sp->y, pp->posz - sp->z);