Ticket #7510: controls-attr.patch.txt

*** src/attrib.c.orig   Sun Dec 16 23:18:28 2007
--- src/attrib.c    Sun Dec 16 23:41:03 2007
***************
*** 389,394 ****
--- 389,414 ----
    return 1;
  }
  
+ /** If the attribute exists on the object, see if the player can modify it.
+  * Otherwise, see if they can create it.
+  * \param player the player trying to set the attr
+  * \param thing the object to check
+  * \param attrname the name of the attribute to check
+  * \retval 0 attribute cannot be changed by player
+  * \retval 1 attribute can be changed by player
+  */
+ int
+ can_edit_attr(dbref player, dbref thing, const char *attrname)
+ {
+   ATTR *ptr = find_atr_in_list(List(thing), attrname);
+   if (ptr) {
+     if (AF_Safe(ptr) || !Can_Write_Attr(player, thing, ptr))
+       return 0;
+   } else {
+     return (can_create_attr(player, thing, attrname, 0) == AE_OKAY);
+   }
+ }
+ 
  /** Utility define for atr_add and can_create_attr */
  #define set_default_flags(atr,flags) \
    do { \
*** src/fundb.c.orig    Mon Jul  9 04:50:12 2007
--- src/fundb.c Sun Dec 16 23:41:06 2007
***************
*** 958,973 ****
  FUNCTION(fun_controls)
  {
    dbref it = match_thing(executor, args[0]);
!   dbref thing = match_thing(executor, args[1]);
  
!   if (!GoodObject(it))
      safe_str(T("#-1 ARG1 NOT FOUND"), buff, bp);
!   else if (!GoodObject(thing))
      safe_str(T("#-1 ARG2 NOT FOUND"), buff, bp);
!   else if (!(controls(executor, it) || controls(executor, thing)
!              || See_All(executor)))
      safe_str(T(e_perm), buff, bp);
!   else
      safe_chr(controls(it, thing) ? '1' : '0', buff, bp);
  }
  
--- 958,988 ----
  FUNCTION(fun_controls)
  {
    dbref it = match_thing(executor, args[0]);
!   dbref thing;
!   char *attrname;
  
!   if (!GoodObject(it)) {
      safe_str(T("#-1 ARG1 NOT FOUND"), buff, bp);
!     return;
!   }
! 
!   if ((attrname = strchr(args[1], '/')) != NULL)
!     *attrname++ = '\0';
!   thing = match_thing(executor, args[1]);
!   if (!GoodObject(thing)) {
      safe_str(T("#-1 ARG2 NOT FOUND"), buff, bp);
!     return;
!   }
!   if (!(controls(executor, it) || controls(executor, thing)
!         || See_All(executor)))
      safe_str(T(e_perm), buff, bp);
!   else if (attrname) {
!     if (!good_atr_name(upcasestr(attrname))) {
!       safe_str(T("#-1 BAD ATTR NAME"), buff, bp);
!       return;
!     }
!     safe_chr(can_edit_attr(it, thing, attrname) ? '1' : '0', buff, bp);
!   } else
      safe_chr(controls(it, thing) ? '1' : '0', buff, bp);
  }
  
*** hdrs/attrib.h.orig  Sun Dec 16 23:18:37 2007
--- hdrs/attrib.h   Sun Dec 16 23:41:16 2007
***************
*** 89,94 ****
--- 89,95 ----
  extern int can_read_attr_internal(dbref player, dbref obj, ATTR *attr);
  extern int can_write_attr_internal(dbref player, dbref obj, ATTR *attr,
                                     int safe);
+ extern int can_edit_attr(dbref player, dbref thing, const char *attrname);
  extern unsigned const char *atr_get_compressed_data(ATTR *atr);
  extern char *atr_value(ATTR *atr);
  extern char *
*** game/txt/hlp/pennfunc.hlp.orig  Fri Oct  5 23:36:32 2007
--- game/txt/hlp/pennfunc.hlp   Sun Dec 16 23:43:30 2007
***************
*** 800,812 ****
   
  See also: CONNECTED
  & CONTROLS()
!   controls(<object>, <victim>)
    
!   This function returns 1 if <object> controls <victim>, or 0, if
!   it does not. If one of the objects does not exist, it will return
!   #-1 ARGN NOT FOUND (where N is the argument which is the invalid
!   object). You must control <object> or <victim>, or have the See_All
!   power, to use this function.
  
  See also: CONTROL
    
--- 800,815 ----
   
  See also: CONNECTED
  & CONTROLS()
!   controls(<object>, <victim>[/<attribute>])
    
!   With no <attribute>, this function returns 1 if <object> controls
!   <victim>, or 0, if it does not. With an <attribute>, it will return 1
!   if <object> could successfully set <attribute> on <victim> (or alter
!   <attribute>, if it already exists). If one of the objects does not exist,
!   it will return #-1 ARGN NOT FOUND (where N is the argument which is the
!   invalid object). If <attribute> is not a valid attribute name, it will
!   return #-1 BAD ATTR NAME. You must control <object> or <victim>, or have
!   the See_All power, to use this function.
  
  See also: CONTROL