Ticket #7610: create-dbref.patch.txt

*** src/cmds.c.orig Fri Oct  5 23:36:32 2007
--- src/cmds.c  Fri Jun  6 02:32:49 2008
***************
*** 194,200 ****
  
  COMMAND(cmd_create)
  {
!   do_create(player, arg_left, parse_integer(arg_right));
  }
  
  COMMAND(cmd_clone)
--- 194,212 ----
  
  COMMAND(cmd_create)
  {
! 
!   int cost = 0;
!   char *newdbref;
! 
!   if (args_right[1] && *args_right[1])
!     cost = parse_integer(args_right[1]);
! 
!   if (args_right[2] && *args_right[2])
!     newdbref = args_right[2];
!   else
!     newdbref = (char *) NULL;
! 
!   do_create(player, arg_left, cost, newdbref);
  }
  
  COMMAND(cmd_clone)
*** src/command.c.orig  Fri Oct  5 23:36:32 2007
--- src/command.c   Fri Jun  6 02:32:49 2008
***************
*** 99,105 ****
    {"@CPATTR", "CONVERT NOFLAGCOPY", cmd_cpattr,
     CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_ARGS,
     0, 0},
!   {"@CREATE", NULL, cmd_create, CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED,
     0, 0},
    {"@CLONE", "PRESERVE", cmd_clone, CMD_T_ANY | CMD_T_NOGAGGED | CMD_T_EQSPLIT,
     0, 0},
--- 99,106 ----
    {"@CPATTR", "CONVERT NOFLAGCOPY", cmd_cpattr,
     CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_ARGS,
     0, 0},
!   {"@CREATE", NULL, cmd_create,
!    CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_ARGS | CMD_T_NOGAGGED,
     0, 0},
    {"@CLONE", "PRESERVE", cmd_clone, CMD_T_ANY | CMD_T_NOGAGGED | CMD_T_EQSPLIT,
     0, 0},
*** src/create.c.orig   Tue Jun 12 23:21:48 2007
--- src/create.c    Fri Jun  6 02:32:49 2008
***************
*** 424,433 ****
   * \param player the enactor.
   * \param name name of thing to create.
   * \param cost pennies spent in creation.
   * \return dbref of new thing, or NOTHING.
   */
  dbref
! do_create(dbref player, char *name, int cost)
  {
    dbref loc;
    dbref thing;
--- 424,434 ----
   * \param player the enactor.
   * \param name name of thing to create.
   * \param cost pennies spent in creation.
+  * \paran newdbref the (unparsed) dbref to give the object, or NULL to use the next free
   * \return dbref of new thing, or NOTHING.
   */
  dbref
! do_create(dbref player, char *name, int cost, char *newdbref)
  {
    dbref loc;
    dbref thing;
***************
*** 441,446 ****
--- 442,466 ----
    } else if (cost < OBJECT_COST) {
      cost = OBJECT_COST;
    }
+ 
+   if (newdbref && *newdbref) {
+     /* move newdbref to the start of the free list */
+     if (!has_flag_by_name(player, "WIZARD", NOTYPE)) {
+       notify(player, T("Permission denied."));
+       return NOTHING;
+     }
+     thing = parse_dbref(newdbref);
+     if (thing == NOTHING || !GoodObject(thing) || !IsGarbage(thing)) {
+       notify(player, T("That is not a valid dbref."));
+       return NOTHING;
+     }
+ 
+     if (!make_first_free(thing)) {
+       notify(player, T("Unable to create object with that dbref."));
+       return NOTHING;
+     }
+   }
+ 
    if (can_pay_fees(player, cost)) {
      /* create the object */
      thing = new_object();
*** src/destroy.c.orig  Mon Jul  9 04:50:12 2007
--- src/destroy.c   Fri Jun  6 02:32:50 2008
***************
*** 879,884 ****
--- 879,910 ----
    giveto(Owner(thing), EXIT_COST);
  }
  
+ /** If object is in the free list, move it to the very beginning.
+  * \param object dbref of object to move
+  * \return 1 if object is moved successfully, 0 otherwise
+  */
+ int
+ make_first_free(dbref object)
+ {
+   dbref curr;
+   dbref prev = NOTHING;
+ 
+   if (first_free == NOTHING || !GoodObject(object) || !IsGarbage(object))
+     return 0;                   // no garbage, or object isn't garbage
+   else if (first_free == object)
+     return 1;                   // object is already at the head of the queue
+   for (curr = first_free; Next(curr); curr = Next(curr)) {
+     if (curr == object) {
+       Next(prev) = Next(curr);
+       Next(curr) = first_free;
+       first_free = curr;
+       return 1;
+     } else
+       prev = curr;
+   }
+   return 0;
+ 
+ }
  
  /** Return a cleaned up object off the free list or NOTHING.
   * \return a garbage object or NOTHING.
*** hdrs/externs.h.orig Fri Oct  5 23:36:32 2007
--- hdrs/externs.h  Fri Jun  6 02:32:57 2008
***************
*** 261,267 ****
  
  /* From create.c */
  dbref do_dig(dbref player, const char *name, char **argv, int tport);
! dbref do_create(dbref player, char *name, int cost);
  dbref do_real_open(dbref player, const char *direction,
                     const char *linkto, dbref pseudo);
  void do_open(dbref player, const char *direction, char **links);
--- 261,267 ----
  
  /* From create.c */
  dbref do_dig(dbref player, const char *name, char **argv, int tport);
! dbref do_create(dbref player, char *name, int cost, char *newdbref);
  dbref do_real_open(dbref player, const char *direction,
                     const char *linkto, dbref pseudo);
  void do_open(dbref player, const char *direction, char **links);
***************
*** 654,659 ****
--- 654,660 ----
  /* From destroy.c */
      void do_undestroy(dbref player, char *name);
      dbref free_get(void);
+     int make_first_free(dbref object);
      void fix_free_list(void);
      void purge(void);
      void do_purge(dbref player);
*** src/function.c.orig Fri Jun  6 02:32:50 2008
--- src/function.c  Fri Jun  6 02:36:03 2008
***************
*** 380,386 ****
    {"CONVUTCSECS", fun_convsecs, 1, 1, FN_REG},
    {"CONVTIME", fun_convtime, 1, 1, FN_REG},
    {"COR", fun_cor, 2, INT_MAX, FN_NOPARSE},
!   {"CREATE", fun_create, 1, 2, FN_REG},
    {"CSECS", fun_csecs, 1, 1, FN_REG},
    {"CTIME", fun_ctime, 1, 2, FN_REG},
    {"DEC", fun_dec, 1, 1, FN_REG},
--- 380,386 ----
    {"CONVUTCSECS", fun_convsecs, 1, 1, FN_REG},
    {"CONVTIME", fun_convtime, 1, 1, FN_REG},
    {"COR", fun_cor, 2, INT_MAX, FN_NOPARSE},
!   {"CREATE", fun_create, 1, 3, FN_REG},
    {"CSECS", fun_csecs, 1, 1, FN_REG},
    {"CTIME", fun_ctime, 1, 2, FN_REG},
    {"DEC", fun_dec, 1, 1, FN_REG},
*** src/fundb.c.orig    Mon Jul  9 04:50:12 2007
--- src/fundb.c Fri Jun  6 02:35:39 2008
***************
*** 1955,1961 ****
      cost = parse_integer(args[1]);
    else
      cost = OBJECT_COST;
!   safe_dbref(do_create(executor, args[0], cost), buff, bp);
  }
  
  /* ARGSUSED */
--- 1955,1961 ----
      cost = parse_integer(args[1]);
    else
      cost = OBJECT_COST;
!   safe_dbref(do_create(executor, args[0], cost, args[2]), buff, bp);
  }
  
  /* ARGSUSED */
*** game/txt/hlp/penncmd.hlp.orig   Fri Oct  5 23:36:32 2007
--- game/txt/hlp/penncmd.hlp    Fri Jun  6 02:39:02 2008
***************
*** 811,817 ****
  
  See also: ATTRIBUTES, NON-STANDARD ATTRIBUTES
  & @create
!   @create <name> [=<cost>]
  
    Creates a thing with the specified name. Creating a thing costs
    a certain amount of MUSH money, which usually defaults to 10 pennies.
--- 811,817 ----
  
  See also: ATTRIBUTES, NON-STANDARD ATTRIBUTES
  & @create
!   @create <name>[=<cost>[,<dbref>]]
  
    Creates a thing with the specified name. Creating a thing costs
    a certain amount of MUSH money, which usually defaults to 10 pennies.
***************
*** 821,826 ****
--- 821,830 ----
    Once you have created a thing, you can use it as a PUPPET, to store
    USER-DEFINED COMMANDS, or just as a prop. Some MUSHes choose to limit 
    the number of objects that players can create by setting a QUOTA.
+   
+   Wizards can also specify the dbref of a garbage object to use when
+   creating the object. Otherwise, the object is given the next
+   available dbref.
   
  See also: give, @quota, MONEY
  & @dbck
*** game/txt/hlp/pennfunc.hlp.orig  Fri Oct  5 23:36:32 2007
--- game/txt/hlp/pennfunc.hlp   Fri Jun  6 02:39:42 2008
***************
*** 874,883 ****
  
  See also: @pcreate
  & CREATE()
!   create(<object>, <cost>)
   
    This function creates an object with name <object> for <cost> pennies,
!   and returns the dbref number of the created object.
  
    This is a side-effect function and may not be enabled on some MUSHes.
  & CTIME()
--- 874,884 ----
  
  See also: @pcreate
  & CREATE()
!   create(<object>[, <cost>[, <dbref>]])
   
    This function creates an object with name <object> for <cost> pennies,
!   and returns the dbref number of the created object. Wizards may also
!   specify a <dbref>, as per @create.
  
    This is a side-effect function and may not be enabled on some MUSHes.
  & CTIME()