--- deliantra/server/include/traits.h	2006/08/31 17:54:14	1.2
+++ deliantra/server/include/traits.h	2006/12/20 09:14:22	1.8
@@ -1,14 +1,15 @@
 #ifndef TRAITS_H__
 #define TRAITS_H__
 
-struct pl;
+struct client_container;
+struct client;
+struct player;
 struct object;
-struct mapstruct;
-struct archt;
+struct maptile;
+struct archetype;
 struct region;
 struct party;
-struct mapstruct;
-struct treasureliststruct;
+struct treasurelist;
 
 // could have used templates, but a more traditional C api
 // uses more explicit typing which is ok for this purpose.
@@ -23,6 +24,7 @@
   DT_DATA,    // string + length
   DT_OBJECT,
   DT_MAP,
+  DT_CLIENT,
   DT_PLAYER,
   DT_ARCH,
   DT_PARTY,
@@ -36,57 +38,62 @@
 
 template<>
 struct cftype<int> {
-   static const data_type dt = DT_INT;
+  static const data_type dt = DT_INT;
 };
 
 template<>
 struct cftype<sint64> {
-   static const data_type dt = DT_INT64;
+  static const data_type dt = DT_INT64;
 };
 
 template<>
 struct cftype<double> {
-   static const data_type dt = DT_DOUBLE;
+  static const data_type dt = DT_DOUBLE;
 };
 
 template<>
 struct cftype<const char *> {
-   static const data_type dt = DT_STRING;
+  static const data_type dt = DT_STRING;
 };
 
 template<>
 struct cftype<object> {
-   static const data_type dt = DT_OBJECT;
+  static const data_type dt = DT_OBJECT;
 };
 
 template<>
-struct cftype<struct pl> {
-   static const data_type dt = DT_PLAYER;
+struct cftype<client> {
+  static const data_type dt = DT_CLIENT;
 };
 
 template<>
-struct cftype<mapstruct> {
-   static const data_type dt = DT_MAP;
+struct cftype<player> {
+  static const data_type dt = DT_PLAYER;
 };
 
 template<>
-struct cftype<archt> {
-   static const data_type dt = DT_ARCH;
+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;
+  static const data_type dt = DT_PARTY;
 };
 
 template<>
 struct cftype<region> {
-   static const data_type dt = DT_REGION;
+  static const data_type dt = DT_REGION;
 };
 
 template<>
-struct cftype<treasureliststruct> {
-   static const data_type dt = DT_REGION;
+struct cftype<treasurelist> {
+  static const data_type dt = DT_REGION;
 };
 
 #endif