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

wizard mode riding

Browse Source 
"Force the mount to succeed?" doesn't necessarily do so;
it's worse than useless to suppress the message which indicates
why a mount attempt is failing when a failure occurs.
This commit is contained in:
nethack.rankin
2002-06-01 10:40:59 +00:00
parent ac5975ea9d
commit c6d02b30c3
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steed.c
+10 -18
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)steed.c 3.4 2002/05/05 */ /* SCCS Id: @(#)steed.c 3.4 2002/05/31 */
/* Copyright (c) Kevin Hugo, 1998-1999. */ /* Copyright (c) Kevin Hugo, 1998-1999. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -188,11 +188,9 @@ mount_steed(mtmp, force)
char buf[BUFSZ]; char buf[BUFSZ];
struct permonst *ptr; struct permonst *ptr;
/* Sanity checks */ /* Sanity checks */
if (u.usteed) { if (u.usteed) {
if (!force) You("are already riding %s.", mon_nam(u.usteed));
You("are already riding %s.", mon_nam(u.usteed));
return (FALSE); return (FALSE);
} }
@@ -223,8 +221,7 @@ mount_steed(mtmp, force)
if (Upolyd && (!humanoid(youmonst.data) || verysmall(youmonst.data) || if (Upolyd && (!humanoid(youmonst.data) || verysmall(youmonst.data) ||
bigmonst(youmonst.data))) { bigmonst(youmonst.data))) {
if (!force) You("won't fit on a saddle.");
You("won't fit on a saddle.");
return (FALSE); return (FALSE);
} }
if(!force && (near_capacity() > SLT_ENCUMBER)) { if(!force && (near_capacity() > SLT_ENCUMBER)) {
@@ -234,20 +231,17 @@ mount_steed(mtmp, force)
/* Can the player reach and see the monster? */ /* Can the player reach and see the monster? */
if (u.uswallow || u.ustuck || u.utrap || Punished) { if (u.uswallow || u.ustuck || u.utrap || Punished) {
if (!force) { if (Punished)
if (Punished) You("are unable to swing your %s over.", body_part(LEG));
You("are unable to swing your %s over.", body_part(LEG)); else
else You("are stuck here for now.");
You("are stuck here for now.");
}
return (FALSE); return (FALSE);
} }
if (!mtmp || (!force && ((Blind && !Blind_telepat) || if (!mtmp || (!force && ((Blind && !Blind_telepat) ||
mtmp->mundetected || mtmp->mundetected ||
mtmp->m_ap_type == M_AP_FURNITURE || mtmp->m_ap_type == M_AP_FURNITURE ||
mtmp->m_ap_type == M_AP_OBJECT))) { mtmp->m_ap_type == M_AP_OBJECT))) {
if (!force) pline("I see nobody there.");
pline("I see nobody there.");
return (FALSE); return (FALSE);
} }
@@ -266,8 +260,7 @@ mount_steed(mtmp, force)
instapetrify(kbuf); instapetrify(kbuf);
} }
if (!mtmp->mtame || mtmp->isminion) { if (!mtmp->mtame || mtmp->isminion) {
if (!force) pline("I think %s would mind.", mon_nam(mtmp));
pline("I think %s would mind.", mon_nam(mtmp));
return (FALSE); return (FALSE);
} }
if (mtmp->mtrapped) { if (mtmp->mtrapped) {
@@ -292,8 +285,7 @@ mount_steed(mtmp, force)
return (FALSE); return (FALSE);
} }
if (!can_saddle(mtmp) || !can_ride(mtmp)) { if (!can_saddle(mtmp) || !can_ride(mtmp)) {
if (!force) You_cant("ride such a creature.");
You_cant("ride such a creature.");
return (0); return (0);
} }