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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.115 by root, Wed Nov 4 14:45:30 2009 UTC vs.
Revision 1.118 by root, Sun Nov 8 16:13:45 2009 UTC

 #ifndef MAP_H
 #define MAP_H
 #include <tr1/unordered_map>
+//+GPL
 #include "region.h"
 #include "cfperl.h"
 /* We set this size - this is to make magic map work properly on
  * tiled maps. There is no requirement that this matches the
 /* These are used in the MapLook flags element.  They are not used in
  * in the object flags structure.
  */
 #define P_BLOCKSVIEW	0x01
 #define P_NO_MAGIC      0x02   /* Spells (some) can't pass this object */
-#define P_PLAYER        0x04   /* a player (or something seeing these objects) is on this mapspace */
+#define P_NO_CLERIC     0x04   /* no clerical spells cast here */
 #define	P_SAFE          0x08   /* If this is set the map tile is a safe space,
                                 * that means, nothing harmful can be done,
                                 * such as: bombs, potion usage, alchemy, spells
                                 * this was introduced to make shops safer
                                 * but is useful in other situations */
+#define P_PLAYER        0x10   /* a player (or something seeing these objects) is on this mapspace */
-#define P_IS_ALIVE      0x10   /* something alive is on this space */
+#define P_IS_ALIVE      0x20   /* something alive is on this space */
-#define P_NO_CLERIC     0x20   /* no clerical spells cast here */
-#define P_UPTODATE	0x80   /* this space is up to date */
+#define P_UPTODATE	0x80   // this space is up to date
 /* The following two values are not stored in the MapLook flags, but instead
  * used in the get_map_flags value - that function is used to return
  * the flag value, as well as other conditions - using a more general
  * function that does more of the work can hopefully be used to replace
  */
 INTERFACE_CLASS (mapspace)
 struct mapspace
 {
   object *ACC (RW, bot);
-  object *ACC (RW, top);        /* lowest/highest object on this space */
+  object *ACC (RW, top);                /* lowest/highest object on this space */
   object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
-  uint32_t smell;			// the last count a player was seen here, or 0
-  static uint32_t smellcount;           // global smell counter
-  uint8 flags_;                 /* flags about this space (see the P_ values above) */
+  uint8 flags_;                         /* flags about this space (see the P_ values above) */
-  sint8 ACC (RW, light);                  /* How much light this space provides */
+  sint8 ACC (RW, light);                /* How much light this space provides */
-  MoveType ACC (RW, move_block);          /* What movement types this space blocks */
+  MoveType ACC (RW, move_block);        /* What movement types this space blocks */
-  MoveType ACC (RW, move_slow);           /* What movement types this space slows */
+  MoveType ACC (RW, move_slow);         /* What movement types this space slows */
-  MoveType ACC (RW, move_on);             /* What movement types are activated */
+  MoveType ACC (RW, move_on);           /* What movement types are activated */
-  MoveType ACC (RW, move_off);            /* What movement types are activated */
+  MoveType ACC (RW, move_off);          /* What movement types are activated */
+  uint16_t ACC (RW, nrof_);             // saturates at 64k
+  uint32_t ACC (RW, volume_);           // ~dm³ (not cm³) (factor is actually 1024)
+  uint32_t ACC (RW, smell);		// the last count a player was seen here, or 0
+  static uint32_t ACC (RW, smellcount); // global smell counter
+  uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
+//-GPL
   void update_ ();
   MTH void update ()
   {
-    if (expect_false (!(flags_ & P_UPTODATE)))
+    // we take advantage of the fact that 0x80 is the sign bit
+    // to generate more efficient code on many cpus
+    assert (sint8 (P_UPTODATE) < 0);
+    assert (sint8 (-1 & ~P_UPTODATE) >= 0);
+    if (expect_false (sint8 (flags_) >= 0))
       update_ ();
+    // must be true by now
+    assume (sint8 (flags_) < 0);
+    assume (flags_ & P_UPTODATE);
   }
   MTH uint8 flags ()
   {
     update ();
       op = 0;
     return op;
   }
+  MTH uint32 nrof ()
+  {
+    update ();
+    return nrof_;
+  }
   // return the item volume on this mapspace in cm³
-  MTH uint64 volume () const;
+  MTH uint64 volume ()
+  {
+    update ();
+    return volume_ * 1024;
+  }
   bool blocks (MoveType mt) const
   {
     return move_block && (mt & move_block) == mt;
   }
   maptile *m;
   int x0, y0;
   int x1, y1;
   int dx, dy; // offset to go from local coordinates to original tile */
 };
+//+GPL
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
   const char *name_pl;          /* plural name */
   shstr ACC (RW, tile_path[4]);      /* path to adjoining maps */
   maptile *ACC (RW, tile_map[4]);   /* Next map, linked list */
   shstr ACC (RW, path);   /* Filename of the map */
   int ACC (RW, max_nrof);                 // maximum nrof of any single item on a mapspace
   uint64 ACC (RW, max_volume);            // maximum volume for all items on a mapspace
+  int ACC (RW, max_items);                // maximum number of items on a mapspace
+//-GPL
   // the maptile:: is neccessary here for the perl interface to work
   MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
   {
     return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
   // a 0 map pointer.
   // the array will be stored in a static memory area,
   // so recursion is not atm. supported
   maprect *split_to_tiles (int x0, int y0, int x1, int y1);
 };
+//+GPL
 /* This is used by get_rangevector to determine where the other
  * creature is.  get_rangevector takes into account map tiling,
  * so you just can not look the the map coordinates and get the
  * righte value.  distance_x/y are distance away, which
   return
     (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
     || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
 }
 // comaptibility cruft end
+//-GPL
 inline mapspace &
 object::ms () const
 {
   return map->at (x, y);

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.115 by root, Wed Nov 4 14:45:30 2009 UTC vs. Revision 1.118 by root, Sun Nov 8 16:13:45 2009 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.115 by root, Wed Nov 4 14:45:30 2009 UTC vs.
Revision 1.118 by root, Sun Nov 8 16:13:45 2009 UTC