Merge branch '3.0_work'

# Conflicts:
#	src/gl/scene/gl_portal.cpp
#	src/r_plane.cpp

src/scripting/backend/scopebarrier.h

@@ -2,6 +2,9 @@
 
 #include "zstring.h"
 
+class PClass;
+class VMFunction;
+
 //
 // [ZZ] this really should be in codegen.h, but vmexec needs to access it
 struct FScopeBarrier

src/scripting/thingdef_data.cpp

@@ -50,7 +50,6 @@
 #include "zstring.h"
 #include "d_event.h"
 #include "g_levellocals.h"
-#include "vm.h"
 #include "p_checkposition.h"
 #include "r_sky.h"
 #include "v_font.h"

src/scripting/vm/vm.h

@@ -844,11 +844,6 @@ struct VMRegisters
 	VMValue *param;
 };
 
-struct VMException : public DObject
-{
-	DECLARE_CLASS(VMException, DObject);
-};
-
 union FVoidObj
 {
 	DObject *o;

src/scripting/vm/vmexec.h

@@ -820,7 +820,7 @@ begin:
 			ThrowAbortException(X_OTHER, "Cannot instantiate abstract class %s", cls->TypeName.GetChars());
 		}
 		// Creating actors here must be outright prohibited,
-		if (cls->IsDescendantOf(RUNTIME_CLASS(AActor)))
+		if (cls->IsDescendantOf(NAME_Actor))
 		{
 			ThrowAbortException(X_OTHER, "Cannot create actors with 'new'");
 		}

src/scripting/zscript/ast.cpp

@@ -44,7 +44,7 @@ static const char *BuiltInTypeNames[] =
 {
 	"sint8", "uint8",
 	"sint16", "uint16",
-	"sint32", "uint32",
+	"sint32", "uint32_t",
 	"intauto",
 
 	"bool",