mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 12:32:34 +00:00
- moved FirstThinker function to FLevelLocals
Currently it is meaningless but that's where it should be later.
This commit is contained in:
parent
41e576bbb5
commit
d0942bcb97
4 changed files with 6 additions and 6 deletions
|
@ -328,7 +328,7 @@ void DThinker::PostSerialize()
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
DThinker *DThinker::FirstThinker (int statnum)
|
||||
DThinker *FLevelLocals::FirstThinker (int statnum)
|
||||
{
|
||||
DThinker *node;
|
||||
|
||||
|
@ -336,10 +336,10 @@ DThinker *DThinker::FirstThinker (int statnum)
|
|||
{
|
||||
statnum = MAX_STATNUM;
|
||||
}
|
||||
node = Thinkers[statnum].GetHead();
|
||||
node = DThinker::Thinkers[statnum].GetHead();
|
||||
if (node == NULL)
|
||||
{
|
||||
node = FreshThinkers[statnum].GetHead();
|
||||
node = DThinker::FreshThinkers[statnum].GetHead();
|
||||
if (node == NULL)
|
||||
{
|
||||
return NULL;
|
||||
|
|
|
@ -90,7 +90,6 @@ public:
|
|||
static void SerializeThinkers(FSerializer &arc, bool keepPlayers);
|
||||
static void MarkRoots();
|
||||
|
||||
static DThinker *FirstThinker (int statnum);
|
||||
private:
|
||||
static void DestroyThinkersInList (FThinkerList &list);
|
||||
static bool DoDestroyThinkersInList(FThinkerList &list);
|
||||
|
|
|
@ -261,6 +261,7 @@ public:
|
|||
FSerializer &SerializeSubsectors(FSerializer &arc, const char *key);
|
||||
void SpawnExtraPlayers();
|
||||
void Serialize(FSerializer &arc, bool hubload);
|
||||
DThinker *FirstThinker (int statnum);
|
||||
|
||||
// g_Game
|
||||
void PlayerReborn (int player);
|
||||
|
|
|
@ -542,7 +542,7 @@ CUSTOM_CVAR (Int, cl_maxdecals, 1024, CVAR_ARCHIVE)
|
|||
{
|
||||
while (Level->ImpactDecalCount > self)
|
||||
{
|
||||
DThinker *thinker = DThinker::FirstThinker(STAT_AUTODECAL);
|
||||
DThinker *thinker = Level->FirstThinker(STAT_AUTODECAL);
|
||||
if (thinker != NULL)
|
||||
{
|
||||
thinker->Destroy();
|
||||
|
@ -555,7 +555,7 @@ void DImpactDecal::CheckMax ()
|
|||
{
|
||||
if (++Level->ImpactDecalCount >= cl_maxdecals)
|
||||
{
|
||||
DThinker *thinker = DThinker::FirstThinker (STAT_AUTODECAL);
|
||||
DThinker *thinker = Level->FirstThinker (STAT_AUTODECAL);
|
||||
if (thinker != NULL)
|
||||
{
|
||||
thinker->Destroy();
|
||||
|
|
Loading…
Reference in a new issue