--- deliantra/server/include/define.h	2008/03/15 13:52:37	1.78
+++ deliantra/server/include/define.h	2008/12/23 06:58:23	1.94
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2003-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -77,6 +77,8 @@
 #define MAX_NAME 48
 #define MAX_EXT_TITLE 98
 
+#define ATTUNE_REPELL		16 // levels diff for attune/repell
+
 //TODO: remove all calls to fatal and replace them by cleanup
 #define OUT_OF_MEMORY		0
 #define MAP_ERROR		1
@@ -301,8 +303,8 @@
 #define NUM_SUBTYPES    64
 
 /* Subtypes for BUILDER */
-#define ST_BD_BUILD     1       /* Builds an item */
-#define ST_BD_REMOVE    2     /* Removes an item */
+#define ST_BD_BUILD     1      /* Builds an item */
+#define ST_BD_REMOVE    2      /* Removes an item */
 
 /* Subtypes for MATERIAL */
 #define ST_MAT_FLOOR    1      /* Floor */
@@ -383,9 +385,11 @@
  * 2 spaces, and the entire array (< SIZEOFFREE) is 
  * three spaces
  */
-#define SIZEOFFREE1 8
+#define SIZEOFFREE0  0
+#define SIZEOFFREE1  8
 #define SIZEOFFREE2 24
-#define SIZEOFFREE 49
+#define SIZEOFFREE3 48
+#define SIZEOFFREE  49
 
 #define NROF_SOUNDS (23 + NROFREALSPELLS)      /* Number of sounds */
 
@@ -405,7 +409,7 @@
 #define FLAG_WIZ	 	1       /* Object has special privilegies */
 #define FLAG_REMOVED	 	2       /* Object is not in any map or invenory */
 #define FLAG_FREED	 	3       /* Object is in the list of free objects */
-//#define FLAG_WAS_WIZ	 	4       /* Player was once a wiz */
+#define FLAG_WIZLOOK		4       /* disable los and lighting */
 #define FLAG_APPLIED	 	5       /* Object is ready for use by living */
 #define FLAG_UNPAID	 	6       /* Object hasn't been paid for yet */
 #define FLAG_USE_SHIELD		7	/* Can this creature use a shield? */
@@ -419,6 +423,7 @@
 
 /*#define FLAG_SLOW_MOVE	12*//* Uses the stats.exp/1000 to slow down */
 /*#define FLAG_FLYING		13*//* Not affected by WALK_ON or SLOW_MOVE) */
+#define FLAG_HIDDEN             13      /* hidden monster (not invisible), TODO: used how, what for? TODO: why not saved? */
 
 #define FLAG_MONSTER		14      /* Will attack players */
 #define FLAG_FRIENDLY		15      /* Will help players */
@@ -522,11 +527,7 @@
 #define FLAG_ONE_HIT		97      /* Monster can only hit once before going
                                          * away (replaces ghosthit)
                                          */
-#define FLAG_CLIENT_SENT	98      /* THIS IS A DEBUG FLAG ONLY.  We use it to
-                                         * detect cases were the server is trying
-                                         * to send an upditem when we have not
-                                         * actually sent the item.
-                                         */
+#define FLAG_DEBUG		98      // formerly FLAG_CLIENT_SENT, not used except for debugging
 
 #define FLAG_BERSERK            99     /* monster will attack closest living
                                            object */
@@ -588,8 +589,6 @@
 #define OB_TYPE_MOVE_BLOCK(ob1, type) \
     ((type) && (ob1->move_type & type) == ob1->move_type)
 
-#define SET_GENERATE_TYPE(xyz,va)	(xyz)->stats.sp=(va)
-#define GENERATE_TYPE(xyz)	((xyz)->stats.sp)
 #define GENERATE_SPEED(xyz)	((xyz)->stats.maxsp)    /* if(!RANDOM()%<speed>) */
 
 #define EXIT_PATH(xyz)		(xyz)->slaying
@@ -600,13 +599,19 @@
 #define EXIT_ALT_Y(xyz)		(xyz)->stats.maxsp
 
 /* for use by the lighting code */
-#define MAX_LIGHT_RADII		4       /* max radii for 'light' object, really
+#define MAX_LIGHT_RADIUS	9       /* max radius for 'light' object, really
                                          * large values allow objects that can
                                          * slow down the game */
 #define MAX_DARKNESS		5       /* maximum map darkness, there is no
                                          * practical reason to exceed this */
+#define LOS_MAX                   4     /* max. los value for non-blocked spaces */
+#define LOS_BLOCKED             100     /* fully blocked spaces */
 #define BRIGHTNESS(xyz)		(xyz)->glow_radius>MAX_LIGHT_RADII? \
                                   MAX_LIGHT_RADII:(xyz)->glow_radius;
+// player position in blocked_los code
+#define LOS_X0 (MAP_CLIENT_X / 2 - 1)
+#define LOS_Y0 (MAP_CLIENT_Y / 2 - 1)
+
 
 #define F_BUY		0
 #define F_SELL		1
@@ -761,12 +766,6 @@
 
 #define RANDOM() (rndm.next () & 0xffffffU)
 
-/* Returns the weight of the given object. Note: it does not take the number of
- * items (nrof) into account.
- * (this looks rather bogus, schmorp)
- */
-#define WEIGHT(op) ((op)->nrof ? (op)->weight : (op)->weight + (op)->carrying)
-
 /*
  * Warning!
  * If you add message types here, don't forget
@@ -869,8 +868,8 @@
 
 #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"
+#define SAY_CHANNEL  "say"
+#define CHAT_CHANNEL "chat"
 #define MSG_CHANNEL(name)  ("c/" name) // predefined channel defined in lib/cf.pm %CHANNEL
 
 /* The following are the color flags passed to new_draw_info.
@@ -912,6 +911,7 @@
 #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
+#define NDI_VERBATIM	0x8000  // do not expand cfpod, send text verbatim
 
 #endif /* DEFINE_H */