--- deliantra/server/include/define.h	2007/06/04 13:04:00	1.61
+++ deliantra/server/include/define.h	2007/07/21 14:37:25	1.66
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * 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
  * 
- * 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.
+ * 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 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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>
  */
@@ -75,11 +74,13 @@
 #define MAX_AC			120
 #define MIN_DAM			0
 #define MAX_DAM			200
+#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		4096    /* Used for messages - some can be quite long */
+#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 */
@@ -779,94 +780,6 @@
 #define PREFER_HIGH	1
 #define PREFER_LOW	0
 
-/* Simple function we use below to keep adding to the same string
- * but also make sure we don't overwrite that string.
- */
-static inline void
-safe_strcat (char *dest, const char *orig, int *curlen, int maxlen)
-{
-  if (*curlen == (maxlen - 1))
-    return;
-
-  strncpy (dest + *curlen, orig, maxlen - *curlen - 1);
-  dest[maxlen - 1] = 0;
-  *curlen += strlen (orig);
-
-  if (*curlen > (maxlen - 1))
-    *curlen = maxlen - 1;
-}
-
-
-/* The SAFE versions of these call the safe_strcat function above.
- * Ideally, all functions should use the SAFE functions, but they 
- * require some extra support in the calling function to remain as
- * efficient.
- */
-#define DESCRIBE_ABILITY_SAFE(retbuf, variable, name, len, maxlen) \
-    if(variable) { \
-      int i,j=0; \
-      safe_strcat(retbuf,"(" name ": ", len, maxlen); \
-      for(i=0; i<NROFATTACKS; i++) \
-        if(variable & (1<<i)) { \
-          if (j) \
-            safe_strcat(retbuf,", ", len, maxlen); \
-          else \
-            j = 1; \
-          safe_strcat(retbuf, attacks[i], len, maxlen); \
-        } \
-      safe_strcat(retbuf,")",len,maxlen); \
-    }
-
-
-/* separated this from the common/item.c file. b.t. Dec 1995 */
-
-#define DESCRIBE_ABILITY(retbuf, variable, name) \
-    if(variable) { \
-      int i,j=0; \
-      strcat(retbuf,"(" name ": "); \
-      for(i=0; i<NROFATTACKS; i++) \
-        if(variable & (1<<i)) { \
-          if (j) \
-            strcat(retbuf,", "); \
-          else \
-            j = 1; \
-          strcat(retbuf, attacks[i]); \
-        } \
-      strcat(retbuf,")"); \
-    }
-
-
-#define DESCRIBE_PATH(retbuf, variable, name) \
-    if(variable) { \
-      int i,j=0; \
-      strcat(retbuf,"(" name ": "); \
-      for(i=0; i<NRSPELLPATHS; i++) \
-        if(variable & (1<<i)) { \
-          if (j) \
-            strcat(retbuf,", "); \
-          else \
-            j = 1; \
-          strcat(retbuf, spellpathnames[i]); \
-        } \
-      strcat(retbuf,")"); \
-    }
-
-
-#define DESCRIBE_PATH_SAFE(retbuf, variable, name, len, maxlen) \
-    if(variable) { \
-      int i,j=0; \
-      safe_strcat(retbuf,"(" name ": ", len, maxlen); \
-      for(i=0; i<NRSPELLPATHS; i++) \
-        if(variable & (1<<i)) { \
-          if (j) \
-            safe_strcat(retbuf,", ", len, maxlen); \
-          else \
-            j = 1; \
-          safe_strcat(retbuf, spellpathnames[i], len, maxlen); \
-        } \
-      safe_strcat(retbuf,")", len, maxlen); \
-    }
-
 /* Flags for apply_special() */
 enum apply_flag
 {
@@ -917,8 +830,10 @@
 #define CAN_APPLY_UNAPPLY_MULT	    0x20
 #define CAN_APPLY_UNAPPLY_CHOICE    0x40
 
-/* Cut off point of when an object is put on the active list or not */
-#define MIN_ACTIVE_SPEED	1e-5
+// Cut off point of when an object is put on the active list or not
+// we use 2**-n because that can be represented exactly
+// also make sure that this is a float, not double, constant
+#define MIN_ACTIVE_SPEED	(1.f / 65536.f)
 
 #define RANDOM() (rndm.next () & 0xffffffU)
 #define SRANDOM(xyz) rndm.seed (xyz) //TODO, get rid of