--- deliantra/server/include/traits.h	2006/12/15 19:59:20	1.6
+++ deliantra/server/include/traits.h	2006/12/30 10:16:10	1.11
@@ -1,10 +1,23 @@
 #ifndef TRAITS_H__
 #define TRAITS_H__
 
+#include <inttypes.h>
+
+typedef int8_t		sint8;
+typedef uint8_t		uint8;
+typedef int16_t		sint16;
+typedef uint16_t	uint16;
+typedef int32_t		sint32;
+typedef uint32_t	uint32;
+typedef int64_t		sint64;
+typedef uint64_t	uint64;
+
+struct client_container;
 struct client;
 struct player;
 struct object;
 struct maptile;
+struct mapspace;
 struct archetype;
 struct region;
 struct party;
@@ -21,9 +34,10 @@
   DT_DOUBLE,
   DT_STRING,  // 0-terminated string
   DT_DATA,    // string + length
+  DT_ATTACHABLE, // will go
   DT_OBJECT,
   DT_MAP,
-  DT_SOCKET,
+  DT_CLIENT,
   DT_PLAYER,
   DT_ARCH,
   DT_PARTY,
@@ -32,68 +46,5 @@
   NUM_DATA_TYPES
 };
 
-template<typename T>
-struct cftype { };
-
-template<>
-struct cftype<int> {
-  static const data_type dt = DT_INT;
-};
-
-template<>
-struct cftype<sint64> {
-  static const data_type dt = DT_INT64;
-};
-
-template<>
-struct cftype<double> {
-  static const data_type dt = DT_DOUBLE;
-};
-
-template<>
-struct cftype<const char *> {
-  static const data_type dt = DT_STRING;
-};
-
-template<>
-struct cftype<object> {
-  static const data_type dt = DT_OBJECT;
-};
-
-template<>
-struct cftype<client> {
-  static const data_type dt = DT_SOCKET;
-};
-
-template<>
-struct cftype<player> {
-  static const data_type dt = DT_PLAYER;
-};
-
-template<>
-struct cftype<maptile> {
-  static const data_type dt = DT_MAP;
-};
-
-template<>
-struct cftype<archetype> {
-  static const data_type dt = DT_ARCH;
-};
-
-template<>
-struct cftype<party> {
-  static const data_type dt = DT_PARTY;
-};
-
-template<>
-struct cftype<region> {
-  static const data_type dt = DT_REGION;
-};
-
-template<>
-struct cftype<treasurelist> {
-  static const data_type dt = DT_REGION;
-};
-
 #endif