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

Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

Browse Source
This commit is contained in:
nhmall
2016-01-06 21:04:37 -05:00
parent b48673425e d8591be858
commit 89a1db6480
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.1
+1
View File
@@ -97,6 +97,7 @@ make vault guard accept names starting with number
fix weight of containers in special levels fix weight of containers in special levels
make the raven medusa level shortsighted make the raven medusa level shortsighted
fix possible segfault in lev_comp when map was too tall fix possible segfault in lev_comp when map was too tall
fix "the ice is bridged with ice" when freezing castle's moat or Medusa's sea
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/zap.c
+9 -7
View File
@@ -4234,8 +4234,8 @@ short exploding_wand_typ;
case ZT_COLD: case ZT_COLD:
if (is_pool(x, y) || is_lava(x, y)) { if (is_pool(x, y) || is_lava(x, y)) {
boolean lava = is_lava(x, y); boolean lava = is_lava(x, y),
boolean moat = is_moat(x, y); moat = is_moat(x, y);
if (lev->typ == WATER) { if (lev->typ == WATER) {
/* For now, don't let WATER freeze. */ /* For now, don't let WATER freeze. */
@@ -4245,23 +4245,25 @@ short exploding_wand_typ;
You_hear("a soft crackling."); You_hear("a soft crackling.");
rangemod -= 1000; /* stop */ rangemod -= 1000; /* stop */
} else { } else {
char buf[BUFSZ];
Strcpy(buf, waterbody_name(x, y)); /* for MOAT */
rangemod -= 3; rangemod -= 3;
if (lev->typ == DRAWBRIDGE_UP) { if (lev->typ == DRAWBRIDGE_UP) {
lev->drawbridgemask &= ~DB_UNDER; /* clear lava */ lev->drawbridgemask &= ~DB_UNDER; /* clear lava */
lev->drawbridgemask |= (lava ? DB_FLOOR : DB_ICE); lev->drawbridgemask |= (lava ? DB_FLOOR : DB_ICE);
} else { } else {
if (!lava) if (!lava)
lev->icedpool = lev->icedpool = (lev->typ == POOL) ? ICED_POOL
(lev->typ == POOL ? ICED_POOL : ICED_MOAT); : ICED_MOAT;
lev->typ = (lava ? ROOM : ICE); lev->typ = lava ? ROOM : ICE;
} }
bury_objs(x, y); bury_objs(x, y);
if (see_it) { if (see_it) {
if (lava) if (lava)
Norep("The lava cools and solidifies."); Norep("The lava cools and solidifies.");
else if (moat) else if (moat)
Norep("The %s is bridged with ice!", Norep("The %s is bridged with ice!", buf);
waterbody_name(x, y));
else else
Norep("The water freezes."); Norep("The water freezes.");
newsym(x, y); newsym(x, y);