OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '3.0_work'

Browse source 
# Conflicts:
#	src/gl/scene/gl_portal.cpp
#	src/r_plane.cpp
This commit is contained in:
Christoph Oelckers 2017-03-12 20:31:34 +01:00
commit 61c91f05fc
552 changed files with 58244 additions and 23521 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/vm/vmexec.h
View file

@ -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'");
}