From d65fba4ebe30dd8c4aedd5120ba9455485b87e30 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 23 Apr 2015 19:25:01 -0700 Subject: [PATCH] do_look bits I didn't find Michael's crasher, but I did find a couple of minor problems: knight's saddled pony wasn't found in the file lookup either though there is an entry for pony ("tame saddled " stripped off "tame " but not "saddled "; "saddled " would only be found of there was a wildcard entry key of "*", like "*horse" to catch both horse and warhorse); "wombat" matched the bat entry rather than reporting an unknown entity. --- dat/data.base | 1 + src/pager.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dat/data.base b/dat/data.base index 57aea652e..52d85930d 100644 --- a/dat/data.base +++ b/dat/data.base @@ -430,6 +430,7 @@ barbed devil are quite difficult to kill. # takes "bat or bird" when specifying 'B' ~combat +~wombat *bat bat or bird A bat, flitting in the darkness outside, took the wrong turn diff --git a/src/pager.c b/src/pager.c index 036ee018c..a799650b5 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,4 +1,4 @@ -/* NetHack 3.5 pager.c $NHDT-Date: 1429408230 2015/04/19 01:50:30 $ $NHDT-Branch: master $:$NHDT-Revision: 1.62 $ */ +/* NetHack 3.5 pager.c $NHDT-Date: 1429842296 2015/04/24 02:24:56 $ $NHDT-Branch: master $:$NHDT-Revision: 1.63 $ */ /* NetHack 3.5 pager.c $Date: 2012/01/15 09:27:06 $ $Revision: 1.41 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -332,6 +332,8 @@ checkfile(inp, pm, user_typed_name, without_asking) dbase_str += 9; if (!strncmp(dbase_str, "invisible ", 10)) dbase_str += 10; + if (!strncmp(dbase_str, "saddled ", 8)) + dbase_str += 8; if (!strncmp(dbase_str, "statue of ", 10)) dbase_str[6] = '\0'; else if (!strncmp(dbase_str, "figurine of ", 12))