Merge branch 'mklev' of https://github.com/argrath/NetHack into pr1412

This commit is contained in:
nhmall
2025-10-03 16:00:18 -04:00
-8
View File
@@ -449,8 +449,6 @@ join(int a, int b, boolean nxcor)
if (troom->lx > croom->hx) { if (troom->lx > croom->hx) {
dx = 1; dx = 1;
dy = 0; dy = 0;
xx = croom->hx + 1;
tx = troom->lx - 1;
if (!finddpos(&cc, DIR_E, croom)) if (!finddpos(&cc, DIR_E, croom))
return; return;
if (!finddpos(&tt, DIR_W, troom)) if (!finddpos(&tt, DIR_W, troom))
@@ -458,8 +456,6 @@ join(int a, int b, boolean nxcor)
} else if (troom->hy < croom->ly) { } else if (troom->hy < croom->ly) {
dy = -1; dy = -1;
dx = 0; dx = 0;
yy = croom->ly - 1;
ty = troom->hy + 1;
if (!finddpos(&cc, DIR_N, croom)) if (!finddpos(&cc, DIR_N, croom))
return; return;
if (!finddpos(&tt, DIR_S, troom)) if (!finddpos(&tt, DIR_S, troom))
@@ -467,8 +463,6 @@ join(int a, int b, boolean nxcor)
} else if (troom->hx < croom->lx) { } else if (troom->hx < croom->lx) {
dx = -1; dx = -1;
dy = 0; dy = 0;
xx = croom->lx - 1;
tx = troom->hx + 1;
if (!finddpos(&cc, DIR_W, croom)) if (!finddpos(&cc, DIR_W, croom))
return; return;
if (!finddpos(&tt, DIR_E, troom)) if (!finddpos(&tt, DIR_E, troom))
@@ -476,8 +470,6 @@ join(int a, int b, boolean nxcor)
} else { } else {
dy = 1; dy = 1;
dx = 0; dx = 0;
yy = croom->hy + 1;
ty = troom->ly - 1;
if (!finddpos(&cc, DIR_S, croom)) if (!finddpos(&cc, DIR_S, croom))
return; return;
if (!finddpos(&tt, DIR_N, troom)) if (!finddpos(&tt, DIR_N, troom))