From de8d839885da1f792535a9a4ece9c20e9e18707b Mon Sep 17 00:00:00 2001 From: Boondorl Date: Thu, 31 Oct 2024 13:42:52 -0400 Subject: [PATCH] Moved Actor TID selector out of header --- src/g_level.cpp | 18 ++++++++++++++++++ src/g_levellocals.h | 18 +----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/g_level.cpp b/src/g_level.cpp index 1278494b245..d82c6835809 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -2400,6 +2400,24 @@ void FLevelLocals::ApplyCompatibility2() i_compatflags2 = GetCompatibility2(compatflags2) | ii_compatflags2; } +AActor* FLevelLocals::SelectActorFromTID(int tid, size_t index, AActor* defactor) +{ + if (tid == 0) + return defactor; + + AActor* actor = nullptr; + size_t cur = 0u; + auto it = GetActorIterator(tid); + while ((actor = it.Next()) != nullptr) + { + if (cur == index) + return actor; + ++cur; + } + + return nullptr; +} + //========================================================================== // IsPointInMap // diff --git a/src/g_levellocals.h b/src/g_levellocals.h index 86476d1a757..bb975e0eb4c 100644 --- a/src/g_levellocals.h +++ b/src/g_levellocals.h @@ -149,6 +149,7 @@ struct FLevelLocals int GetCompatibility2(int mask); void ApplyCompatibility(); void ApplyCompatibility2(); + AActor* SelectActorFromTID(int tid, size_t index, AActor* defactor); void Init(); @@ -316,23 +317,6 @@ struct FLevelLocals { return tid == 0 ? defactor : GetActorIterator(tid).Next(); } - AActor* SelectActorFromTID(int tid, size_t index, AActor *defactor) - { - if (tid == 0) - return defactor; - - AActor* actor = nullptr; - size_t cur = 0u; - auto it = GetActorIterator(tid); - while ((actor = it.Next()) != nullptr) - { - if (cur == index) - return actor; - ++cur; - } - - return nullptr; - } bool SectorHasTags(sector_t *sector) {