From: terencehill <piuntn@gmail.com>
Date: Mon, 24 Jul 2017 18:36:30 +0000 (+0200)
Subject: Improve creation of destination waypoints for ladders with a lateral exit (e.g. under... 
X-Git-Tag: xonotic-v0.8.5~2378^2~120
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6851874f03bad6b7169ea6d61a6122b4f674a0c4;p=xonotic%2Fxonotic-data.pk3dir.git

Improve creation of destination waypoints for ladders with a lateral exit (e.g. underwater ladders in reservoir_r6)
---

diff --git a/qcsrc/common/triggers/func/ladder.qc b/qcsrc/common/triggers/func/ladder.qc
index 42fe0b9d3..9aec33b90 100644
--- a/qcsrc/common/triggers/func/ladder.qc
+++ b/qcsrc/common/triggers/func/ladder.qc
@@ -60,7 +60,39 @@ void func_ladder_init(entity this)
 		{
 			tracebox(top_max, PL_MIN_CONST, PL_MAX_CONST, top_min, MOVE_NOMONSTERS, NULL);
 			if(trace_startsolid)
-				return;
+			{
+				if(this.absmax.x - this.absmin.x > PL_MAX_CONST.x - PL_MIN_CONST.x
+					&& this.absmax.y - this.absmin.y < this.absmax.x - this.absmin.x)
+				{
+					// move top on one side
+					top_max.y = top_min.y = this.absmin.y + (PL_MAX_CONST.y - PL_MIN_CONST.y) * 0.75;
+				}
+				else if(this.absmax.y - this.absmin.y > PL_MAX_CONST.y - PL_MIN_CONST.y
+					&& this.absmax.x - this.absmin.x < this.absmax.y - this.absmin.y)
+				{
+					// move top on one side
+					top_max.x = top_min.x = this.absmin.x + (PL_MAX_CONST.x - PL_MIN_CONST.x) * 0.75;
+				}
+				tracebox(top_max, PL_MIN_CONST, PL_MAX_CONST, top_min, MOVE_NOMONSTERS, NULL);
+				if(trace_startsolid)
+				{
+					if(this.absmax.x - this.absmin.x > PL_MAX_CONST.x - PL_MIN_CONST.x
+						&& this.absmax.y - this.absmin.y < this.absmax.x - this.absmin.x)
+					{
+						// alternatively on the other side
+						top_max.y = top_min.y = this.absmax.y - (PL_MAX_CONST.y - PL_MIN_CONST.y) * 0.75;
+					}
+					else if(this.absmax.y - this.absmin.y > PL_MAX_CONST.y - PL_MIN_CONST.y
+						&& this.absmax.x - this.absmin.x < this.absmax.y - this.absmin.y)
+					{
+						// alternatively on the other side
+						top_max.x = top_min.x = this.absmax.x - (PL_MAX_CONST.x - PL_MIN_CONST.x) * 0.75;
+					}
+					tracebox(top_max, PL_MIN_CONST, PL_MAX_CONST, top_min, MOVE_NOMONSTERS, NULL);
+					if(trace_startsolid)
+						return;
+				}
+			}
 		}
 	}
 	if(trace_endpos.z < this.absmax.z)