wish bit

<Someone> wrote:
>> You're equally unlikely to be wishing for spellbooks by colour,
>> but I note that 'grey' for 'gray' only works for dragonscale and
>> stones, not the spellbook description.
>>
> I've just noticed that the fix for this only works for 'grey
> spellbook', not 'grey spell book'; 'spell book' works for wishing
> in other contexts, so it probably ought to here :-)

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index 27dab1b01adb4145ac07f94f0b85ca86fb600bea..fba939308a5177da95219f1bf53890f0885b428b 100644 (file)
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -25,6 +25,7 @@ open_levelfile_exclusively() was showing the return value -1 in a panic message,
        even though that was the only possible value; show errno instead
 it was inappropriate to have a ghost "appear" in desecrated temple when 
        you were blind and without telepathy
+accept wish for "grey spell book" not just "grey spellbook"
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/objnam.c b/src/objnam.c
index 0e1e5108261136ab793fd4b04dafb737a8d5eb92..5dadeb7e9a4f3c4c3e0e5bce3b11c1bb66ee78f3 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -2019,7 +2019,7 @@ boolean from_user;
                as++;
        }
        /* can't use spellings list for this one due to shuffling */
-       if (!strcmpi(bp, "grey spellbook"))
+       if (!strncmpi(bp, "grey spell", 10))
                *(bp + 2) = 'a';
     }