From 3a2d0e348630058b5ed46146aa2781171ab3ccf5 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 15 Nov 2016 11:49:27 +0100
Subject: [PATCH] - copied all necessary adjustments from the test branch in
 the QZDoom repo.

---
 src/gl/dynlights/a_dynlight.cpp  | 10 +++++-----
 src/gl/system/gl_framebuffer.cpp |  2 +-
 src/posix/sdl/sdlglvideo.cpp     |  2 +-
 src/win32/win32gliface.cpp       |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gl/dynlights/a_dynlight.cpp b/src/gl/dynlights/a_dynlight.cpp
index 0e52eedd8a..5c85fce85c 100644
--- a/src/gl/dynlights/a_dynlight.cpp
+++ b/src/gl/dynlights/a_dynlight.cpp
@@ -62,7 +62,7 @@
 #include "p_local.h"
 #include "c_dispatch.h"
 #include "g_level.h"
-#include "thingdef/thingdef.h"
+#include "scripting/thingdef.h"
 #include "i_system.h"
 #include "templates.h"
 #include "doomdata.h"
@@ -106,10 +106,10 @@ DEFINE_CLASS_PROPERTY(type, S, DynamicLight)
 // which is controlled by flags
 //
 //==========================================================================
-IMPLEMENT_CLASS (ADynamicLight)
-IMPLEMENT_CLASS (AVavoomLight)
-IMPLEMENT_CLASS (AVavoomLightWhite)
-IMPLEMENT_CLASS (AVavoomLightColor)
+IMPLEMENT_CLASS (ADynamicLight, false, false, false, false)
+IMPLEMENT_CLASS (AVavoomLight, false, false, false, false)
+IMPLEMENT_CLASS (AVavoomLightWhite, false, false, false, false)
+IMPLEMENT_CLASS (AVavoomLightColor, false, false, false, false)
 
 void AVavoomLight::BeginPlay ()
 {
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index 4904cc1f6f..259cef5e0e 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -53,7 +53,7 @@
 #include "gl/renderer/gl_2ddrawer.h"
 #include "gl_debug.h"
 
-IMPLEMENT_CLASS(OpenGLFrameBuffer)
+IMPLEMENT_CLASS(OpenGLFrameBuffer, false, false, false, false)
 EXTERN_CVAR (Float, vid_brightness)
 EXTERN_CVAR (Float, vid_contrast)
 EXTERN_CVAR (Bool, vid_vsync)
diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp
index d8c00f2363..cebd928ee7 100644
--- a/src/posix/sdl/sdlglvideo.cpp
+++ b/src/posix/sdl/sdlglvideo.cpp
@@ -29,7 +29,7 @@
 
 // TYPES -------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(SDLGLFB)
+IMPLEMENT_ABSTRACT_CLASS(SDLGLFB, false, false, false, false)
 
 struct MiniModeInfo
 {
diff --git a/src/win32/win32gliface.cpp b/src/win32/win32gliface.cpp
index 5d68d84278..6b9e413af5 100644
--- a/src/win32/win32gliface.cpp
+++ b/src/win32/win32gliface.cpp
@@ -854,7 +854,7 @@ bool Win32GLVideo::SetFullscreen(const char *devicename, int w, int h, int bits,
 //
 //==========================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(Win32GLFrameBuffer)
+IMPLEMENT_CLASS(Win32GLFrameBuffer, true, false, false, false)
 
 //==========================================================================
 //