Merge branch 'fix-shk' of https://github.com/argrath/NetHack into pr671
This commit is contained in:
@@ -3525,13 +3525,16 @@ shk_impaired(struct monst *shkp)
|
|||||||
static boolean
|
static boolean
|
||||||
repairable_damage(struct damage *dam, struct monst *shkp)
|
repairable_damage(struct damage *dam, struct monst *shkp)
|
||||||
{
|
{
|
||||||
xchar x = dam->place.x, y = dam->place.y;
|
xchar x, y;
|
||||||
struct trap* ttmp;
|
struct trap* ttmp;
|
||||||
struct monst *mtmp;
|
struct monst *mtmp;
|
||||||
|
|
||||||
if (!dam || shk_impaired(shkp))
|
if (!dam || shk_impaired(shkp))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
x = dam->place.x;
|
||||||
|
y = dam->place.y;
|
||||||
|
|
||||||
/* too soon to fix it? */
|
/* too soon to fix it? */
|
||||||
if ((g.moves - dam->when) < REPAIR_DELAY)
|
if ((g.moves - dam->when) < REPAIR_DELAY)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|||||||
Reference in New Issue
Block a user