Merge branch 'master' into Mario/spawnsystem_mutator

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
index 2ebc3fa3ba077ef116d9575caf444f4da9c8195e,72872233fe3607ca22e8b0cb5779ad22e4f3932a..5dc6f2e39346ff99098d6fe4a3a0768012b3db0a
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -903,9 -909,9 +909,9 @@@ void readlevelcvars(void
        // load mutators
        #define CHECK_MUTATOR_ADD(mut_cvar,mut_name,dependence) \
                { if(cvar(mut_cvar) && dependence) { MUTATOR_ADD(mut_name); } }
-               
+ 
        CHECK_MUTATOR_ADD("g_dodging", mutator_dodging, 1);
 -      CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, 1);
 +      CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, teamplay);
        CHECK_MUTATOR_ADD("g_physical_items", mutator_physical_items, 1);
        CHECK_MUTATOR_ADD("g_touchexplode", mutator_touchexplode, 1);
        CHECK_MUTATOR_ADD("g_minstagib", mutator_minstagib, 1);

diff --cc qcsrc/server/mutators/mutator_spawn_near_teammate.qc
index 8aec0bdc38de1e9f0b6cc404a187c70e6b1e39e2,4d0746dec28fe6c9235937e86597fc06ee1f5ff5..54df3a97cdcaa22f101fedaf9c8c80bcde358438
--- 1/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
--- 2/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
+++ b/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
@@@ -41,100 -36,10 +41,105 @@@ MUTATOR_HOOKFUNCTION(msnt_Spawn_Score
  
  MUTATOR_HOOKFUNCTION(msnt_PlayerSpawn)
  {
 -      if(spawn_spot.msnt_lookat)
 +      if(autocvar_g_spawn_near_teammate_ignore_spawnpoint)
 +      {
 +              if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death)
 +                      self.msnt_timer = time + autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
-                       
++
 +              entity team_mate, best_mate = world;
 +              vector best_spot = '0 0 0';
 +              float pc = 0, best_dist = 0, dist = 0;
 +              FOR_EACH_PLAYER(team_mate)
 +              {
 +                      if((autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health >= 0 && team_mate.health >= autocvar_g_balance_health_regenstable) || autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health == 0)
 +                      if(team_mate.deadflag == DEAD_NO)
 +                      if(team_mate.msnt_timer < time)
 +                      if(SAME_TEAM(self, team_mate))
 +                      if(time > team_mate.spawnshieldtime) // spawn shielding
 +                      if(team_mate.freezetag_frozen == 0)
 +                      if(team_mate != self)
 +                      {
 +                              tracebox(team_mate.origin, PL_MIN, PL_MAX, team_mate.origin - '0 0 100', MOVE_WORLDONLY, team_mate);
 +                              if(trace_fraction != 1.0)
-                               if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
++                              if(!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY))
 +                              {
 +                                      pc = pointcontents(trace_endpos + '0 0 1');
 +                                      if(pc == CONTENT_EMPTY)
 +                                      {
 +                                              if(vlen(team_mate.velocity) > 5)
 +                                                      fixedmakevectors(vectoangles(team_mate.velocity));
 +                                              else
 +                                                      fixedmakevectors(team_mate.angles);
 +
 +                                              for(pc = 0; pc != 5; ++pc) // test 5 diffrent spots close to mate
 +                                              {
 +                                                      switch(pc)
 +                                                      {
 +                                                              case 0:
 +                                                                      tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin + v_right * 128, MOVE_NORMAL, team_mate);
 +                                                                      break;
 +                                                              case 1:
 +                                                                      tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin - v_right * 128 , MOVE_NORMAL, team_mate);
 +                                                                      break;
 +                                                              case 2:
 +                                                                      tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin + v_right * 64 - v_forward * 64, MOVE_NORMAL, team_mate);
 +                                                                      break;
 +                                                              case 3:
 +                                                                      tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin - v_right * 64 - v_forward * 64, MOVE_NORMAL, team_mate);
 +                                                                      break;
 +                                                              case 4:
 +                                                                      tracebox(team_mate.origin , PL_MIN, PL_MAX, team_mate.origin - v_forward * 128, MOVE_NORMAL, team_mate);
 +                                                                      break;
 +                                                      }
 +
 +                                                      if(trace_fraction == 1.0)
 +                                                      {
 +                                                              traceline(trace_endpos + '0 0 4', trace_endpos - '0 0 100', MOVE_NORMAL, team_mate);
 +                                                              if(trace_fraction != 1.0)
 +                                                              {
 +                                                                      if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath)
 +                                                                      {
 +                                                                              dist = vlen(trace_endpos - self.msnt_deathloc);
 +                                                                              if(dist < best_dist || best_dist == 0)
 +                                                                              {
 +                                                                                      best_dist = dist;
 +                                                                                      best_spot = trace_endpos;
 +                                                                                      best_mate = team_mate;
 +                                                                              }
 +                                                                      }
 +                                                                      else
 +                                                                      {
 +                                                                              setorigin(self, trace_endpos);
 +                                                                              self.angles = team_mate.angles;
++                                                                              self.angles_z = 0; // never spawn tilted even if the spot says to
++                                                                              self.fixangle = TRUE; // turn this way immediately
 +                                                                              team_mate.msnt_timer = time + autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
 +                                                                              return 0;
 +                                                                      }
 +                                                              }
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +
 +              if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath)
 +              if(best_dist)
 +              {
 +                      setorigin(self, best_spot);
 +                      self.angles = best_mate.angles;
-                       self.fixangle = TRUE;
++                      self.angles_z = 0; // never spawn tilted even if the spot says to
++                      self.fixangle = TRUE; // turn this way immediately
 +                      best_mate.msnt_timer = time + autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
 +              }
 +      }
 +      else if(spawn_spot.msnt_lookat)
        {
                self.angles = vectoangles(spawn_spot.msnt_lookat.origin - self.origin);
                self.angles_x = -self.angles_x;
++              self.angles_z = 0; // never spawn tilted even if the spot says to
++              self.fixangle = TRUE; // turn this way immediately
                /*
                sprint(self, "You should be looking at ", spawn_spot.msnt_lookat.netname, "^7.\n");
                sprint(self, "distance: ", vtos(spawn_spot.msnt_lookat.origin - self.origin), "\n");