--- deliantra/server/common/arch.C	2007/06/05 13:05:02	1.64
+++ deliantra/server/common/arch.C	2007/06/07 18:55:24	1.65
@@ -159,23 +159,23 @@
   return create_singularity (name);
 }
 
- /* This is a subset of the parse_id command.  Basically, name can be
-  * a string seperated lists of things to match, with certain keywords.
-  * pl is the player (only needed to set count properly)
-  * op is the item we are trying to match.  Calling function takes care
-  * of what action might need to be done and if it is valid
-  * (pickup, drop, etc.)  Return NONZERO if we have a match.  A higher
-  * value means a better match.  0 means no match.
-  *
-  * Brief outline of the procedure:
-  * We take apart the name variable into the individual components.
-  * cases for 'all' and unpaid are pretty obvious.
-  * Next, we check for a count (either specified in name, or in the
-  * player object.)
-  * If count is 1, make a quick check on the name.
-  * IF count is >1, we need to make plural name.  Return if match.
-  * Last, make a check on the full name.
-  */
+/* This is a subset of the parse_id command.  Basically, name can be
+ * a string seperated lists of things to match, with certain keywords.
+ * pl is the player (only needed to set count properly)
+ * op is the item we are trying to match.  Calling function takes care
+ * of what action might need to be done and if it is valid
+ * (pickup, drop, etc.)  Return NONZERO if we have a match.  A higher
+ * value means a better match.  0 means no match.
+ *
+ * Brief outline of the procedure:
+ * We take apart the name variable into the individual components.
+ * cases for 'all' and unpaid are pretty obvious.
+ * Next, we check for a count (either specified in name, or in the
+ * player object.)
+ * If count is 1, make a quick check on the name.
+ * IF count is >1, we need to make plural name.  Return if match.
+ * Last, make a check on the full name.
+ */
 int
 item_matched_string (object *pl, object *op, const char *name)
 {
@@ -516,13 +516,17 @@
 object *
 create_singularity (const char *name)
 {
-  object *op;
+  LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
+
+  if (!strcmp (name, "bug"))
+    abort ();
+
   char buf[MAX_BUF];
+  sprintf (buf, "bug, please report (%s)", ARCH_SINGULARITY, name);
 
-  sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
-  op = object::create ();
+  object *op = get_archetype ("bug");
   op->name = op->name_pl = buf;
-  SET_FLAG (op, FLAG_NO_PICK);
+
   return op;
 }