From: cohrs <cohrs>
Date: Sun, 24 Feb 2002 21:36:32 +0000 (+0000)
Subject: mounting steed while levitating at will
X-Git-Tag: MOVE2GIT~3122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df31185e9ca9c3b9097567b84f80f135e613b570;p=nethack

mounting steed while levitating at will
- avoid causing damage if you slip and levitating at will
- change message slightly in this case as well
---

diff --git a/doc/fixes34.0 b/doc/fixes34.0
index 7ee3099b6..a3f384e39 100644
--- a/doc/fixes34.0
+++ b/doc/fixes34.0
@@ -442,6 +442,7 @@ prevent corpses of undead creatures just killed by undead turning from being
 allow fake player monsters to handle artifacts that don't match alignment/role
 chaotic monsters can use Stormbringer; lawful monsters can use Excalibur
 No "corridor disappears" message if Vault guard dies off-level
+slip while mounting and levitating at will should not cause damage
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/steed.c b/src/steed.c
index a48683436..698779077 100644
--- a/src/steed.c
+++ b/src/steed.c
@@ -300,8 +300,13 @@ mount_steed(mtmp, force)
 	    return (FALSE);
 	}
 	if (!force && (Confusion || Fumbling || Glib || Wounded_legs ||
-			otmp->cursed || (u.ulevel+mtmp->mtame < rnd(MAXULEV/2+5)))) {
+		otmp->cursed || (u.ulevel+mtmp->mtame < rnd(MAXULEV/2+5)))) {
+	    if (Levitation) {
+		pline("%s slips away from you.", Monnam(mtmp));
+		return FALSE;
+	    }
 	    You("slip while trying to get on %s.", mon_nam(mtmp));
+
 	    /* Unfortunately we don't have a version of the monster-naming
 	     * function that works well with "a" and "the" but ignores
 	     * hallucination.  Fortunately, we know the monster must be saddled