Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index bf1a49a9ff9a2aec6632dfba6d6871ee5fb1398c..7d402ad838578300ac8e47fd2e1f628086615d3a 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -16,7 +16,7 @@ float SpawnEvent_Send(entity to, float sf)
        
        WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNEVENT);
 
-       if(autocvar_g_spawnsound)
+       if(autocvar_g_spawn_alloweffects)
        {
                WriteByte(MSG_ENTITY, num_for_edict(self.owner));
                WriteShort(MSG_ENTITY, self.owner.origin_x);
@@ -100,10 +100,6 @@ void relocate_spawnpoint()
         e.solid = SOLID_TRIGGER;
     }
 
-       //self.send_spawn = -1;
-       //self.think = Spawn_Think;
-       //self.nextthink = time;
-
     Net_LinkEntity(self, FALSE, 0, SpawnPoint_Send);
 }