--- deliantra/server/include/define.h	2008/12/23 06:58:23	1.94
+++ deliantra/server/include/define.h	2008/12/28 06:59:26	1.96
@@ -395,7 +395,7 @@
 
 /* 
  * 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 */
@@ -565,7 +565,7 @@
                                 /* 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 */
 
@@ -657,17 +657,18 @@
 /*                                      -------------------                   */
 /*                      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 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 RUSH     5             /* Rush toward player blindly, similiar to dumb monster  */
-#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 WAIT2    8             /* monster does not try to move towards player if far    */
+#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 WAITATT  4 /* wait for player to approach then hit, move if hit     */
+#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 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    */
                    /* 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                  */
@@ -675,28 +676,28 @@
                    /* 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 PACEH   64             /* The Monster will pace back and forth until attacked   */
+#define CIRCLE2 48 /* same as above but a larger circle is used             */
+#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 PACEV  128             /* The Monster will pace back and forth until attacked   */
+#define RANDO2 112 /* constantly move in a different random direction       */
+#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"
@@ -764,8 +765,6 @@
 // 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