PennMUSH Community

Changeset 1206

Show
Ignore:
Timestamp:
01/20/08 21:03:58 (9 months ago)
Author:
shawnw
Message:

Fix to controls attribute patch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/hdrs/attrib.h

    r1199 r1206  
    8484int string_to_atrflagsets(dbref player, const char *p, privbits *setbits, 
    8585                          privbits *clrbits); 
    86 extern const char *atrflag_to_string(privbits mask); 
    87 extern void init_atr_name_tree(void); 
     86const char *atrflag_to_string(privbits mask); 
     87void init_atr_name_tree(void); 
    8888 
    89 extern int can_read_attr_internal(dbref player, dbref obj, ATTR *attr); 
    90 extern int can_write_attr_internal(dbref player, dbref obj, ATTR *attr, 
    91                                    int safe); 
    92 extern int can_edit_attr(dbref player, dbref thing, const char *attrname); 
    93 extern unsigned const char *atr_get_compressed_data(ATTR *atr); 
    94 extern char *atr_value(ATTR *atr); 
    95 extern char * 
     89int can_read_attr_internal(dbref player, dbref obj, ATTR *attr); 
     90int can_write_attr_internal(dbref player, dbref obj, ATTR *attr, 
     91                            int safe); 
     92bool can_edit_attr(dbref player, dbref thing, const char *attrname); 
     93unsigned const char *atr_get_compressed_data(ATTR *atr); 
     94char *atr_value(ATTR *atr); 
     95char * 
    9696safe_atr_value(ATTR *atr) 
    9797  __attribute_malloc__; 

  • 1.8.3/branches/devel/src/attrib.c

    r1199 r1206  
    398398 * \retval 1 attribute can be changed by player 
    399399 */ 
    400 int 
     400bool 
    401401can_edit_attr(dbref player, dbref thing, const char *attrname) 
    402402{ 
    403403  ATTR *ptr = find_atr_in_list(List(thing), attrname); 
    404   if (ptr) { 
    405     if (AF_Safe(ptr) || !Can_Write_Attr(player, thing, ptr)) 
    406       return 0; 
    407   } else { 
    408     return (can_create_attr(player, thing, attrname, 0) == AE_OKAY); 
    409   } 
     404  if (ptr) 
     405    return Can_Write_Attr(player, thing, ptr); 
     406  else 
     407    return can_create_attr(player, thing, attrname, 0) == AE_OKAY; 
    410408} 
    411409