[ViewVC] Diff of: cvs/deliantra/server/include/define.h

Comparing deliantra/server/include/define.h (file contents):
Revision 1.85 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.98 by root, Sun Dec 28 16:35:32 2008 UTC

 #define MAX_ANIMATIONS		256
 #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
 #define ARCHTABLE_TOO_SMALL	2 // unused
 #define PU_NOTHING		0x00000000
 #define PU_DEBUG		0x10000000
 #define PU_INHIBIT		0x20000000
 #define PU_STOP			0x40000000
-#define PU_NEWMODE		0x80000000
+#define PU_ENABLE		0x80000000 // used to distinguish value density
 #define PU_RATIO		0x0000000F
 #define PU_FOOD			0x00000010
 #define PU_DRINK		0x00000020
 #define NROF_SOUNDS (23 + NROFREALSPELLS)      /* Number of sounds */
 /*
  * If any FLAG's are added or changed, make sure the flag_names structure in
- * common/loader.l is updated.
+ * common/loader.C is updated.
  */
 /* Basic routines to do above */
 #define SET_FLAG(obj, flg)   (obj)->flag [flg] = 1
 #define CLEAR_FLAG(obj, flg) (obj)->flag [flg] = 0
 #define FLAG_ALIVE	 	0       /* Object can fight (or be fought) */
 #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? */
 #define FLAG_NO_PICK	 	8       /* Object can't be picked up */
 #define FLAG_ANIMATE		11      /* The object looks at archetype for faces */
 /*#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 */
 #define FLAG_GENERATOR		16      /* Will generate type ob->stats.food */
 #define FLAG_IS_THROWN		17      /* Object is designed to be thrown. */
 #define FLAG_NO_STEAL		96      /* Item can't be stolen */
 #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
+#define FLAG_DEBUG		98      // formerly FLAG_CLIENT_SENT, not used except for debugging
-//                                         * detect cases were the server is trying
-//                                         * to send an upditem when we have not
-//                                         * actually sent the item.
-//                                         */
 #define FLAG_BERSERK            99     /* monster will attack closest living
                                            object */
 #define FLAG_NEUTRAL            100    /* monster is from type neutral */
 #define FLAG_NO_ATTACK          101    /* monster doesn't attack */
 #define MOVE_FLY_HIGH	0x04    /* High flying object */
 #define	MOVE_FLYING	0x06
                                 /* Combo of fly_low and fly_high */
 #define MOVE_SWIM	0x08    /* Swimming object */
 #define MOVE_BOAT	0x10    /* Boats/sailing */
-#define MOVE_SHIP	0x20    /* boats suitable fro oceans */
+#define MOVE_SHIP	0x20    /* boats suitable for oceans */
 #define MOVE_ALL	0x3f    /* Mask of all movement types */
 /* typdef here to define type large enough to hold bitmask of
  * all movement types.  Make one declaration so easy to update.
 #define EXIT_Y(xyz)		(xyz)->stats.sp
 #define EXIT_ALT_X(xyz)		(xyz)->stats.maxhp
 #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
 #define F_TRUE		2       /* True value of item, unadjusted */
 #define F_NO_BARGAIN	4       /* combine with F_BUY or F_SELL to disable bargaining calc */
 /*                                                      CIRCLE1 = 32          */
 /*                                              +       DISTATT = 1           */
 /*                                      -------------------                   */
 /*                      attack_movement = 33                                  */
 /******************************************************************************/
-#define DISTATT  1             /* move toward a player if far, but mantain some space,  */
+#define DISTATT  1 /* move toward a player if far, but mantain some space,  */
                    /* attack from a distance - good for missile users only  */
-#define RUNATT   2             /* run but attack if player catches up to object         */
+#define RUNATT   2 /* run but attack if player catches up to object         */
-#define HITRUN   3             /* run to then hit player then run away cyclicly         */
+#define HITRUN   3 /* run to then hit player then run away cyclicly         */
-#define WAITATT  4             /* wait for player to approach then hit, move if hit     */
+#define WAITATT  4 /* wait for player to approach then hit, move if hit     */
-#define RUSH     5             /* Rush toward player blindly, similiar to dumb monster  */
+#define RUSH     5 /* Rush toward player blindly, similiar to dumb monster  */
-#define ALLRUN   6             /* always run never attack good for sim. of weak player  */
+#define ALLRUN   6 /* always run never attack good for sim. of weak player  */
-#define DISTHIT  7             /* attack from a distance if hit as recommended by Frank */
+#define DISTHIT  7 /* attack from a distance if hit as recommended by Frank */
-#define WAIT2    8             /* monster does not try to move towards player if far    */
+#define WAIT2    8 /* monster does not try to move towards player if far    */
                    /* maintains comfortable distance                        */
-#define PETMOVE 16             /* if the upper four bits of attack_movement             */
+#define PETMOVE 16 /* if the upper four bits of attack_movement             */
                    /* are set to this number, the monster follows a player  */
                    /* until the owner calls it back or off                  */
                    /* player followed denoted by 0b->owner                  */
                    /* the monster will try to attack whatever the player is */
                    /* attacking, and will continue to do so until the owner */
                    /* calls off the monster - a key command will be         */
                    /* inserted to do so                                     */
-#define CIRCLE1 32             /* if the upper four bits of move_type / attack_movement */
+#define CIRCLE1 32 /* if the upper four bits of move_type / attack_movement */
                    /* are set to this number, the monster will move in a    */
                    /* circle until it is attacked, or the enemy field is    */
                    /* set, this is good for non-aggressive monsters and NPC */
-#define CIRCLE2 48             /* same as above but a larger circle is used             */
+#define CIRCLE2 48 /* same as above but a larger circle is used             */
-#define PACEH   64             /* The Monster will pace back and forth until attacked   */
+#define PACEH   64 /* The Monster will pace back and forth until attacked   */
                    /* this is HORIZONTAL movement                           */
-#define PACEH2  80             /* the monster will pace as above but the length of the  */
+#define PACEH2  80 /* the monster will pace as above but the length of the  */
                    /* pace area is longer and the monster stops before      */
                    /* changing directions                                   */
                    /* this is HORIZONTAL movement                           */
-#define RANDO   96             /* the monster will go in a random direction until       */
+#define RANDO   96 /* the monster will go in a random direction until       */
                    /* it is stopped by an obstacle, then it chooses another */
                    /* direction.                                            */
-#define RANDO2 112             /* constantly move in a different random direction       */
+#define RANDO2 112 /* constantly move in a different random direction       */
-#define PACEV  128             /* The Monster will pace back and forth until attacked   */
+#define PACEV  128 /* The Monster will pace back and forth until attacked   */
                    /* this is VERTICAL movement                             */
-#define PACEV2 144             /* the monster will pace as above but the length of the  */
+#define PACEV2 144 /* the monster will pace as above but the length of the  */
                    /* pace area is longer and the monster stops before      */
                    /* changing directions                                   */
                    /* this is VERTICAL movement                             */
-#define LO4     15             /* bitmasks for upper and lower 4 bits from 8 bit fields */
+#define LO4     15 /* bitmasks for upper and lower 4 bits from 8 bit fields */
 #define HI4    240
 #define BLANK_FACE_NAME "blank.x11"
 #define EMPTY_FACE_NAME "empty.x11"
 // 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)
 /*
  * Warning!
  * If you add message types here, don't forget
  * to keep the client up to date too!
  */
  */
 #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 SAY_CHANNEL  "say"
-#define CHAT_CHANNEL "channel-chat"
+#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.
  *
  * We also set up some control flags
 #define NDI_CLIENT_MASK 0xff    // 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
+#define NDI_VERBATIM	0x8000  // do not expand cfpod, send text verbatim
 #endif /* DEFINE_H */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/define.h (file contents): Revision 1.85 by root, Sun Aug 31 02:01:41 2008 UTC vs. Revision 1.98 by root, Sun Dec 28 16:35:32 2008 UTC

Diff Legend

Comparing deliantra/server/include/define.h (file contents):
Revision 1.85 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.98 by root, Sun Dec 28 16:35:32 2008 UTC