teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- actor iterators for movefx and its RRRA subfunction.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-24 10:30:17 +02:00
parent 801e94ca54
commit d95131cb4d
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/games/duke/src/actors.cpp
View file

@ -552,28 +552,26 @@ void moveplayers(void)
void movefx(void)
{
int i, j, p;
int p;
int x, ht;
StatIterator iti(STAT_FX);
while ((i = iti.NextIndex()) >= 0)
DukeStatIterator iti(STAT_FX);
while (auto act = iti.Next())
{
auto spri = &sprite[i];
auto act = &hittype[i];
auto spri = &act->s;
switch (spri->picnum)
{
case RESPAWN:
if (spri->extra == 66)
{
j = fi.spawn(i, spri->hitag);
auto j = spawn(act, spri->hitag);
if (isRRRA())
{
respawn_rrra(i, j);
respawn_rrra(act, j);
}
else
{
deletesprite(i);
deletesprite(act);
}
}
else if (spri->extra > (66 - 13))
@ -592,7 +590,7 @@ void movefx(void)
if (spri->lotag >= 1000 && spri->lotag < 2000)
{
x = ldist(&sprite[ps[screenpeek].i], spri);
x = ldist(ps[screenpeek].GetActor(), act);
if (x < ht && act->temp_data[0] == 0)
{
FX_SetReverb(spri->lotag - 1000);
@ -607,21 +605,21 @@ void movefx(void)
}
else if (spri->lotag < 999 && (unsigned)sector[spri->sectnum].lotag < ST_9_SLIDING_ST_DOOR && snd_ambience && sector[spri->sectnum].floorz != sector[spri->sectnum].ceilingz)
{
auto flags = S_GetUserFlags(spri->lotag);
int flags = S_GetUserFlags(spri->lotag);
if (flags & SF_MSFX)
{
int x = dist(&sprite[ps[screenpeek].i], spri);
int x = dist(ps[screenpeek].GetActor(), act);
if (x < ht && act->temp_data[0] == 0)
{
// Start playing an ambience sound.
S_PlayActorSound(spri->lotag, i, CHAN_AUTO, CHANF_LOOP);
S_PlayActorSound(spri->lotag, act, CHAN_AUTO, CHANF_LOOP);
act->temp_data[0] = 1; // AMBIENT_SFX_PLAYING
}
else if (x >= ht && act->temp_data[0] == 1)
{
// Stop playing ambience sound because we're out of its range.
S_StopSound(spri->lotag, i);
S_StopSound(spri->lotag, act);
}
}

10
source/games/duke/src/actors_r.cpp
View file

@ -784,10 +784,10 @@ int ifhitbyweapon_r(int sn)
//
//---------------------------------------------------------------------------
void respawn_rrra(int i, int j)
void respawn_rrra(DDukeActor* oldact, DDukeActor* newact)
{
auto newspr = &sprite[j];
newspr->pal = sprite[i].pal;
auto newspr = &newact->s;
newspr->pal = oldact->s.pal;
if (newspr->picnum == MAMA)
{
if (newspr->pal == 30)
@ -823,10 +823,10 @@ void respawn_rrra(int i, int j)
if (newspr->pal != 6)
{
deletesprite(i);
deletesprite(oldact);
return;
}
sprite[i].extra = (66 - 13);
oldact->s.extra = (66 - 13);
newspr->pal = 0;
}

2
source/games/duke/src/funct.h
View file

@ -91,7 +91,7 @@ void handle_se35(int i, int SMALLSMOKE, int EXPLOSION2);
void handle_se128(int i);
void handle_se130(int i, int countmax, int EXPLOSION2);
void respawn_rrra(int i, int j);
void respawn_rrra(DDukeActor* oldact, DDukeActor* newact);
int dodge(spritetype*);
void alterang(int a, int g_i, int g_p);