# HG changeset patch
# User koda
# Date 1300984150 -3600
# Node ID 6afc64bec952967a9dabedc3d130fc9e416c0fde
# Parent  fc6639d56799a774dbee43f7611937728bd5bbdc# Parent  6e8da75e5f5e38f1579ca93b568589efc6aa81cc
merge

diff -r fc6639d56799 -r 6afc64bec952 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Thu Mar 24 17:28:36 2011 +0100
+++ b/hedgewars/GSHandlers.inc	Thu Mar 24 17:29:10 2011 +0100
@@ -3752,6 +3752,8 @@
             continue;
 
         //Will if fit through?
+        //set r to be portal distance
+        r := Int2hwFloat(Gear^.Radius +1);
 
         o_x := hwRound(conPortal^.X + conPortal^.dX);
         o_y := hwRound(conPortal^.Y + conPortal^.dY);
@@ -3801,6 +3803,9 @@
         if ((Land[o_y, rr_x] and $FF00) <> 0) then
                 continue;
 
+        //Okay reset r in case something uses it
+        r := Int2hwFloat(iterator^.Radius+Gear^.Radius);
+
         hasdxy := (((iterator^.dX.QWordValue <> 0) or (iterator^.dY.QWordValue <> 0))
                     or ((iterator^.State or gstMoving) = 0));