Merge branch 'master' into Mario/bulldozer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / portals.qc

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index ca6442f979dff6515ea38f24018fb89afbdc917f..18600463741fc20bb88e1fd5baf07b7a9ddb47bc 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,7 +1,7 @@
 #include "portals.qh"
 
 #include "g_hook.qh"
-#include "mutators/mutators_include.qh"
+#include "mutators/all.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications.qh"
@@ -624,8 +624,7 @@ entity Portal_Spawn(entity own, vector org, vector ang)
        if(!CheckWireframeBox(own, org - 48 * v_right - 48 * v_up + 16 * v_forward, 96 * v_right, 96 * v_up, 96 * v_forward))
                return world;
 
-       portal = spawn();
-       portal.classname = "portal";
+       portal = new(portal);
        portal.aiment = own;
        setorigin(portal, org);
        portal.mangle = ang;