zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-04-04 15:41:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2017-02-26 00:53:09 +08:00
commit cf146ae49c
8 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_main.cpp
View file

@ -2709,6 +2709,7 @@ void D_DoomMain (void)
// clean up game state
ST_Clear();
D_ErrorCleanup ();
DThinker::DestroyThinkersInList(STAT_STATIC);
P_FreeLevelData();
P_FreeExtraLevelData();

2
src/dthinker.cpp
View file

@ -422,7 +422,7 @@ void DThinker::DestroyAllThinkers ()
for (i = 0; i <= MAX_STATNUM; i++)
{
if (i != STAT_TRAVELLING)
if (i != STAT_TRAVELLING && i != STAT_STATIC)
{
DestroyThinkersInList (Thinkers[i]);
DestroyThinkersInList (FreshThinkers[i]);

1
src/g_level.cpp
View file

@ -427,6 +427,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
UnlatchCVars ();
G_VerifySkill();
UnlatchCVars ();
DThinker::DestroyThinkersInList(STAT_STATIC);
if (paused)
{

2
src/p_actionfunctions.cpp
View file

@ -1124,7 +1124,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SeekerMissile)
PARAM_INT_DEF(chance);
PARAM_INT_DEF(distance);
if ((flags & SMF_LOOK) && (self->tracer == 0) && (pr_seekermissile()<chance))
if ((flags & SMF_LOOK) && (self->tracer == nullptr) && (pr_seekermissile()<chance))
{
self->tracer = P_RoughMonsterSearch (self, distance, true);
}

1
src/p_setup.cpp
View file

@ -4203,6 +4203,7 @@ void P_Init ()
static void P_Shutdown ()
{
// [ZZ] delete global event handlers
DThinker::DestroyThinkersInList(STAT_STATIC);
E_Shutdown(false);
P_DeinitKeyMessages ();
P_FreeLevelData ();

1
src/statnums.h
View file

@ -45,6 +45,7 @@ enum
STAT_AUTODECAL, // A decal that can be automatically deleted
STAT_CORPSEPOINTER, // An entry in Hexen's corpse queue
STAT_TRAVELLING, // An actor temporarily travelling to a new map
STAT_STATIC, // persistent across maps.
// Thinkers that do think
STAT_FIRST_THINKING=32,

11
src/wi_stuff.cpp
View file

@ -1091,8 +1091,6 @@ public:
void WI_updateNoState ()
{
WI_updateAnimatedBack();
if (acceleratestage)
{
cnt = 0;
@ -1141,8 +1139,6 @@ public:
void WI_updateShowNextLoc ()
{
WI_updateAnimatedBack();
if (!--cnt || acceleratestage)
WI_initNoState();
else
@ -1240,8 +1236,6 @@ public:
bool stillticking;
bool autoskip = WI_autoSkip();
WI_updateAnimatedBack();
if ((acceleratestage || autoskip) && ng_state != 6)
{
acceleratestage = 0;
@ -1492,8 +1486,6 @@ public:
bool stillticking;
bool autoskip = WI_autoSkip();
WI_updateAnimatedBack ();
if ((acceleratestage || autoskip) && ng_state != 10)
{
acceleratestage = 0;
@ -1787,8 +1779,6 @@ public:
void WI_updateStats ()
{
WI_updateAnimatedBack ();
if (acceleratestage && sp_state != 10)
{
acceleratestage = 0;
@ -2166,6 +2156,7 @@ static FIntermissionScreen WI_Screen;
void WI_Ticker()
{
WI_Screen.WI_updateAnimatedBack();
WI_Screen.WI_Ticker();
}

1
wadsrc/static/zscript/base.txt
View file

@ -353,6 +353,7 @@ class Thinker : Object native
STAT_AUTODECAL, // A decal that can be automatically deleted
STAT_CORPSEPOINTER, // An entry in Hexen's corpse queue
STAT_TRAVELLING, // An actor temporarily travelling to a new map
STAT_STATIC,
// Thinkers that do think
STAT_FIRST_THINKING=32,