Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / swamp.qc

diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc
index 0f8d1a73eebb46b4780f2b2e1758fbeda3d7aff2..71c5247c7446c5332d12e62b7f9084e105e47bd9 100644 (file)
--- a/qcsrc/common/triggers/trigger/swamp.qc
+++ b/qcsrc/common/triggers/trigger/swamp.qc
@@ -1,8 +1,9 @@
+#include "swamp.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <lib/warpzone/util_server.qh>
-    #include <common/weapons/all.qh>
+    #include <common/weapons/_all.qh>
     #include <server/defs.qh>
     #include <common/deathtypes/all.qh>
 #endif
@@ -45,7 +46,7 @@ void swampslug_think(entity this)
        if(this.health <= 0)
        {
                this.owner.in_swamp = 0;
-               remove(this);
+               delete(this);
                //centerprint(this.owner,"Killing slug...\n");
                return;
        }