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

- delete u variables in spike.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-25 22:36:05 +01:00
parent d95a22485b
commit 9b18316fd7
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/games/sw/src/spike.cpp
View file

@ -40,8 +40,6 @@ bool TestSpikeMatchActive(short match);
void ReverseSpike(DSWActor* actor) void ReverseSpike(DSWActor* actor)
{ {
USERp u = actor->u();
// if paused go ahead and start it up again // if paused go ahead and start it up again
if (actor->user.Tics) if (actor->user.Tics)
{ {
@ -88,7 +86,6 @@ bool SpikeSwitch(short match, short setting)
void SetSpikeActive(DSWActor* actor) void SetSpikeActive(DSWActor* actor)
{ {
USERp u = actor->u();
SECTORp sectp = actor->spr.sector(); SECTORp sectp = actor->spr.sector();
if (TEST(actor->spr.cstat, CSTAT_SPRITE_YFLIP)) if (TEST(actor->spr.cstat, CSTAT_SPRITE_YFLIP))
@ -115,7 +112,6 @@ void SetSpikeActive(DSWActor* actor)
void SetSpikeInactive(DSWActor* actor) void SetSpikeInactive(DSWActor* actor)
{ {
USERp u = actor->u();
SECTORp sectp = actor->spr.sector(); SECTORp sectp = actor->spr.sector();
if (TEST(actor->spr.cstat, CSTAT_SPRITE_YFLIP)) if (TEST(actor->spr.cstat, CSTAT_SPRITE_YFLIP))
@ -177,20 +173,16 @@ void DoSpikeMatch(short match)
bool TestSpikeMatchActive(short match) bool TestSpikeMatchActive(short match)
{ {
USERp fu;
SWStatIterator it(STAT_SPIKE); SWStatIterator it(STAT_SPIKE);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
if (SP_TAG1(actor) == SECT_SPIKE && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_SPIKE && SP_TAG2(actor) == match)
{ {
fu = actor->u();
// door war // door war
if (TEST_BOOL6(actor)) if (TEST_BOOL6(actor))
continue; continue;
if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics) if (TEST(actor->user.Flags, SPR_ACTIVE) || actor->user.Tics)
return true; return true;
} }
} }
@ -200,7 +192,6 @@ bool TestSpikeMatchActive(short match)
int DoSpikeMove(DSWActor* actor, int *lptr) int DoSpikeMove(DSWActor* actor, int *lptr)
{ {
USERp u = actor->u();
int zval; int zval;
zval = *lptr; zval = *lptr;
@ -237,8 +228,6 @@ int DoSpikeMove(DSWActor* actor, int *lptr)
void SpikeAlign(DSWActor* actor) void SpikeAlign(DSWActor* actor)
{ {
USERp u = actor->u();
// either work on single sector or all tagged in SOBJ // either work on single sector or all tagged in SOBJ
if ((int8_t)SP_TAG7(actor) < 0) if ((int8_t)SP_TAG7(actor) < 0)
{ {
@ -276,7 +265,6 @@ void MoveSpritesWithSpike(sectortype* sect)
int DoSpike(DSWActor* actor) int DoSpike(DSWActor* actor)
{ {
USER* u = actor->u();
int *lptr; int *lptr;
// zclip = floor or ceiling z // zclip = floor or ceiling z
@ -387,7 +375,6 @@ int DoSpike(DSWActor* actor)
int DoSpikeAuto(DSWActor* actor) int DoSpikeAuto(DSWActor* actor)
{ {
USER* u = actor->u();
int *lptr; int *lptr;
lptr = &actor->user.zclip; lptr = &actor->user.zclip;