--- deliantra/server/include/object.h	2007/10/16 00:30:24	1.152
+++ deliantra/server/include/object.h	2008/04/15 03:16:02	1.159
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef OBJECT_H
@@ -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
@@ -447,7 +471,7 @@
   MTH void activate_recursive   ();
   MTH void deactivate_recursive ();
 
-  // set the givne flag on all objects in the inventory recursively
+  // set the given flag on all objects in the inventory recursively
   MTH void set_flag_inv (int flag, int value = 1);
 
   void enter_exit (object *exit);//Perl
@@ -550,7 +574,7 @@
 typedef struct oblinkpt
 {				/* Used to link together several object links */
   struct oblnk *link;
-  long value;			/* Used as connected value in buttons/gates */
+  sint32 value;			/* Used as connected value in buttons/gates */
   struct oblinkpt *next;
 } oblinkpt;