zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- moved FirstThinker function to FLevelLocals 

Currently it is meaningless but that's where it should be later.
This commit is contained in:
Christoph Oelckers 2019-01-28 14:06:19 +01:00
parent 41e576bbb5
commit d0942bcb97
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dthinker.cpp
View File

@ -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;

1
src/dthinker.h
View File

@ -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);

1
src/g_levellocals.h
View File

@ -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);

4
src/g_shared/a_decals.cpp
View File

@ -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();