From: Martin Taibr Date: Fri, 28 Oct 2016 19:23:37 +0000 (+0200) Subject: comment X-Git-Tag: xonotic-v0.8.2~456^2~9 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=436328b7721c5d95f6506368b717b26125e8b2a8;p=xonotic%2Fxonotic-data.pk3dir.git comment --- diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc index 011a51d04..2a1daf3b3 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc @@ -124,7 +124,6 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn) case 5: tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - v_forward * 128 - v_right * 64 + v_up * 64, MOVE_NOMONSTERS, it); break; - } vector horizontal_trace_endpos = trace_endpos; //te_lightning1(NULL, it.origin, horizontal_trace_endpos); @@ -138,7 +137,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn) if (trace_startsolid) continue; // inside another player if (trace_fraction == 1.0) continue; // above void or too high if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY) continue; - if (pointcontents(vectical_trace_endpos) != CONTENT_EMPTY) continue; // this also prevents spawning in water which i assume would be annoying + if (pointcontents(vectical_trace_endpos) != CONTENT_EMPTY) continue; // no lava or slime (this also prevents spawning in water which i assume would be annoying) if (tracebox_hits_trigger_hurt(horizontal_trace_endpos, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), vectical_trace_endpos)) continue; // make sure the spawned player will have floor ahead (or at least a wall - he shouldn't fall as soon as he starts moving)