Mercurial > traipse

diff orpg/mapper/map_utils.py @ 13:211ac836b6a0 grumpy-goblin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
{090731-00} Fixes problem with Name & Settings window, cleans code.
author sirebral
date Fri, 31 Jul 2009 15:22:11 -0500
parents 4385a7d0efd1
children 97265586402b
line wrap: on
line diff
--- a/orpg/mapper/map_utils.py	Fri Jul 24 10:03:22 2009 -0500
+++ b/orpg/mapper/map_utils.py	Fri Jul 31 15:22:11 2009 -0500
@@ -44,16 +44,13 @@
    yt = float(yt)
 
    # Coincident points?
-   if x1 == x2 and y1 == y2:
-       d = distance_between(xt, yt, x1, y1)
+   if x1 == x2 and y1 == y2: d = distance_between(xt, yt, x1, y1)
    else:
        dx = x2 - x1
        dy = y2 - y1
        u = ((xt - x1) * dx + (yt - y1) * dy) / (dx*dx + dy*dy)
-       if u < 0:
-           d = distance_between(xt, yt, x1, y1)
-       elif u > 1:
-           d = distance_between(xt, yt, x2, y2)
+       if u < 0: d = distance_between(xt, yt, x1, y1)
+       elif u > 1: d = distance_between(xt, yt, x2, y2)
        else:
            xr = x1 + u * dx
            yr = y1 + u * dy