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/gl/dynlights/a_dynlight.cpp
View file

@ -800,10 +800,10 @@ void ADynamicLight::UnlinkLight ()
while (touching_sector) touching_sector = DeleteLightNode(touching_sector);
}
void ADynamicLight::Destroy()
void ADynamicLight::OnDestroy()
{
UnlinkLight();
Super::Destroy();
Super::OnDestroy();
}