r4347 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-05 02:59:20 -0400 (Fri, 05 Sep 2008)
New Revision: 4347

Modified:
   trunk/data/qcsrc/server/portals.qc
Log:
obvious portal fix


Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2008-09-05 06:52:32 UTC (rev 4346)
+++ trunk/data/qcsrc/server/portals.qc	2008-09-05 06:59:20 UTC (rev 4347)
@@ -96,12 +96,14 @@
 	if(planeshift > 0)
 		to += newvel * (planeshift / (newvel * v_forward));
 	
-	s = bound(-48, (to - teleporter.enemy.origin) * v_right, 48);
-	t = bound(-48, (to - teleporter.enemy.origin) * v_up, 48);
+	s = (to - teleporter.enemy.origin) * v_right;
+	t = (to - teleporter.enemy.origin) * v_up;
+	s = bound(-48, s, 48);
+	t = bound(-48, t, 48);
 	to = teleporter.enemy.origin
-	   + (to * v_forward) * v_forward
-	   +     s            * v_right
-	   +     t            * v_up;
+	   + ((to - teleporter.enemy.origin) * v_forward) * v_forward
+	   +     s                                        * v_right
+	   +     t                                        * v_up;
 
 	safe = teleporter.enemy.portal_safe_origin; // a valid player origin
 	step = to + ((safe - to) * v_forward) * v_forward;