server side option for both (old) or individually silent or particleless (re)spawning

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / spawnpoints.qc

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index b629ef168449af6f5280a1fd5469ddacc2bc645b..0a4ee0c2b46e840865b01f68c6899dd9b5e658ff 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,23 +1,23 @@
 #include "spawnpoints.qh"
 
-#include <server/mutators/_mod.qh>
-#include "world.qh"
-#include "miscfunctions.qh"
-#include "race.qh"
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include "../common/constants.qh"
-#include <common/net_linked.qh>
-#include "../common/teams.qh"
+#include <common/constants.qh>
 #include <common/gamemodes/_mod.qh>
-#include "../common/mapobjects/subs.qh"
-#include "../common/mapobjects/target/spawnpoint.qh"
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/target/spawnpoint.qh>
 #include <common/mapobjects/triggers.qh>
-#include "../common/util.qh"
-#include "../lib/warpzone/common.qh"
-#include "../lib/warpzone/util_server.qh"
-#include <server/utils.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
 #include <server/command/vote.qh>
+#include <server/intermission.qh>
+#include <server/mutators/_mod.qh>
+#include <server/race.qh>
+#include <server/utils.qh>
+#include <server/world.qh>
 
 bool SpawnPoint_Send(entity this, entity to, int sf)
 {
@@ -39,6 +39,7 @@ bool SpawnEvent_Send(entity this, entity to, int sf)
        {
                WriteByte(MSG_ENTITY, etof(this.owner));
                WriteVector(MSG_ENTITY, this.owner.origin);
+               WriteByte(MSG_ENTITY, autocvar_g_spawn_alloweffects);
                send = true;
        }
        else if((to == this.owner) || (IS_SPEC(to) && (to.enemy == this.owner)) )
@@ -165,7 +166,6 @@ spawnfunc(info_player_start)
 
 spawnfunc(info_player_deathmatch)
 {
-       this.classname = "info_player_deathmatch";
        IL_PUSH(g_spawnpoints, this);
        relocate_spawnpoint(this);
 }