--- deliantra/server/include/traits.h	2007/07/01 05:00:18	1.17
+++ deliantra/server/include/traits.h	2007/11/08 19:43:25	1.20
@@ -1,9 +1,9 @@
 /*
- * 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
  * 
- * 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.
@@ -16,7 +16,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 TRAITS_H__
@@ -38,6 +38,11 @@
 const int sint32_digits = 11; // number of digits an sint32 uses max.
 const int sint64_digits = 20;
 
+typedef char *octet_string;
+typedef char *utf8_string;
+typedef const char *const_octet_string;
+typedef const char *const_utf8_string;
+
 struct client_container;
 struct client;
 struct player;
@@ -50,6 +55,10 @@
 struct treasurelist;
 struct random_map_params;
 struct faceinfo;
+struct mapxy;
+
+typedef object  object_ornull;
+typedef maptile maptile_ornull;
 
 // could have used templates, but a more traditional C api
 // uses more explicit typing which is ok for this purpose.