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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.29 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.38 by root, Wed Dec 27 09:28:01 2006 UTC

 #define MAP_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
+ * tiled maps. There is no requirement that this matches the
  * tiled maps size - it just seemed like a reasonable value.
  * Magic map code now always starts out putting the player in the
  * center of the map - this makes the most sense when dealing
  * with tiled maps.
  * We also figure out the magicmap color to use as we process the
  * map pointers.
  */
 #define MAGIC_MAP_SIZE  50
 #define MAGIC_MAP_HALF  MAGIC_MAP_SIZE/2
-#define MAP_LAYERS		4
+#define MAP_LAYERS		3
-/* This is when the map will reset */
-#define MAP_WHEN_RESET(m)	((m)->reset_time)
-#define MAP_RESET_TIMEOUT(m)	((m)->reset_timeout)
-#define MAP_DIFFICULTY(m)	((m)->difficulty)
-#define MAP_TIMEOUT(m)		((m)->timeout)
-#define MAP_SWAP_TIME(m)	((m)->swap_time)
-#define MAP_OUTDOORS(m)		((m)->outdoor)
-/* mape darkness used to enforce the MAX_DARKNESS value.
- * but IMO, if it is beyond max value, that should be fixed
- * on the map or in the code.
- */
-#define MAP_DARKNESS(m)	   	(m)->darkness
-#define MAP_WIDTH(m)		(m)->width
-#define MAP_HEIGHT(m)		(m)->height
-/* Convenient function - total number of spaces is used
- * in many places.
- */
-#define MAP_SIZE(m)		((m)->width * (m)->height)
-#define MAP_ENTER_X(m)		(m)->enter_x
-#define MAP_ENTER_Y(m)		(m)->enter_y
-#define MAP_TEMP(m)		(m)->temp
-#define MAP_PRESSURE(m)		(m)->pressure
-#define MAP_HUMID(m)		(m)->humid
-#define MAP_WINDSPEED(m)	(m)->windspeed
-#define MAP_WINDDIRECTION(m)	(m)->winddir
-#define MAP_SKYCOND(m)		(m)->sky
-#define MAP_WORLDPARTX(m)	(m)->wpartx
-#define MAP_WORLDPARTY(m)	(m)->wparty
-#define MAP_NOSMOOTH(m)		(m)->nosmooth
 /* options passed to ready_map_name and load_original_map */
-#define MAP_FLUSH	    0x1
+#define MAP_FLUSH	    0x01
-#define MAP_PLAYER_UNIQUE   0x2
+#define MAP_PLAYER_UNIQUE   0x02
-#define MAP_BLOCK	    0x4
+#define MAP_BLOCK	    0x04
-#define MAP_STYLE	    0x8
+#define MAP_STYLE	    0x08
 #define MAP_OVERLAY	    0x10
 /* Values for in_memory below.  Should probably be an enumerations */
 #define MAP_IN_MEMORY 1
 #define MAP_SWAPPED 2
  * really be used, as it is multi tile aware.  However, there are some cases
  * where it is known the map is not tiled or the values are known
  * consistent (eg, op->map, op->x, op->y)
  */
 // all those macros are herewith declared legacy
-#define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags
+#define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
-#define SET_MAP_FLAGS(M,X,Y,C)       (M)->at((X),(Y)).flags = (C)
 #define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
-#define SET_MAP_LIGHT(M,X,Y,L)       (M)->at((X),(Y)).light = (L)
-#define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bottom
+#define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
-#define SET_MAP_OB(M,X,Y,tmp)        (M)->at((X),(Y)).bottom = (tmp)
-#define SET_MAP_TOP(M,X,Y,tmp)       (M)->at((X),(Y)).top = (tmp)
-#define SET_MAP_FACE(M,X,Y,C,L)      (M)->at((X),(Y)).faces[L] = (C)
 #define GET_MAP_FACE(M,X,Y,L)        (M)->at((X),(Y)).faces[L]
-#define SET_MAP_FACE_OBJ(M,X,Y,C,L)  (M)->at((X),(Y)).faces_obj[L] = (C)
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
 #define GET_MAP_MOVE_BLOCK(M,X,Y)    (M)->at((X),(Y)).move_block
-#define SET_MAP_MOVE_BLOCK(M,X,Y,C)  (M)->at((X),(Y)).move_block = (C)
 #define GET_MAP_MOVE_SLOW(M,X,Y)     (M)->at((X),(Y)).move_slow
-#define SET_MAP_MOVE_SLOW(M,X,Y,C)   (M)->at((X),(Y)).move_slow = (C)
 #define GET_MAP_MOVE_ON(M,X,Y)       (M)->at((X),(Y)).move_on
-#define SET_MAP_MOVE_ON(M,X,Y,C)     (M)->at((X),(Y)).move_on = (C)
 #define GET_MAP_MOVE_OFF(M,X,Y)      (M)->at((X),(Y)).move_off
-#define SET_MAP_MOVE_OFF(M,X,Y,C)    (M)->at((X),(Y)).move_off = (C)
 /* You should really know what you are doing before using this - you
  * should almost always be using out_of_map instead, which takes into account
  * map tiling.
  */
                                 * such as: bombs, potion usage, alchemy, spells
                                 * this was introduced to make shops safer
                                 * but is useful in other situations */
 #define P_IS_ALIVE      0x10   /* something alive is on this space */
 #define P_NO_CLERIC     0x20   /* no clerical spells cast here */
-#define P_NEED_UPDATE	0x40   /* this space is out of date */
+#define P_NEED_UPDATE	0x80   /* this space is out of date */
-#define P_NO_ERROR      0x80   /* Purely temporary - if set, update_position
-                                * does not complain if the flags are different.
-                                */
 /* 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
  * This puts it all in one place, and should also make it easier
  * to extend information about a space.
  */
 struct mapspace
 {
-  object *bottom;               /* lowest object on this space */
+  object *bot, *top;            /* lowest/highest object on this space */
-  object *top;                  /* Highest object on this space */
   New_Face *faces[MAP_LAYERS];  /* faces for the 3 layers */
-  object *faces_obj[MAP_LAYERS];        /* face objects for the 3 layers */
+  object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
-  uint8 flags;                  /* flags about this space (see the P_ values above) */
+  uint8 flags_;                 /* flags about this space (see the P_ values above) */
   sint8 light;                  /* How much light this space provides */
-  uint8 move_block;          /* What movement types this space blocks */
+  MoveType move_block;          /* What movement types this space blocks */
-  uint8 move_slow;           /* What movement types this space slows */
+  MoveType move_slow;           /* What movement types this space slows */
-  uint8 move_on;             /* What movement types are activated */
+  MoveType move_on;             /* What movement types are activated */
-  uint8 move_off;            /* What movement types are activated */
+  MoveType move_off;            /* What movement types are activated */
+  void update_ ();
+  void update ()
+  {
+    if (flags_ & P_NEED_UPDATE)
+      update_ ();
+  }
+  uint8 flags ()
+  {
+    update ();
+    return flags_;
+  }
+  // maybe only inline quick flags_ checking?
+  object *player ()
+  {
+    // search from the top, because players are usually on top
+    // make usually == always and this non-amortized O(1)
+    // could gte rid of P_PLAYER, too, then
+    if (flags () & P_PLAYER)
+      for (object *op = top; op; op = op->below)
+        if (op->type == PLAYER)
+          return op;
+    return 0;
+  }
 };
 /*
  * this is an overlay structure of the whole world.  It exists as a simple
  * high level map, which doesn't contain the full data of the underlying map.
  * almost certainly break various features.  You may think
  * it is safe to look at width and height values directly
  * (or even through the macros), but doing so will completely
  * break map tiling.
  */
-ACC_CLASS (maptile)
+INTERFACE_CLASS (maptile)
-struct maptile : zero_initialised, attachable<maptile>
+struct maptile : zero_initialised, attachable
 {
   sint32 ACC (RO, width), ACC (RO, height);        /* Width and height of map. */
   struct mapspace *spaces; /* Array of spaces on this map */
   maptile *ACC (RW, next);        /* Next map, linked list */
   sint16 ACC (RW, pressure);       /* barometric pressure (mb) */
   sint8 ACC (RW, humid);   /* humitidy of this tile */
   sint8 ACC (RW, windspeed);       /* windspeed of this tile */
   sint8 ACC (RW, winddir); /* direction of wind */
   sint8 ACC (RW, sky);     /* sky conditions */
-  int ACC (RW, wpartx), ACC (RW, wparty);  /*Highly fasten conversion between worldmap and weathermap */
+  int ACC (RW, worldpartx), ACC (RW, worldparty);  /*Highly fasten conversion between worldmap and weathermap */
   struct shopitems *shopitems;     /* a semi-colon seperated list of item-types the map's shop will trade in */
   char *ACC (RO, shoprace);        /* the preffered race of the local shopkeeper */
   double ACC (RW, shopgreed);      /* how much our shopkeeper overcharges */
   sint64 ACC (RW, shopmin);        /* minimum price a shop will trade for */
   sint64 ACC (RW, shopmax);        /* maximum price a shop will offer */
   char *tile_path[4];      /* path to adjoining maps */
   maptile *tile_map[4];   /* Next map, linked list */
   char ACC (RW, path)[HUGE_BUF];   /* Filename of the map */
   maptile ();
+  ~maptile ();
+  void do_destroy ();
+  void gather_callbacks (AV *&callbacks, event_type event) const;
-  void allocate ();
+  MTH void allocate ();
+  MTH int size () const { return width * height; }
+  MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
-  mapspace const &at (uint32 x, uint32 y) const { return spaces [x + width * y]; }
+  mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
-  mapspace       &at (uint32 x, uint32 y)       { return spaces [x + width * y]; }
+  mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
 };
+#define for_all_maps(var) for (maptile *var = first_map; var; var = var->next)
 /* 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
   int distance_y;
   int direction;
   object *part;
 };
+inline mapspace &
+object::ms () const
+{
+  return map->at (x, y);
+}
 #endif

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.29 by root, Wed Dec 20 09:14:22 2006 UTC vs. Revision 1.38 by root, Wed Dec 27 09:28:01 2006 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.29 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.38 by root, Wed Dec 27 09:28:01 2006 UTC