nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Changes for Win32; update precompiled files

Browse Source 
Also fix Orctown probabilities; fixed support for snprintf;
update Win32 makefile to allow level compiler use

Conflicts:
	win/win32/levstuff.mak
This commit is contained in:
Derek S. Ray
2015-02-22 18:53:30 -05:00
committed by Pasi Kallinen
parent b1835cc65d
commit 7f03ee4216
9 changed files with 8416 additions and 2986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sp_lev.c
View File

@@ -3440,20 +3440,21 @@ line_dist_coord(x1,y1, x2,y2, x3,y3)
{
long px = x2-x1;
long py = y2-y1;
long s = px*px + py*py;
long x, y, dx, dy, dist = 0;
float u = 0;
if (x1 == x2 && y1 == y2) return isqrt(dist2(x1,y1, x3,y3));
long s = px*px + py*py;
float u = ((x3 - x1) * px + (y3 - y1) * py) / (float)s;
u = ((x3 - x1) * px + (y3 - y1) * py) / (float)s;
if (u > 1) u = 1;
else if (u < 0) u = 0;
long x = x1 + u * px;
long y = y1 + u * py;
long dx = x - x3;
long dy = y - y3;
long dist = isqrt(dx*dx + dy*dy);
x = x1 + u * px;
y = y1 + u * py;
dx = x - x3;
dy = y - y3;
dist = isqrt(dx*dx + dy*dy);
return dist;
}