Cleanup

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index fb3106c29985c1a0070f46f3d5b0f8a393bb40e7..f60ad9765f44dd684658e5da923267d961582fc7 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -713,6 +713,16 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
                setsize(self, PL_MIN, PL_MAX);
                droptofloor();
 
+               /*if(autocvar_cl_spawn_point_model) // needs a model first
+               {
+                       self.mdl = "models/spawnpoint.md3";
+                       self.colormod = Team_ColorRGB(teamnum);
+                       precache_model(self.mdl);
+                       setmodel(self, self.mdl);
+                       self.drawmask = MASK_NORMAL;
+                       //self.movetype = MOVETYPE_NOCLIP;
+                       //self.draw = Spawn_Draw;
+               }*/
                if(autocvar_cl_spawn_point_particles)
                {
                        switch(teamnum)
@@ -725,16 +735,6 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
                        }
                        self.draw = Spawn_Draw;
                }
-               /*if(autocvar_cl_spawn_point_model) // needs a model first
-               {
-                       self.mdl = "models/spawnpoint.md3";
-                       self.colormod = Team_ColorRGB(teamnum);
-                       precache_model(self.mdl);
-                       setmodel(self, self.mdl);
-                       self.drawmask = MASK_NORMAL;
-                       //self.movetype = MOVETYPE_NOCLIP;
-                       //self.draw = Spawn_Draw;
-               }*/
        }
 
        //print(sprintf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(self.origin), teamnum, self.cnt));
@@ -757,10 +757,6 @@ void Ent_ReadSpawnEvent(float is_new)
                {
                        float teamnum = GetPlayerColor(entnum - 1);
 
-                       if(autocvar_cl_spawn_event_sound)
-                       {
-                               sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);
-                       }
                        if(autocvar_cl_spawn_event_particles)
                        {
                                switch(teamnum)
@@ -772,6 +768,10 @@ void Ent_ReadSpawnEvent(float is_new)
                                        default: pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); break;
                                }
                        }
+                       if(autocvar_cl_spawn_event_sound)
+                       {
+                               sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);
+                       }
                }
        }
        

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index a5bd4ee575b2db4a61041b604488bd417767ea30..7d402ad838578300ac8e47fd2e1f628086615d3a 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -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);
 }