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

revisit some coordxy casts inherited from time of xchar

Browse Source 
The ones below marked "left,revisit" might be worthy of code changes

explode.c:removed: arg sx,sy passed to breaks() are coordxy and so are the parameters
invent.c: removed: discover_artifact() parameter is xint16, so change cast to match
mail.c: removed: gv.viz_rmin[] contains coordxy's, and enexto() 2nd param is too
mkmaze.c: removed: x, y are coordxy and so are cc->x, cc->y
mkroom.c: removed: tx, ty are coordxy and so are parameters to occupied()
mplayer.c: left,revisit: x,y declared int, but mk_mplayer() params are coordxy
sp_lev.c 2890: left alone: x,y declared int, but is_ok_location() params coordxy
sp_lev.c 4114: left alone: cast from lua_Integer
sp_lev.c 4123: left alone: cast from lua_Integer
sp_lev.c 4650: left alone: cast from lua_Integer returned from lua_tointeger
sp_lev.c 4765: left alone: cast from int_Integer returned from lua_tointeger
sp_lev.c 4772: left alone: cast from int_Integer returned from get_table_int
teleport.c 366: left alone: cast from int returned from rn2()
timeout.c 2171: left alone: cast from long
vault.c: left,revisit: guardx,guardy declared int, but bestcc fields are coordxy
worm.c 791: left,revisit: wseg.wx, wseg.wy are coordxy, so are nx, ny, but not
                          ox, oy; why are ox, oy needed at all?
worm.c 955: left alone: wx, wy are coordxy, wseg_at() params are int x, int y
zap.c 5061: left alone: cast from long
This commit is contained in:
nhmall
2024-12-17 13:02:05 -05:00
parent 0381e61624
commit 8da4f74dcf
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mkmaze.c
View File

@@ -1322,8 +1322,8 @@ mazexy(coord *cc)
x = rnd(gx.x_maze_max);
y = rnd(gy.y_maze_max);
if (levl[x][y].typ == allowedtyp) {
cc->x = (coordxy) x;
cc->y = (coordxy) y;
cc->x = x;
cc->y = y;
return;
}
} while (++cpt < 100);
@@ -1331,8 +1331,8 @@ mazexy(coord *cc)
for (x = 1; x <= gx.x_maze_max; x++)
for (y = 1; y <= gy.y_maze_max; y++)
if (levl[x][y].typ == allowedtyp) {
cc->x = (coordxy) x;
cc->y = (coordxy) y;
cc->x = x;
cc->y = y;
return;
}
/* every spot on the area of map allowed for mazes has been rejected */