--- deliantra/server/include/traits.h	2006/08/31 17:54:14	1.2
+++ deliantra/server/include/traits.h	2007/01/13 23:06:13	1.12
@@ -1,14 +1,28 @@
 #ifndef TRAITS_H__
 #define TRAITS_H__
 
-struct pl;
+#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 mapstruct;
-struct archt;
+struct maptile;
+struct mapspace;
+struct archetype;
 struct region;
 struct party;
-struct mapstruct;
-struct treasureliststruct;
+struct treasurelist;
+struct random_map_params;
 
 // could have used templates, but a more traditional C api
 // uses more explicit typing which is ok for this purpose.
@@ -21,8 +35,10 @@
   DT_DOUBLE,
   DT_STRING,  // 0-terminated string
   DT_DATA,    // string + length
+  DT_ATTACHABLE, // will go
   DT_OBJECT,
   DT_MAP,
+  DT_CLIENT,
   DT_PLAYER,
   DT_ARCH,
   DT_PARTY,
@@ -31,63 +47,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<struct pl> {
-   static const data_type dt = DT_PLAYER;
-};
-
-template<>
-struct cftype<mapstruct> {
-   static const data_type dt = DT_MAP;
-};
-
-template<>
-struct cftype<archt> {
-   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<treasureliststruct> {
-   static const data_type dt = DT_REGION;
-};
-
 #endif