--- deliantra/server/include/define.h	2009/01/08 03:03:24	1.99
+++ deliantra/server/include/define.h	2009/10/15 21:59:48	1.105
@@ -5,18 +5,19 @@
  * Copyright (©) 2003-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and 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 <support@deliantra.net>
  */
@@ -64,18 +65,9 @@
 #define MIN_DIGESTION		-35
 #define MAX_DIGESTION		70
 
-#define MAX_BUF			1024
-                                        /* Used for all kinds of things */
-#define VERY_BIG_BUF		2048
-#define HUGE_BUF		10240   /* Used for messages - some can be quite long */
-#define SOCKET_BUFLEN		4096    /* Max length a packet could be */
-
-#define FONTSIZE		3000    /* Max chars in font */
-
-#define MAX_ANIMATIONS		256
+#define MAX_BUF			1024    /* Used for all kinds of things */
 
 #define MAX_NAME 48
-#define MAX_EXT_TITLE 98
 
 #define ATTUNE_REPELL		16 // levels diff for attune/repell
 
@@ -121,7 +113,7 @@
 #define ARMOUR                            16
 #define PEDESTAL                          17
 #define ALTAR                             18
-//19
+#define T_MATCH                           19
 #define LOCKED_DOOR                       20
 #define SPECIAL_KEY                       21
 #define MAP                               22
@@ -207,7 +199,7 @@
                                                  on chairs, we create a new type and remove all
                                                  chairs from here. */
 //80
-//81
+#define TORCH                             81  /* a torch */
 #define LAMP                              82  /* a lamp */
 #define DUPLICATOR                        83  /* duplicator/multiplier object */
 //84
@@ -219,7 +211,7 @@
 #define SPINNER                           90
 #define GATE                              91
 #define BUTTON                            92
-#define CF_HANDLE                         93
+#define T_HANDLE                          93
 #define HOLE                              94
 #define TRAPDOOR                          95
 //96
@@ -860,7 +852,7 @@
 
 /**
  * Maximum distance a player may hear a sound from.
- * This is only used for new client/server sound.  If the sound source
+ * This is only used for client/server sound and say. If the sound source
  * on the map is farther away than this, we don't sent it to the client.
  */
 #define MAX_SOUND_DISTANCE 16