--- deliantra/server/include/map.h 2007/01/13 23:06:13 1.51 +++ deliantra/server/include/map.h 2007/01/27 23:59:29 1.60 @@ -1,26 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - 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@schmorp.de -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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@schmorp.de + */ /* * The maptile is allocated each time a new map is opened. @@ -49,13 +49,6 @@ #define MAP_LAYERS 3 -/* options passed to ready_map_name and load_original_map */ -#define MAP_FLUSH 0x01 -#define MAP_PLAYER_UNIQUE 0x02 -#define MAP_BLOCK 0x04 -#define MAP_STYLE 0x08 -#define MAP_OVERLAY 0x10 - /* Values for in_memory below. Should probably be an enumerations */ enum { MAP_IN_MEMORY, @@ -85,7 +78,7 @@ * should almost always be using out_of_map instead, which takes into account * map tiling. */ -#define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 || (Y)<0 || (X)>=(M)->width || (Y)>=(M)->height) +#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) /* These are used in the MapLook flags element. They are not used in * in the object flags structure. @@ -127,7 +120,7 @@ struct mapspace { object *bot, *top; /* lowest/highest object on this space */ - New_Face *faces[MAP_LAYERS]; /* faces for the 3 layers */ + 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 */ @@ -171,7 +164,7 @@ INTERFACE_CLASS (region) struct region : zero_initialised { - struct region *ACC (RW, next); /* pointer to next region, NULL for the last one */ + region *ACC (RW, next); /* pointer to next region, NULL for the last one */ char *ACC (RW, name); /* Shortend name of the region as maps refer to it */ char *ACC (RW, parent_name); /* * So that parent and child regions can be defined in @@ -180,7 +173,7 @@ * parents later. (before runtime on the server though) * nothing outside the init code should ever use this value. */ - struct 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. @@ -193,6 +186,9 @@ * this should be the one we fall back on as the default */ char *ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ + + static region *default_region (); + static region *find (const char *name); }; struct shopitems : zero_initialised @@ -225,11 +221,13 @@ { sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ struct mapspace *spaces; /* Array of spaces on this map */ + uint8 *regions; /* region index per mapspace, if != 0 */ + struct region **regionmap; /* index to region */ tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ shstr ACC (RW, name); /* Name of map as given by its creator */ - struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by + struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by * points to the struct containing all the properties of * the region */ double ACC (RW, reset_time); @@ -251,6 +249,7 @@ bool ACC (RW, per_player); bool ACC (RW, per_party); bool ACC (RW, outdoor); /* True if an outdoor map */ + bool ACC (RW, nodrop); /* avoid dropping anything on this map */ uint8 ACC (RW, darkness); /* indicates level of darkness of map */ uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ @@ -299,6 +298,8 @@ MTH void clear_header (); MTH void clear_links_to (maptile *m); + MTH struct region *region (int x, int y) const; + // loas the header pseudo-object bool _load_header (object_thawer &thawer); MTH bool _load_header (const char *path); @@ -374,6 +375,26 @@ object *part; }; +//TODO: these should be refactored into things like xy_normalise +// and so on. +int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); +int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); +int out_of_map(maptile *m, int x, int y); +maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); +void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); +void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); +int on_same_map(const object *op1, const object *op2); + +// adjust map, x and y for tiled maps and return true if the position is valid at all +inline bool +xy_normalise (maptile *&map, sint16 &x, sint16 &y) +{ + // when in range, do a quick return, otherwise go the slow route + return + (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) + || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); +} + inline mapspace & object::ms () const {