OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/win32/zdoom.rc
This commit is contained in:
Magnus Norddahl 2017-01-13 13:21:10 +01:00
commit 1d941c9839
98 changed files with 768 additions and 927 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_pspr.cpp
View file

@ -1733,7 +1733,7 @@ DEFINE_ACTION_FUNCTION(_PlayerInfo, SetSafeFlash)
//
//------------------------------------------------------------------------
void DPSprite::Destroy()
void DPSprite::OnDestroy()
{
// Do not crash if this gets called on partially initialized objects.
if (Owner != nullptr && Owner->psprites != nullptr)
@ -1756,7 +1756,7 @@ void DPSprite::Destroy()
GC::WriteBarrier(Next);
}
}
Super::Destroy();
Super::OnDestroy();
}
//------------------------------------------------------------------------