zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle all fsp = &actor->s();

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-25 00:32:23 +01:00
parent 822c88c135
commit 6df8f8a537
3 changed files with 12 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,6 @@ void DoRotatorOperate(PLAYERp pp, sectortype* sect)
void DoRotatorMatch(PLAYERp pp, short match, bool manual) void DoRotatorMatch(PLAYERp pp, short match, bool manual)
{ {
USERp fu; USERp fu;
SPRITEp fsp;
DSWActor* firstVator = nullptr; DSWActor* firstVator = nullptr;
//RotatorSwitch(match, ON); //RotatorSwitch(match, ON);
@ -148,22 +147,20 @@ void DoRotatorMatch(PLAYERp pp, short match, bool manual)
SWStatIterator it(STAT_ROTATOR); SWStatIterator it(STAT_ROTATOR);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s();
if (SP_TAG1(actor) == SECT_ROTATOR && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_ROTATOR && SP_TAG2(actor) == match)
{ {
fu = actor->u(); fu = actor->u();
// single play only vator // single play only vator
// bool 8 must be set for message to display // bool 8 must be set for message to display
if (TEST_BOOL4(fsp) && (gNet.MultiGameType == MULTI_GAME_COMMBAT || gNet.MultiGameType == MULTI_GAME_AI_BOTS)) if (TEST_BOOL4(actor) && (gNet.MultiGameType == MULTI_GAME_COMMBAT || gNet.MultiGameType == MULTI_GAME_AI_BOTS))
{ {
if (pp && TEST_BOOL11(fsp)) PutStringInfo(pp, GStrings("TXT_SPONLY")); if (pp && TEST_BOOL11(actor)) PutStringInfo(pp, GStrings("TXT_SPONLY"));
continue; continue;
} }
// switch trigger only // switch trigger only
if (SP_TAG3(fsp) == 1) if (SP_TAG3(actor) == 1)
{ {
// tried to manually operat a switch/trigger only // tried to manually operat a switch/trigger only
if (manual) if (manual)
@ -173,7 +170,7 @@ void DoRotatorMatch(PLAYERp pp, short match, bool manual)
if (firstVator == nullptr) if (firstVator == nullptr)
firstVator = actor; firstVator = actor;
auto sect = fsp->sector(); auto sect = actor->spr.sector();
if (pp && sect->hasU() && sect->stag == SECT_LOCK_DOOR && sect->number) if (pp && sect->hasU() && sect->stag == SECT_LOCK_DOOR && sect->number)
{ {
@ -205,14 +202,12 @@ bool TestRotatorMatchActive(short match)
SWStatIterator it(STAT_ROTATOR); SWStatIterator it(STAT_ROTATOR);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s();
if (SP_TAG1(actor) == SECT_ROTATOR && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_ROTATOR && SP_TAG2(actor) == match)
{ {
fu = actor->u(); fu = actor->u();
// Does not have to be inactive to be operated // Does not have to be inactive to be operated
if (TEST_BOOL6(fsp)) if (TEST_BOOL6(actor))
continue; continue;
if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics) if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics)

16
source/games/sw/src/slidor.cpp
View file

@ -139,34 +139,31 @@ void DoSlidorOperate(PLAYERp pp, sectortype* sect)
void DoSlidorMatch(PLAYERp pp, short match, bool manual) void DoSlidorMatch(PLAYERp pp, short match, bool manual)
{ {
USERp fu; USERp fu;
SPRITEp fsp;
SWStatIterator it(STAT_SLIDOR); SWStatIterator it(STAT_SLIDOR);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s();
if (SP_TAG1(actor) == SECT_SLIDOR && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_SLIDOR && SP_TAG2(actor) == match)
{ {
fu = actor->u(); fu = actor->u();
// single play only vator // single play only vator
// bool 8 must be set for message to display // bool 8 must be set for message to display
if (TEST_BOOL4(fsp) && (gNet.MultiGameType == MULTI_GAME_COMMBAT || gNet.MultiGameType == MULTI_GAME_AI_BOTS)) if (TEST_BOOL4(actor) && (gNet.MultiGameType == MULTI_GAME_COMMBAT || gNet.MultiGameType == MULTI_GAME_AI_BOTS))
{ {
if (pp && TEST_BOOL11(fsp)) PutStringInfo(pp, GStrings("TXTS_SPONLY")); if (pp && TEST_BOOL11(actor)) PutStringInfo(pp, GStrings("TXTS_SPONLY"));
continue; continue;
} }
// switch trigger only // switch trigger only
if (SP_TAG3(fsp) == 1) if (SP_TAG3(actor) == 1)
{ {
// tried to manually operat a switch/trigger only // tried to manually operat a switch/trigger only
if (manual) if (manual)
continue; continue;
} }
auto sect = fsp->sector(); auto sect = actor->spr.sector();
if (pp && sect->hasU() && sect->stag == SECT_LOCK_DOOR && sect->number) if (pp && sect->hasU() && sect->stag == SECT_LOCK_DOOR && sect->number)
{ {
@ -193,19 +190,16 @@ void DoSlidorMatch(PLAYERp pp, short match, bool manual)
bool TestSlidorMatchActive(short match) bool TestSlidorMatchActive(short match)
{ {
USERp fu; USERp fu;
SPRITEp fsp;
SWStatIterator it(STAT_SLIDOR); SWStatIterator it(STAT_SLIDOR);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s();
if (SP_TAG1(actor) == SECT_SLIDOR && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_SLIDOR && SP_TAG2(actor) == match)
{ {
fu = actor->u(); fu = actor->u();
// Does not have to be inactive to be operated // Does not have to be inactive to be operated
if (TEST_BOOL6(fsp)) if (TEST_BOOL6(actor))
continue; continue;
if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics) if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics)

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

@ -139,15 +139,12 @@ void SetSpikeInactive(DSWActor* actor)
// called for operation from the space bar // called for operation from the space bar
void DoSpikeOperate(sectortype* sect) void DoSpikeOperate(sectortype* sect)
{ {
SPRITEp fsp;
short match; short match;
SWSectIterator it(sect); SWSectIterator it(sect);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s(); if (actor->spr.statnum == STAT_SPIKE && SP_TAG1(actor) == SECT_SPIKE && SP_TAG3(actor) == 0)
if (fsp->statnum == STAT_SPIKE && SP_TAG1(actor) == SECT_SPIKE && SP_TAG3(fsp) == 0)
{ {
match = SP_TAG2(actor); match = SP_TAG2(actor);
if (match > 0) if (match > 0)
@ -186,19 +183,16 @@ void DoSpikeMatch(short match)
bool TestSpikeMatchActive(short match) bool TestSpikeMatchActive(short match)
{ {
USERp fu; USERp fu;
SPRITEp fsp;
SWStatIterator it(STAT_SPIKE); SWStatIterator it(STAT_SPIKE);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
fsp = &actor->s();
if (SP_TAG1(actor) == SECT_SPIKE && SP_TAG2(actor) == match) if (SP_TAG1(actor) == SECT_SPIKE && SP_TAG2(actor) == match)
{ {
fu = actor->u(); fu = actor->u();
// door war // door war
if (TEST_BOOL6(fsp)) if (TEST_BOOL6(actor))
continue; continue;
if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics) if (TEST(fu->Flags, SPR_ACTIVE) || fu->Tics)