X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=e258e351a79892f5e9c8199dd4fada280f12e6b0;hb=76afe6b4bb64b3f349bcf8aeadd04d0b319a7d01;hp=7231bd8f6fba2d94be4e2604cb2d75149231c6e5;hpb=c1b079f2971aac5b48b4e0a37d21c50eab5e2021;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 7231bd8f6..e258e351a 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -12,17 +12,21 @@
 #include "command/vote.qh"
 #include "g_hook.qh"
 #include <server/gamelog.qh>
+#include <server/g_damage.qh>
 #include "ipban.qh"
 #include "mapvoting.qh"
 #include <server/mutators/_mod.qh>
 #include "race.qh"
 #include "scores.qh"
 #include "scores_rules.qh"
+#include "spawnpoints.qh"
 #include "teamplay.qh"
 #include "weapons/weaponstats.qh"
+#include <server/weapons/common.qh>
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
 #include "../common/deathtypes/all.qh"
+#include <common/gamemodes/_mod.qh>
 #include "../common/gamemodes/sv_rules.qh"
 #include "../common/mapinfo.qh"
 #include "../common/monsters/_mod.qh"
@@ -33,6 +37,7 @@
 #include "../common/playerstats.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/mapobjects/trigger/secret.qh"
 #include "../common/mapobjects/target/music.qh"
 #include "../common/util.qh"
@@ -260,6 +265,7 @@ void cvar_changes_init()
 		BADCVAR("g_ca");
 		BADCVAR("g_ca_teams");
 		BADCVAR("g_conquest");
+		BADCVAR("g_conquest_teams");
 		BADCVAR("g_ctf");
 		BADCVAR("g_cts");
 		BADCVAR("g_dotc");
@@ -287,6 +293,8 @@ void cvar_changes_init()
 		BADCVAR("g_runematch");
 		BADCVAR("g_shootfromeye");
 		BADCVAR("g_snafu");
+		BADCVAR("g_survival");
+		BADCVAR("g_survival_not_dm_maps");
 		BADCVAR("g_tdm");
 		BADCVAR("g_tdm_on_dm_maps");
 		BADCVAR("g_tdm_teams");
@@ -931,8 +939,6 @@ spawnfunc(worldspawn)
 
 	Nagger_Init();
 
-	next_pingtime = time + 5;
-
 	// set up information replies for clients and server to use
 	maplist_reply = strzone(getmaplist());
 	lsmaps_reply = strzone(getlsmaps());