--- deliantra/server/include/define.h	2007/05/17 14:14:55	1.57
+++ deliantra/server/include/define.h	2007/06/04 13:04:00	1.61
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2003-2005 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2003-2005,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT 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 2 of the License, or (at your option)
+ * any later version.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /* This file is best viewed with a window width of about 100 character */
@@ -52,10 +52,8 @@
 # define MAX(x,y) max (x, y)
 #endif
 
-/*NAME_MAX used by random maps may not be defined on pure ansi systems*/
-#ifndef NAME_MAX
-# define NAME_MAX 255
-#endif
+// maximum length of an object name in the protocol
+#define NAME_LEN 127
 
 /* MAX3 is basically like MAX, but instead does 3 values. */
 #ifndef MAX3
@@ -276,6 +274,8 @@
 #define SAFE_GROUND                      165 /* This is a safe ground, means that neither bombs,
                                                 potions, alchemy, or magic works here (elmex) */
 
+#define NUM_TYPES                        166 // must be max(type) + 1
+
 /* DEAD TYPES: */
 //#define FBULLET                         10
 //#define FBALL                           11
@@ -870,18 +870,18 @@
 /* Flags for apply_special() */
 enum apply_flag
 {
-  /* Basic flags, always use one of these */
-  AP_NULL = 0,
-  AP_APPLY = 1,
+  /* Basic flags/mode, always use one of these */
+  AP_TOGGLE  = 0,
+  AP_APPLY   = 1,
   AP_UNAPPLY = 2,
 
-  AP_BASIC_FLAGS = 15,
+  AP_BASIC_FLAGS = 0x0f,
 
   /* Optional flags, for bitwise or with a basic flag */
-  AP_NO_MERGE = 16,
-  AP_IGNORE_CURSE = 32,
-  AP_PRINT = 64                 /* Print what to do, don't actually do it */
-    /* Note this is supported in all the functions */
+  AP_NO_MERGE     = 0x10,
+  AP_IGNORE_CURSE = 0x20,
+  AP_PRINT        = 0x40,                 /* Print what to do, don't actually do it */
+  AP_NO_READY     = 0x80,                 // do not ready skill associated with skilltool.
 };
 
 /* Bitmask values for 'can_apply_object()' return values.