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

- WarpToUnderwater + WarpToSurface

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-04 00:11:22 +01:00
parent 5264c6540c
commit 1b02c9e533
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/games/sw/src/weapon.cpp
View file

@ -19182,8 +19182,7 @@ InitFireball(PLAYERp pp)
return 0; return 0;
} }
int int InitEnemyFireball(DSWActor* actor)
InitEnemyFireball(DSWActor* actor)
{ {
USER* u = actor->u(); USER* u = actor->u();
int SpriteNum = u->SpriteNum; int SpriteNum = u->SpriteNum;
@ -19278,8 +19277,7 @@ InitEnemyFireball(DSWActor* actor)
// for hitscans or other uses // for hitscans or other uses
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
bool bool WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
{ {
int i; int i;
SECT_USERp sectu = SectUser[*sectnum].Data(); SECT_USERp sectu = SectUser[*sectnum].Data();
@ -19293,10 +19291,10 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
return false; return false;
// search for DIVE_AREA "over" sprite for reference point // search for DIVE_AREA "over" sprite for reference point
StatIterator it(STAT_DIVE_AREA); SWStatIterator it(STAT_DIVE_AREA);
while ((i = it.NextIndex()) >= 0) while (auto itActor = it.Next())
{ {
over_sp = &sprite[i]; over_sp = &itActor->s();
if (TEST(sector[over_sp->sectnum].extra, SECTFX_DIVE_AREA) && if (TEST(sector[over_sp->sectnum].extra, SECTFX_DIVE_AREA) &&
SectUser[over_sp->sectnum].Data() && SectUser[over_sp->sectnum].Data() &&
@ -19312,9 +19310,9 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
// search for UNDERWATER "under" sprite for reference point // search for UNDERWATER "under" sprite for reference point
it.Reset(STAT_UNDERWATER); it.Reset(STAT_UNDERWATER);
while ((i = it.NextIndex()) >= 0) while (auto itActor = it.Next())
{ {
under_sp = &sprite[i]; under_sp = &itActor->s();
if (TEST(sector[under_sp->sectnum].extra, SECTFX_UNDERWATER) && if (TEST(sector[under_sp->sectnum].extra, SECTFX_UNDERWATER) &&
SectUser[under_sp->sectnum].Data() && SectUser[under_sp->sectnum].Data() &&
@ -19352,8 +19350,7 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
return true; return true;
} }
bool bool WarpToSurface(short *sectnum, int *x, int *y, int *z)
WarpToSurface(short *sectnum, int *x, int *y, int *z)
{ {
int i; int i;
SECT_USERp sectu = SectUser[*sectnum].Data(); SECT_USERp sectu = SectUser[*sectnum].Data();
@ -19368,10 +19365,10 @@ WarpToSurface(short *sectnum, int *x, int *y, int *z)
return false; return false;
// search for UNDERWATER "under" sprite for reference point // search for UNDERWATER "under" sprite for reference point
StatIterator it(STAT_UNDERWATER); SWStatIterator it(STAT_UNDERWATER);
while ((i = it.NextIndex()) >= 0) while (auto itActor = it.Next())
{ {
under_sp = &sprite[i]; under_sp = &itActor->s();
if (TEST(sector[under_sp->sectnum].extra, SECTFX_UNDERWATER) && if (TEST(sector[under_sp->sectnum].extra, SECTFX_UNDERWATER) &&
SectUser[under_sp->sectnum].Data() && SectUser[under_sp->sectnum].Data() &&
@ -19387,9 +19384,9 @@ WarpToSurface(short *sectnum, int *x, int *y, int *z)
// search for DIVE_AREA "over" sprite for reference point // search for DIVE_AREA "over" sprite for reference point
it.Reset(STAT_DIVE_AREA); it.Reset(STAT_DIVE_AREA);
while ((i = it.NextIndex()) >= 0) while (auto itActor = it.Next())
{ {
over_sp = &sprite[i]; over_sp = &itActor->s();
if (TEST(sector[over_sp->sectnum].extra, SECTFX_DIVE_AREA) && if (TEST(sector[over_sp->sectnum].extra, SECTFX_DIVE_AREA) &&
SectUser[over_sp->sectnum].Data() && SectUser[over_sp->sectnum].Data() &&
@ -19420,8 +19417,6 @@ WarpToSurface(short *sectnum, int *x, int *y, int *z)
*z = sector[over_sp->sectnum].floorz - Z(2); *z = sector[over_sp->sectnum].floorz - Z(2);
//MissileWaterAdjust(sp - sprite);
return true; return true;
} }