Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-12-13 17:37:46 -05:00
13 changed files with 22 additions and 18 deletions

View File

@@ -95,7 +95,7 @@ const struct propname {
{ UNCHANGING, "unchanging" },
{ REFLECTING, "reflecting" },
{ FREE_ACTION, "free action" },
{ FIXED_ABIL, "fixed abilites" },
{ FIXED_ABIL, "fixed abilities" },
{ LIFESAVED, "life will be saved" },
{ 0, 0 },
};
@@ -1400,7 +1400,7 @@ long timeout;
break; /* case [otyp ==] candelabrum|tallow_candle|wax_candle */
default:
impossible("burn_object: unexpeced obj %s", xname(obj));
impossible("burn_object: unexpected obj %s", xname(obj));
break;
}
if (need_newsym)