PennMUSH Community
Show
Ignore:
Timestamp:
12/28/07 19:57:17 (1 year ago)
Author:
shawnw
Message:

Merge devel into trunk for p6 release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/trunk/src/fundb.c

    r1032 r1167  
    12241224  ltype = get_locktype(p); 
    12251225 
    1226   if (GoodObject(it) && (ltype != NULL) 
    1227       && Can_Read_Lock(executor, it, ltype)) { 
     1226  if (GoodObject(it) && (ltype !=NULL) 
     1227      &&Can_Read_Lock(executor, it, ltype)) { 
    12281228    ll = getlockstruct(it, ltype); 
    12291229    if (ll) { 
    …… 
    12631263 
    12641264  if ((ltype = strchr(args[0], '/'))) { 
    1265     *ltype++ = '\0'; 
     1265    *ltype ++ = '\0'; 
    12661266    upcasestr(ltype); 
    12671267  } 
    …… 
    13071307  ltype = get_locktype(p); 
    13081308 
    1309   if (!GoodObject(it) || (ltype == NULL) || !Can_Read_Lock(executor, it, ltype)) { 
     1309  if (!GoodObject(it) || (ltype == NULL) ||!Can_Read_Lock(executor, it, ltype)) { 
    13101310    safe_str("#-1", buff, bp); 
    13111311    return;