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

Split carrying too much check out of domove

Browse Source
This commit is contained in:
Pasi Kallinen
2022-02-25 18:12:55 +02:00
parent ca97f4f3dd
commit 4e11a85fb7
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/hack.c
View File

@@ -23,6 +23,7 @@ static boolean domove_fight_empty(xchar, xchar);
static boolean air_turbulence(void); static boolean air_turbulence(void);
static void slippery_ice_fumbling(void); static void slippery_ice_fumbling(void);
static boolean impaired_movement(xchar *, xchar *); static boolean impaired_movement(xchar *, xchar *);
static boolean carrying_too_much(void);
static void domove_core(void); static void domove_core(void);
static void maybe_smudge_engr(int, int, int, int); static void maybe_smudge_engr(int, int, int, int);
static struct monst *monstinroom(struct permonst *, int); static struct monst *monstinroom(struct permonst *, int);
@@ -1975,7 +1976,7 @@ slippery_ice_fumbling(void)
HFumbling &= ~FROMOUTSIDE; HFumbling &= ~FROMOUTSIDE;
} }
/* change movement dir if impaire. return TRUE if can't move */ /* change movement dir if impaired. return TRUE if can't move */
static boolean static boolean
impaired_movement(xchar *x, xchar *y) impaired_movement(xchar *x, xchar *y)
{ {
@@ -1995,6 +1996,28 @@ impaired_movement(xchar *x, xchar *y)
return FALSE; return FALSE;
} }
/* carrying too much to be able to move? */
static boolean
carrying_too_much(void)
{
int wtcap;
if (((wtcap = near_capacity()) >= OVERLOADED
|| (wtcap > SLT_ENCUMBER
&& (Upolyd ? (u.mh < 5 && u.mh != u.mhmax)
: (u.uhp < 10 && u.uhp != u.uhpmax))))
&& !Is_airlevel(&u.uz)) {
if (wtcap < OVERLOADED) {
You("don't have enough stamina to move.");
exercise(A_CON, FALSE);
} else
You("collapse under your load.");
nomul(0);
return TRUE;
}
return FALSE;
}
void void
domove(void) domove(void)
{ {
@@ -2015,7 +2038,7 @@ domove_core(void)
register struct rm *tmpr; register struct rm *tmpr;
xchar x, y; xchar x, y;
struct trap *trap = NULL; struct trap *trap = NULL;
int wtcap, glyph; int glyph;
xchar chainx = 0, chainy = 0, xchar chainx = 0, chainy = 0,
ballx = 0, bally = 0; /* ball&chain new positions */ ballx = 0, bally = 0; /* ball&chain new positions */
int bc_control = 0; /* control for ball&chain */ int bc_control = 0; /* control for ball&chain */
@@ -2028,19 +2051,9 @@ domove_core(void)
g.context.travel1 = 0; g.context.travel1 = 0;
} }
if (((wtcap = near_capacity()) >= OVERLOADED if (carrying_too_much())
|| (wtcap > SLT_ENCUMBER
&& (Upolyd ? (u.mh < 5 && u.mh != u.mhmax)
: (u.uhp < 10 && u.uhp != u.uhpmax))))
&& !Is_airlevel(&u.uz)) {
if (wtcap < OVERLOADED) {
You("don't have enough stamina to move.");
exercise(A_CON, FALSE);
} else
You("collapse under your load.");
nomul(0);
return; return;
}
if (u.uswallow) { if (u.uswallow) {
u.dx = u.dy = 0; u.dx = u.dy = 0;
x = u.ustuck->mx, y = u.ustuck->my; x = u.ustuck->mx, y = u.ustuck->my;