--- deliantra/server/include/define.h	2007/07/01 05:00:18	1.62
+++ deliantra/server/include/define.h	2007/08/28 02:37:15	1.70
@@ -74,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 */
@@ -186,13 +188,16 @@
 #define FIREWALL                          62
 #define ANVIL                             63
 #define CHECK_INV                         64 /* by b.t. thomas@nomad.astro.psu.edu */
-#define MOOD_FLOOR                        65 /* by b.t. thomas@nomad.astro.psu.edu
+#define MOOD_FLOOR                        65 /* 
                                               * values of last_sp set how to change:
                                               * 0 = furious, all monsters become aggressive
                                               * 1 = angry, all but friendly become aggressive
                                               * 2 = calm, all aggressive monsters calm down
                                               * 3 = sleep, all monsters fall asleep
-                                              * 4 = charm, monsters become pets */
+                                              * 4 = charm, monsters become pets
+                                              * 5 = destroy monsters
+                                              * 6 = destroy pets / friendlies
+                                              */
 #define EXIT                              66
 #define ENCOUNTER                         67
 #define SHOP_FLOOR                        68
@@ -239,6 +244,7 @@
 
 #define WAND                             109
 
+#define INSCRIBABLE			 110 // inscribable things, st 0 book st 1 spell
 #define SCROLL                           111
 #define DIRECTOR                         112
 #define GIRDLE                           113
@@ -778,94 +784,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
 {
@@ -916,8 +834,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
@@ -1037,5 +957,56 @@
 #define MSG_TYPE_ADMIN_RULES           1
 #define MSG_TYPE_ADMIN_NEWS            2
 
+/**
+ * Maximum distance a player may hear a sound from.
+ * This is only used for new client/server sound.  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
+
+#define LOG_CHANNEL  "log"               // the plain and ugly standard server log
+#define INFO_CHANNEL "info"              // lower_left box
+#define SAY_CHANNEL  "channel-say"
+#define CHAT_CHANNEL "channel-chat"
+
+/* The following are the color flags passed to new_draw_info.
+ *
+ * We also set up some control flags
+ *
+ * NDI = New Draw Info
+ */
+
+/* Color specifications - note these match the order in xutil.c */
+/* Note 2:  Black, the default color, is 0.  Thus, it does not need to
+ * be implicitly specified.
+ */
+#define NDI_BLACK	0
+#define NDI_WHITE	1
+#define NDI_NAVY	2
+#define NDI_RED		3
+#define NDI_ORANGE	4
+#define NDI_BLUE	5	/* Actually, it is Dodger Blue */
+#define NDI_DK_ORANGE	6	/* DarkOrange2 */
+#define NDI_GREEN	7	/* SeaGreen */
+#define NDI_LT_GREEN	8	/* DarkSeaGreen,  which is actually paler */
+                                /* Than seagreen - also background color */
+#define NDI_GREY	9
+#define NDI_BROWN	10	/* Sienna */
+#define NDI_GOLD	11
+#define NDI_TAN		12	/* Khaki */
+
+#define NDI_MAX_COLOR	12	/* Last value in */
+#define NDI_COLOR_MASK	0x1f	/* Gives lots of room for expansion - we are */
+                                /* using an int anyways, so we have the space */
+                                /* to still do all the flags */
+
+#define NDI_REPLY       0x20    // is a direct reply to a user command
+#define NDI_NOCREATE	0x40    // do not create a tba if one doesn't exist
+#define NDI_CLIENT_MASK 0x7f    // what the client is allowed to see
+
+#define NDI_UNIQUE	0x1000	/* Print this out immediately, don't buffer */
+#define NDI_ALL		0x2000	/* Inform all players of this message */
+#define NDI_DEF         0x4000  // ignore colour for channel protocol
+
 #endif /* DEFINE_H */