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

19
src/r_data/r_interpolate.cpp
View file

@ -161,14 +161,17 @@ public:
//
//==========================================================================
IMPLEMENT_ABSTRACT_POINTY_CLASS(DInterpolation)
DECLARE_POINTER(Next)
DECLARE_POINTER(Prev)
END_POINTERS
IMPLEMENT_CLASS(DSectorPlaneInterpolation)
IMPLEMENT_CLASS(DSectorScrollInterpolation)
IMPLEMENT_CLASS(DWallScrollInterpolation)
IMPLEMENT_CLASS(DPolyobjInterpolation)
IMPLEMENT_CLASS(DInterpolation, true, true, false, false)
IMPLEMENT_POINTERS_START(DInterpolation)
IMPLEMENT_POINTER(Next)
IMPLEMENT_POINTER(Prev)
IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(DSectorPlaneInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DSectorScrollInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DWallScrollInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DPolyobjInterpolation, false, false, false, false)
//==========================================================================
//