Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qh

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index c30068722aea8f4f852e047771c61ec4e46f6cf2..a3dd45e51e5d3d247edbf5b914e1308d6f7ca6f8 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -3,7 +3,7 @@
 
 #include "t_items.qh"
 
-#include "mutators/base.qh"
+#include "mutators/events.qh"
 #include "mutators/gamemode_race.qh"
 
 #include "../common/constants.qh"
@@ -75,7 +75,6 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual);
 
 float DistributeEvenly_amount;
 float DistributeEvenly_totalweight;
-var void remove(entity e);
 void objerror(string s);
 void droptofloor();
 void() spawnfunc_info_player_deathmatch; // needed for the other spawnpoints
@@ -162,13 +161,6 @@ const string STR_OBSERVER = "observer";
 #define IS_VEHICLE(v)                  (v.vehicle_flags & VHF_ISVEHICLE)
 #define IS_TURRET(v)                   (v.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
 
-#define IS_MACRO(v) \
-       #ifdef v \
-               true \
-       #else \
-               false \
-       #endif
-
 #define FOR_EACH_CLIENTSLOT(v) for(v = world; (v = nextent(v)) && (num_for_edict(v) <= maxclients); )
 #define FOR_EACH_CLIENT(v) FOR_EACH_CLIENTSLOT(v) if(IS_CLIENT(v))
 #define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if(IS_REAL_CLIENT(v))