--- deliantra/server/include/object.h	2007/11/08 19:43:24	1.153
+++ deliantra/server/include/object.h	2008/04/11 14:09:56	1.157
@@ -67,6 +67,9 @@
 
 extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
 
+#define NUM_COINS 4             /* number of coin types */
+extern const char *const coins[NUM_COINS + 1];
+
 /*
  * Each object (this also means archetypes!) could have a few of these
  * "dangling" from it; this could also end up containing 'parse errors'.
@@ -87,15 +90,36 @@
 {
   uint64 seq;
 
+  static UUID cur; // last uuid generated
+  static void init ();
+  static UUID gen ();
+
   UUID () { }
   UUID (uint64 seq) : seq(seq) { }
   operator uint64() { return seq; }
   void operator =(uint64 seq) { this->seq = seq; }
-};
 
-extern void init_uuid ();
-extern UUID gen_uuid ();
-extern const uint64 UUID_SKIP;
+  typedef char BUF [32];
+
+  bool parse (const char *s)
+  {
+    return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
+  }
+
+  const char *c_str (char *buf, int len) const
+  {
+    snprintf (buf, len, "<1.%" PRIx64 ">", seq);
+
+    return buf;
+  }
+
+  const char *c_str () const
+  {
+    static BUF buf;
+
+    return c_str (buf, sizeof (buf));
+  }
+};
 
 /* Definition for WILL_APPLY values.  Replaces having harcoded values
  * sprinkled in the code.  Note that some of these also replace fields