OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript

Browse source 
# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt
This commit is contained in:
Christoph Oelckers 2016-11-15 11:36:59 +01:00
commit 6e223ebc21
589 changed files with 51614 additions and 39056 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_spec.cpp
View file

@ -660,7 +660,7 @@ protected:
short LastLight;
};
IMPLEMENT_CLASS (DLightTransfer)
IMPLEMENT_CLASS(DLightTransfer, false, false, false, false)
void DLightTransfer::Serialize(FSerializer &arc)
{
@ -750,7 +750,7 @@ protected:
BYTE Flags;
};
IMPLEMENT_CLASS (DWallLightTransfer)
IMPLEMENT_CLASS(DWallLightTransfer, false, false, false, false)
void DWallLightTransfer::Serialize(FSerializer &arc)
{