PennMUSH 1.8.3p12

Author: allthecoolkidshaveone
<allthecoolkidshaveone@ba372814-4f39-11de-9ad6-1127a62b9fcd>
Date:   Sat Jan 2 00:23:25 2010 +0000

    Issue 159: Make possessive get and english matching work together.
Fixes #215

diff --git a/src/move.c b/src/move.c
index d6f2479afdb2e4ba3e8ae4f917edc76866f9c80a..9cb0c489f67321fc075de847b0c7a322b64eae40 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -555,7 +555,7 @@ do_get(dbref player, const char *what)
         notify_format(player, T("I can't tell which %s."), boxname);
         return;
       }
-      thing = match_result(box, objname, NOTYPE, MAT_POSSESSION);
+      thing = match_result(box, objname, NOTYPE, MAT_POSSESSION | MAT_ENGLISH);
       if (thing == NOTHING) {
         notify(player, T("I don't see that here."));
         return;

diff --git a/src/predicat.c b/src/predicat.c
index 02e4efe1a10724a962b1a9b86f319b2fd4ea99f7..fae1c366619c06cb79fbcc56dbd7a2c01661f478 100644 (file)
--- a/src/predicat.c
+++ b/src/predicat.c
@@ -1131,7 +1131,7 @@ parse_match_possessor(dbref player, char **str)
   *str = obj;
 
   /* we already have a terminating null, so we're okay to just do matches */
-  return match_result(player, box, NOTYPE, MAT_NEIGHBOR | MAT_POSSESSION);
+  return match_result(player, box, NOTYPE, MAT_NEIGHBOR | MAT_POSSESSION | MAT_ENGLISH);
 }