X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fsv_main.qc;h=9be3c18f6017183f8d81319e0cdb75e4a2d16e51;hb=546842f7e5a63b11a9b862dbf1709318bb97689b;hp=1130b6a4e5dd349abdf935a81039e0334c22c443;hpb=26d2cece1d88a2fad9e0a2f8069c3924496698c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 1130b6a4e..9be3c18f6 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -2,14 +2,16 @@
 
 #include "anticheat.qh"
 #include "g_hook.qh"
+#include "g_damage.qh"
 #include "g_world.qh"
 
 #include "bot/api.qh"
 
 #include "command/common.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include "weapons/csqcprojectile.qh"
+#include <server/compat/quake3.qh>
 
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
@@ -18,6 +20,7 @@
 #include "../common/util.qh"
 
 #include "../common/vehicles/all.qh"
+#include <common/monsters/sv_monsters.qh>
 #include <common/weapons/_all.qh>
 
 #include "../lib/csqcmodel/sv_model.qh"
@@ -165,7 +168,6 @@ Called before each frame by the server
 bool game_delay_last;
 
 bool autocvar_sv_autopause = false;
-float RedirectionThink();
 void systems_update();
 void sys_phys_update(entity this, float dt);
 void StartFrame()
@@ -246,7 +248,6 @@ void StartFrame()
 .float anglejitter;
 .string gametypefilter;
 .string cvarfilter;
-bool DoesQ3ARemoveThisEntity(entity this);
 
 /**
  * Evaluate an expression of the form: [+ | -]? [var[op]val | [op]var | val | var] ...
@@ -277,12 +278,11 @@ bool expr_evaluate(string s)
         string k, v;
         s = argv(i);
         #define X(expr) \
-            if (expr) { \
+            if (expr) \
                 continue; \
-            } else { \
-                expr_fail = true; \
-                break; \
-            }
+            expr_fail = true; \
+            break;
+
         #define BINOP(op, len, expr) \
             if ((o = strstrofs(s, op, 0)) >= 0) { \
                 k = substring(s, 0, o); \
@@ -360,7 +360,7 @@ void SV_OnEntityPreSpawnFunction(entity this)
 	}
 	return;
 LABEL(cleanup)
-    builtin_remove(this);
+    delete(this);
 }
 
 void WarpZone_PostInitialize_Callback()
@@ -371,15 +371,18 @@ void WarpZone_PostInitialize_Callback()
 	tracetest_ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
 	//for(entity e = warpzone_first; e; e = e.warpzone_next)
 	for(entity e = NULL; (e = find(e, classname, "trigger_warpzone")); )
-	{
-		vector src, dst;
-		src = (e.absmin + e.absmax) * 0.5;
-		makevectors(e.warpzone_angles);
-		src = src + ((e.warpzone_origin - src) * v_forward) * v_forward + 16 * v_right;
-		dst = (e.enemy.absmin + e.enemy.absmax) * 0.5;
-		makevectors(e.enemy.warpzone_angles);
-		dst = dst + ((e.enemy.warpzone_origin - dst) * v_forward) * v_forward - 16 * v_right;
-		waypoint_spawnforteleporter_wz(e, src, dst, 0, -v_up, tracetest_ent);
-	}
+		waypoint_spawnforteleporter_wz(e, tracetest_ent);
 	delete(tracetest_ent);
 }
+
+/*
+==================
+main
+
+unused but required by the engine
+==================
+*/
+void main ()
+{
+
+}