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

Remove obsolete find_skates function

Browse Source 
find_skates was still in use for its one intended case, but objdescr_is
has been around for a few years now and can do just as good a job
without having to hardcode the first and last boots in objects[].
This commit is contained in:
copperwater
2022-08-13 21:09:48 -04:00
committed by Pasi Kallinen
parent 1a6456ad82
commit 549dfb92ea
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/hack.c
View File

@@ -2058,13 +2058,11 @@ slippery_ice_fumbling(void)
boolean on_ice = !Levitation && is_ice(u.ux, u.uy);
if (on_ice) {
static int skates = 0;
if (!skates)
skates = find_skates();
if ((uarmf && uarmf->otyp == skates) || resists_cold(&g.youmonst)
|| Flying || is_floater(g.youmonst.data)
|| is_clinger(g.youmonst.data) || is_whirly(g.youmonst.data)) {
if ((uarmf && objdescr_is(uarmf, "snow boots"))
|| resists_cold(&g.youmonst) || Flying
|| is_floater(g.youmonst.data) || is_clinger(g.youmonst.data)
|| is_whirly(g.youmonst.data)) {
pline("skates!");
on_ice = FALSE;
} else if (!rn2(Cold_resistance ? 3 : 2)) {
HFumbling |= FROMOUTSIDE;
@@ -3837,7 +3835,7 @@ spot_checks(coordxy x, coordxy y, schar old_typ)
db_ice_now = ((levl[x][y].drawbridgemask & DB_UNDER) == DB_ICE);
/*FALLTHRU*/
case ICE:
if ((new_typ != old_typ)
if ((new_typ != old_typ)
|| (old_typ == DRAWBRIDGE_UP && !db_ice_now)) {
/* make sure there's no MELT_ICE_AWAY timer */
if (spot_time_left(x, y, MELT_ICE_AWAY)) {