Impulse refactor

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

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index 32e48f370162f6c89c4c11b8c4fb0e26aa802bec..06108be95f3b6d74f94a4de16c7a9bc285a45ac9 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -1,8 +1,6 @@
 #ifndef GAMEMODE_H
 #define GAMEMODE_H
 
-#include "mutator_nades.qh"
-
 #include "../cl_client.qh"
 #include "../cl_player.qh"
 #include "../cl_impulse.qh"
@@ -11,13 +9,12 @@
 #include "../round_handler.qh"
 #include "../scores.qh"
 #include "../scores_rules.qh"
-#include "../waypointsprites.qh"
+#include "../teamplay.qh"
 
 #include "../bot/bot.qh"
 #include "../bot/navigation.qh"
 #include "../bot/waypoints.qh"
 #include "../bot/havocbot/roles.qh"
-#include "../bot/havocbot/role_keyhunt.qh"
 
 #include "../bot/havocbot/havocbot.qh"
 
@@ -30,20 +27,22 @@
 #include "../weapons/tracing.qh"
 #include "../weapons/weaponsystem.qh"
 
-#include "../../common/deathtypes.qh"
+#include "../../common/deathtypes/all.qh"
 #include "../../common/notifications.qh"
 #include "../../common/triggers/teleporters.qh"
 #include "../../common/triggers/subs.qh"
 #include "../../common/stats.qh"
 #include "../../common/teams.qh"
 
-#include "../../warpzonelib/mathlib.qh"
-#include "../../warpzonelib/server.qh"
-#include "../../warpzonelib/util_server.qh"
+#include "../../lib/warpzone/server.qh"
+#include "../../lib/warpzone/util_server.qh"
 
 .float lastground;
 float total_players;
 float redalive, bluealive, yellowalive, pinkalive;
-.float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
+.float redalive_stat = _STAT(REDALIVE);
+.float bluealive_stat = _STAT(BLUEALIVE);
+.float yellowalive_stat = _STAT(YELLOWALIVE);
+.float pinkalive_stat = _STAT(PINKALIVE);
 
 #endif