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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.41 by root, Sat Dec 30 12:38:18 2006 UTC vs.
Revision 1.47 by root, Thu Jan 4 16:19:32 2007 UTC

 #define MAP_BLOCK	    0x04
 #define MAP_STYLE	    0x08
 #define MAP_OVERLAY	    0x10
 /* Values for in_memory below.  Should probably be an enumerations */
-#define MAP_IN_MEMORY 1
+enum {
-#define MAP_SWAPPED 2
+  MAP_IN_MEMORY,
-#define MAP_LOADING 3
+  MAP_SWAPPED,
-#define MAP_SAVING 4
+  MAP_LOADING,
+  MAP_SAVING,
+};
 /* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
  * 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)
                                 * 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	0x80   /* this space is out of 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
   MoveType move_off;            /* What movement types are activated */
   void update_ ();
   void update ()
   {
-    if (flags_ & P_NEED_UPDATE)
+    if (!(flags_ & P_UPTODATE))
       update_ ();
   }
   uint8 flags ()
   {
 /*
  * Each map is in a given region of the game world and links to a region definiton, so
  * they have to appear here in the headers, before the mapdef
  */
+INTERFACE_CLASS (region)
 struct region : zero_initialised
 {
-  struct region *next;          /* pointer to next region, NULL for the last one */
+  struct region *ACC (RW, next);          /* pointer to next region, NULL for the last one */
-  const char *name;             /* Shortend name of the region as maps refer to it */
+  char *ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  const char *parent_name;      /*
+  char *ACC (RW, parent_name);            /*
-                                 * So that parent and child regions can be defined in
+                                           * So that parent and child regions can be defined in
-                                 * any order, we keep hold of the parent_name during
+                                           * any order, we keep hold of the parent_name during
-                                 * initialisation, and the children get assigned to their
+                                           * initialisation, and the children get assigned to their
-                                 * parents later. (before runtime on the server though)
+                                           * parents later. (before runtime on the server though)
-                                 * nothing outside the init code should ever use this value.
+                                           * nothing outside the init code should ever use this value.
-                                 */
+                                           */
-  struct region *parent;        /*
+  struct region *ACC (RW, parent);        /*
-                                 * Pointer to the region that is a parent of the current
+                                           * Pointer to the region that is a parent of the current
-                                 * region, if a value isn't defined in the current region
+                                           * region, if a value isn't defined in the current region
-                                 * we traverse this series of pointers until it is.
+                                           * we traverse this series of pointers until it is.
-                                 */
+                                           */
-  const char *longname;         /* Official title of the region, this might be defined
+  char *ACC (RW, longname);               /* Official title of the region, this might be defined
-                                 * to be the same as name*/
+                                           * to be the same as name*/
-  const char *msg;              /* the description of the region */
+  char *ACC (RW, msg);                    /* the description of the region */
-  uint32 counter;               /* A generic counter for holding temporary data. */
+  uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
-  sint8 fallback;               /* whether, in the event of a region not existing,
+  sint8 ACC (RW, fallback);               /* whether, in the event of a region not existing,
-                                 * this should be the one we fall back on as the default */
+                                           * this should be the one we fall back on as the default */
-  char *jailmap;                /*where a player that is arrested in this region should be imprisoned. */
+  char *ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
-  sint16 jailx, jaily;          /* The coodinates in jailmap to which the player should be sent. */
+  sint16 ACC (RW, jailx), ACC (RW, jaily);          /* The coodinates in jailmap to which the player should be sent. */
 };
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
                                     * the region */
   double ACC (RW, reset_time);
   uint32 ACC (RW, reset_timeout);  /* How many seconds must elapse before this map
                                     * should be reset
                                     */
+  bool ACC (RW, dirty);            /* if true, something was inserted or removed */
   bool ACC (RW, fixed_resettime);  /* if true, reset time is not affected by
                                     * players entering/exiting map
                                     */
   sint32 ACC (RW, timeout);        /* swapout is set to this */
   sint32 ACC (RW, swap_time);      /* When it reaches 0, the map will be swapped out */
   uint32 ACC (RW, in_memory);      /* If not true, the map has been freed and must
                                     * be loaded before used.  The map,omap and map_ob
                                     * arrays will be allocated when the map is loaded */
-  sint16 ACC (RW, players);        /* How many players are on this map right now */
+  sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
   shstr ACC (RW, maplore); /* Map lore information */
   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 */
-//  /*
-//   * Makes sure the given map is loaded and swapped in.
-//   * name is path name of the map.
-//   * flags meaning:
-//   * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
-//   *   and don't do unique items or the like.
-//   * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
-//   *   dont do any more name translation on it.
-//   *
-//   * Returns a pointer to the given map.
-//   */
-//  static maptile *ready (const char *name, int flags);
   MTH void activate ();
   MTH void deactivate ();
   // allocates all (empty) mapspace
   MTH void alloc ();
   MTH int change_map_light (int change);
   static void change_all_map_light (int change); //PERL
   MTH void set_darkness_map ();
   MTH int estimate_difficulty () const;
+  // set the given flag on all objects in the map
+  MTH void set_object_flag (int flag, int value = 1);
   MTH void link_multipart_objects ();
   MTH void clear_unique_items ();
   MTH void clear_header ();
   MTH void clear_links_to (maptile *m);
   MTH int size () const { return width * height; }
   MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
-  static maptile *find_map (const char *path, maptile *origin);//PERL
+  MTH void touch () { last_access = runtime; }
-  // load a map relative to this one
+  // find the map that is at coordinate x|y relative to this map
-  maptile *find_map (const char *path)
+  // TODO: need a better way than passing by reference
+  // TODO: make perl interface
+  maptile *xy_find (sint16 &x, sint16 &y);
+  // like xy_find, but also loads the map
+  maptile *xy_load (sint16 &x, sint16 &y);
+  void do_load_sync ();//PERL
+  // make sure the map is loaded
+  MTH void load_sync ()
   {
-    return find_map (path, this);
+    if (!spaces)
+      do_load_sync ();
   }
-  // customise this map for the given player
+  static maptile *find_sync (const char *path, maptile *original = 0);//PERL
-  // might return this or a completely new map
-  maptile *customise_for (object *op);
-  // make sure the map is loaded
-  MTH bool load ()
-  {
-    if (in_memory != MAP_IN_MEMORY)
-      do_load ();
-    return spaces;
-  }
   static void emergency_save ();//PERL
   mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
   mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
-private:
-  void do_load ();//PERL
 };
 /* 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

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.41 by root, Sat Dec 30 12:38:18 2006 UTC vs. Revision 1.47 by root, Thu Jan 4 16:19:32 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.41 by root, Sat Dec 30 12:38:18 2006 UTC vs.
Revision 1.47 by root, Thu Jan 4 16:19:32 2007 UTC