ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.23 by root, Sun Dec 3 02:04:57 2006 UTC vs.
Revision 1.27 by root, Fri Dec 15 20:07:02 2006 UTC

16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at crossfire.de
22*/ 22*/
23 23
24/* 24/*
25 * The maptile is allocated each time a new map is opened. 25 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 26 * It contains pointers (very indirectly) to all objects on the map.
229 229
230/* 230/*
231 * Each map is in a given region of the game world and links to a region definiton, so 231 * Each map is in a given region of the game world and links to a region definiton, so
232 * they have to appear here in the headers, before the mapdef 232 * they have to appear here in the headers, before the mapdef
233 */ 233 */
234struct region 234struct region : zero_initialised
235{ 235{
236 struct region *next; /* pointer to next region, NULL for the last one */ 236 struct region *next; /* pointer to next region, NULL for the last one */
237 const char *name; /* Shortend name of the region as maps refer to it */ 237 const char *name; /* Shortend name of the region as maps refer to it */
238 const char *parent_name; /* 238 const char *parent_name; /*
239 * So that parent and child regions can be defined in 239 * So that parent and child regions can be defined in
254 sint8 fallback; /* whether, in the event of a region not existing, 254 sint8 fallback; /* whether, in the event of a region not existing,
255 * this should be the one we fall back on as the default */ 255 * this should be the one we fall back on as the default */
256 char *jailmap; /*where a player that is arrested in this region should be imprisoned. */ 256 char *jailmap; /*where a player that is arrested in this region should be imprisoned. */
257 sint16 jailx, jaily; /* The coodinates in jailmap to which the player should be sent. */ 257 sint16 jailx, jaily; /* The coodinates in jailmap to which the player should be sent. */
258}; 258};
259
260 259
261struct shopitems : zero_initialised 260struct shopitems : zero_initialised
262{ 261{
263 const char *name; /* name of the item in question, null if it is the default item */ 262 const char *name; /* name of the item in question, null if it is the default item */
264 const char *name_pl; /* plural name */ 263 const char *name_pl; /* plural name */
318 sint8 ACC (RW, sky); /* sky conditions */ 317 sint8 ACC (RW, sky); /* sky conditions */
319 int ACC (RW, wpartx), ACC (RW, wparty); /*Highly fasten conversion between worldmap and weathermap */ 318 int ACC (RW, wpartx), ACC (RW, wparty); /*Highly fasten conversion between worldmap and weathermap */
320 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 319 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
321 char *ACC (RO, shoprace); /* the preffered race of the local shopkeeper */ 320 char *ACC (RO, shoprace); /* the preffered race of the local shopkeeper */
322 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 321 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
323 uint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 322 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
324 uint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 323 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
325 char *ACC (RO, msg); /* Message map creator may have left */ 324 char *ACC (RO, msg); /* Message map creator may have left */
326 char *ACC (RO, maplore); /* Map lore information */ 325 char *ACC (RO, maplore); /* Map lore information */
327 char *tile_path[4]; /* path to adjoining maps */ 326 char *tile_path[4]; /* path to adjoining maps */
328 maptile *tile_map[4]; /* Next map, linked list */ 327 maptile *tile_map[4]; /* Next map, linked list */
329 char ACC (RW, path)[HUGE_BUF]; /* Filename of the map */ 328 char ACC (RW, path)[HUGE_BUF]; /* Filename of the map */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines