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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.64 by root, Thu Feb 1 19:15:39 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

 // all those macros are herewith declared legacy
 #define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
 #define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #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 GET_MAP_FACE(M,X,Y,L)        (M)->at((X),(Y)).faces[L]
 #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 GET_MAP_MOVE_SLOW(M,X,Y)     (M)->at((X),(Y)).move_slow
 #define GET_MAP_MOVE_ON(M,X,Y)       (M)->at((X),(Y)).move_on
 #define GET_MAP_MOVE_OFF(M,X,Y)      (M)->at((X),(Y)).move_off
  * to extend information about a space.
  */
 struct mapspace
 {
   object *bot, *top;            /* lowest/highest object on this space */
-  facetile *faces[MAP_LAYERS];  /* faces 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) */
   sint8 light;                  /* How much light this space provides */
   MoveType move_block;          /* What movement types this space blocks */
   MoveType move_slow;           /* What movement types this space slows */
         if (op->type == PLAYER)
           return op;
     return 0;
   }
+  // return the item volume on this mapspace in cm³
+  uint64 volume () const;
 };
 /*
  * 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
 {
   shstr ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
+  shstr ACC (RW, match);                  // a perl regex that matches map paths
-  region *ACC (RW, parent);        /*
+  region *ACC (RW, parent);        	  /*
                                            * Pointer to the region that is a parent of the current
                                            * region, if a value isn't defined in the current region
                                            * we traverse this series of pointers until it is.
                                            */
   shstr ACC (RW, longname);               /* Official title of the region, this might be defined
                                            * to be the same as name*/
   shstr ACC (RW, msg);                    /* the description of the region */
   shstr ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
   int ACC (RW, index);
   uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
-  sint16 ACC (RW, jailx), ACC (RW, 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. */
-  bool ACC (RW, fallback);               /* whether, in the event of a region not existing,
+  bool ACC (RW, fallback);                /* whether, in the event of a region not existing,
                                            * this should be the one we fall back on as the default */
   static region *default_region ();
   static region *find (const char *name);
   static region *find_fuzzy (const char *name);
+  static region *read (object_thawer &f);
 };
 typedef object_vector<region, &region::index> regionvec;
 extern regionvec regions;
 #define for_all_regions(var)			\
-  for (int _i = 0; _i < regions.size (); ++_i)	\
+  for (unsigned _i = 0; _i < regions.size (); ++_i)	\
     declvar (region *, var, regions [_i])
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
   shstr ACC (RW, msg);     /* Message map creator may have left */
   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 */
+  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
   MTH void activate ();
   MTH void deactivate ();
   // allocates all (empty) mapspace
   }
   void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
   bool generate_random_map (random_map_params *RP);
+  static maptile *find_async (const char *path, maptile *original = 0);//PERL
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
-  // async prefetch
+  static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
-  static maptile *find_async (const char *path, maptile *original = 0);//PERL
+  MTH object *pick_random_object () const;
   mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
   mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
 };

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.64 by root, Thu Feb 1 19:15:39 2007 UTC vs. Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.64 by root, Thu Feb 1 19:15:39 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC