--- deliantra/server/include/map.h 2006/12/03 01:11:23 1.22 +++ deliantra/server/include/map.h 2006/12/15 20:07:02 1.27 @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The authors can be reached via e-mail at crossfire-devel@real-time.com + The authors can be reached via e-mail at crossfire.de */ /* @@ -231,7 +231,7 @@ * 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 */ -struct region +struct region : zero_initialised { struct region *next; /* pointer to next region, NULL for the last one */ const char *name; /* Shortend name of the region as maps refer to it */ @@ -257,7 +257,6 @@ sint16 jailx, 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 */ @@ -320,13 +319,16 @@ 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 */ - uint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ - uint64 ACC (RW, shopmax); /* maximum price a shop will offer */ + sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ + sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ char *ACC (RO, msg); /* Message map creator may have left */ char *ACC (RO, maplore); /* Map lore information */ 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 (); + void allocate (); }; /* This is used by get_rangevector to determine where the other