PennMUSH Community

Changeset 1306

Show
Ignore:
Timestamp:
10/03/08 16:21:55 (2 months ago)
Author:
shawnw
Message:

#7530: locate() and english matching

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/trunk/CHANGES.183

    r1304 r1306  
    2222   existing databases and log files that it makes. Suggested 
    2323   by Ray, 
     24 
     25Fixes: 
     26 * locate() always used english matching even when not explicitly told 
     27   to. Patch by Talvo. 
    2428 
    2529Version 1.8.3 patchlevel 7                      Oct 01, 2008 

  • 1.8.3/trunk/src/match.c

    r919 r1306  
    243243  sname = name = mush_strdup(xname, "mri.string"); 
    244244 
    245   /* Check for adjective phrases */ 
    246   matchnum = parse_english(&name, &flags); 
     245  if (flags & MAT_ENGLISH) { 
     246    /* Check for adjective phrases */ 
     247    matchnum = parse_english(&name, &flags); 
     248  } 
    247249 
    248250  /* Perform matching. We've already had flags restricted by any