From a90f9d4365802b0ead7f41b8cffb69e70aaaf676 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sun, 14 Jul 2019 21:15:31 -0700 Subject: [PATCH] Revert "Fixed sign/unsigned comparisions." This reverts commit 0e8e5aac93e660a001dccb66df7320023aaa36de. --- src/teleport.c | 4 ++-- win/tty/topl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/teleport.c b/src/teleport.c index 0c8271845..100a74d3b 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -1143,10 +1143,10 @@ struct monst *mtmp; sent out of his room (caller might resort to goodpos() if we report failure here, so this isn't full prevention) */ if (mtmp->isshk && inhishop(mtmp)) { - if (levl[x][y].roomno != (unsigned char) ESHK(mtmp)->shoproom) + if (levl[x][y].roomno != ESHK(mtmp)->shoproom) return FALSE; } else if (mtmp->ispriest && inhistemple(mtmp)) { - if (levl[x][y].roomno != (unsigned char) EPRI(mtmp)->shroom) + if (levl[x][y].roomno != EPRI(mtmp)->shroom) return FALSE; } /* current location is */ diff --git a/win/tty/topl.c b/win/tty/topl.c index cfd17838d..bb79be26c 100644 --- a/win/tty/topl.c +++ b/win/tty/topl.c @@ -259,7 +259,7 @@ register const char *bp; && cw->cury == 0 && n0 + (int) strlen(toplines) + 3 < CO - 8 /* room for --More-- */ && (notdied = strncmp(bp, "You die", 7)) != 0) { - nhassert((long) strlen(toplines) == cw->curx); + nhassert(strlen(toplines) == cw->curx); Strcat(toplines, " "); Strcat(toplines, bp); cw->curx += 2;