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

get rid of some recent signed/unsigned mismatches

Browse Source 
src/mkroom.c(529): warning C4389: '!=': signed/unsigned mismatch
src/sp_lev.c(981): warning C4389: '==': signed/unsigned mismatch
src/sp_lev.c(983): warning C4389: '==': signed/unsigned mismatch
src/sp_lev.c(985): warning C4389: '==': signed/unsigned mismatch
src/sp_lev.c(987): warning C4389: '==': signed/unsigned mismatch
src/sp_lev.c(989): warning C4389: '==': signed/unsigned mismatch
This commit is contained in:
nhmall
2021-07-10 07:42:27 -04:00
parent 82526315f1
commit a4711739c0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mkroom.c
+1 -1
View File
@@ -526,7 +526,7 @@ mkswamp(void) /* Michiel Huisjes & Fred de Wilde */
sroom->rtype = SWAMP; sroom->rtype = SWAMP;
for (sx = sroom->lx; sx <= sroom->hx; sx++) for (sx = sroom->lx; sx <= sroom->hx; sx++)
for (sy = sroom->ly; sy <= sroom->hy; sy++) { for (sy = sroom->ly; sy <= sroom->hy; sy++) {
if (!IS_ROOM(levl[sx][sy].typ) || levl[sx][sy].roomno != rmno) if (!IS_ROOM(levl[sx][sy].typ) || (int) levl[sx][sy].roomno != rmno)
continue; continue;
if (!OBJ_AT(sx, sy) && !MON_AT(sx, sy) && !t_at(sx, sy) if (!OBJ_AT(sx, sy) && !MON_AT(sx, sy) && !t_at(sx, sy)
&& !nexttodoor(sx, sy)) { && !nexttodoor(sx, sy)) {
src/sp_lev.c
+6 -6
View File
@@ -978,15 +978,15 @@ shared_with_room(int x, int y, struct mkroom *droom)
if (!isok(x,y)) if (!isok(x,y))
return FALSE; return FALSE;
if (levl[x][y].roomno == rmno && !levl[x][y].edge) if ((int) levl[x][y].roomno == rmno && !levl[x][y].edge)
return FALSE; return FALSE;
if (isok(x-1, y) && levl[x-1][y].roomno == rmno) if (isok(x-1, y) && (int) levl[x-1][y].roomno == rmno)
return TRUE; return TRUE;
if (isok(x+1, y) && levl[x+1][y].roomno == rmno) if (isok(x+1, y) && (int) levl[x+1][y].roomno == rmno)
return TRUE; return TRUE;
if (isok(x, y-1) && levl[x][y-1].roomno == rmno) if (isok(x, y-1) && (int) levl[x][y-1].roomno == rmno)
return TRUE; return TRUE;
if (isok(x, y+1) && levl[x][y+1].roomno == rmno) if (isok(x, y+1) && (int) levl[x][y+1].roomno == rmno)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
@@ -997,7 +997,7 @@ maybe_add_door(int x, int y, struct mkroom* droom)
{ {
if (droom->hx >= 0 && g.doorindex < DOORMAX if (droom->hx >= 0 && g.doorindex < DOORMAX
&& ((!droom->irregular && inside_room(droom, x, y)) && ((!droom->irregular && inside_room(droom, x, y))
|| levl[x][y].roomno == (droom - g.rooms) + ROOMOFFSET || (int) levl[x][y].roomno == (droom - g.rooms) + ROOMOFFSET
|| shared_with_room(x, y, droom))) { || shared_with_room(x, y, droom))) {
add_door(x, y, droom); add_door(x, y, droom);
} }