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

split starving dog into separate function

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2022-07-20 14:40:50 -07:00
committed by PatR
parent 8a52716936
commit 58b32e76f0
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dogmove.c
+20 -12
View File
@@ -11,6 +11,7 @@
#define DOG_WEAK 500 #define DOG_WEAK 500
#define DOG_STARVE 750 #define DOG_STARVE 750
static void dog_starve(struct monst *);
static boolean dog_hunger(struct monst *, struct edog *); static boolean dog_hunger(struct monst *, struct edog *);
static int dog_invent(struct monst *, struct edog *, int); static int dog_invent(struct monst *, struct edog *, int);
static int dog_goal(struct monst *, struct edog *, int, int, int); static int dog_goal(struct monst *, struct edog *, int, int, int);
@@ -376,6 +377,19 @@ dog_eat(struct monst *mtmp,
return 1; return 1;
} }
static void
dog_starve(struct monst *mtmp)
{
if (mtmp->mleashed && mtmp != u.usteed)
Your("leash goes slack.");
else if (cansee(mtmp->mx, mtmp->my))
pline("%s starves.", Monnam(mtmp));
else
You_feel("%s for a moment.",
Hallucination ? "bummed" : "sad");
mondied(mtmp);
}
/* hunger effects -- returns TRUE on starvation */ /* hunger effects -- returns TRUE on starvation */
static boolean static boolean
dog_hunger(struct monst *mtmp, struct edog *edog) dog_hunger(struct monst *mtmp, struct edog *edog)
@@ -392,8 +406,10 @@ dog_hunger(struct monst *mtmp, struct edog *edog)
mtmp->mhpmax = newmhpmax; mtmp->mhpmax = newmhpmax;
if (mtmp->mhp > mtmp->mhpmax) if (mtmp->mhp > mtmp->mhpmax)
mtmp->mhp = mtmp->mhpmax; mtmp->mhp = mtmp->mhpmax;
if (DEADMONSTER(mtmp)) if (DEADMONSTER(mtmp)) {
goto dog_died; dog_starve(mtmp);
return TRUE;
}
if (cansee(mtmp->mx, mtmp->my)) if (cansee(mtmp->mx, mtmp->my))
pline("%s is confused from hunger.", Monnam(mtmp)); pline("%s is confused from hunger.", Monnam(mtmp));
else if (couldsee(mtmp->mx, mtmp->my)) else if (couldsee(mtmp->mx, mtmp->my))
@@ -403,16 +419,8 @@ dog_hunger(struct monst *mtmp, struct edog *edog)
stop_occupation(); stop_occupation();
} else if (g.moves > edog->hungrytime + DOG_STARVE } else if (g.moves > edog->hungrytime + DOG_STARVE
|| DEADMONSTER(mtmp)) { || DEADMONSTER(mtmp)) {
dog_died: dog_starve(mtmp);
if (mtmp->mleashed && mtmp != u.usteed) return TRUE;
Your("leash goes slack.");
else if (cansee(mtmp->mx, mtmp->my))
pline("%s starves.", Monnam(mtmp));
else
You_feel("%s for a moment.",
Hallucination ? "bummed" : "sad");
mondied(mtmp);
return TRUE;
} }
} }
return FALSE; return FALSE;