Revert "Fixed sign/unsigned comparisions."

This reverts commit 0e8e5aac93e660a001dccb66df7320023aaa36de.

diff --git a/src/teleport.c b/src/teleport.c
index 0c827184529b6de81ce72d715e086fd3fcaaa897..100a74d3bfcce492b415cf45a7a057d9dec67f40 100644 (file)
--- 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 <xx,yy> */

diff --git a/win/tty/topl.c b/win/tty/topl.c
index cfd17838d460e4a425e0af6f33ef45ed92a1eb96..bb79be26c060aaa41e54ad1f05d428a8b4ea6717 100644 (file)
--- 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;