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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.67 by root, Thu Feb 15 21:07:49 2007 UTC vs.
Revision 1.105 by root, Sat Dec 27 02:31:19 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at crossfire@schmorp.de	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/*	24	/*
26	* The maptile is allocated each time a new map is opened.	25	* The maptile is allocated each time a new map is opened.
27	* It contains pointers (very indirectly) to all objects on the map.	26	* It contains pointers (very indirectly) to all objects on the map.
30	#ifndef MAP_H	29	#ifndef MAP_H
31	#define MAP_H	30	#define MAP_H
32		31
33	#include <tr1/unordered_map>	32	#include <tr1/unordered_map>
34		33
		34	#include "region.h"
35	#include "cfperl.h"	35	#include "cfperl.h"
36		36
37	/* We set this size - this is to make magic map work properly on	37	/* We set this size - this is to make magic map work properly on
38	* tiled maps. There is no requirement that this matches the	38	* tiled maps. There is no requirement that this matches the
39	* tiled maps size - it just seemed like a reasonable value.	39	* tiled maps size - it just seemed like a reasonable value.
…		…
47	#define MAGIC_MAP_SIZE 50	47	#define MAGIC_MAP_SIZE 50
48	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2	48	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49		49
50	#define MAP_LAYERS 3	50	#define MAP_LAYERS 3
51		51
52	/* Values for in_memory below. Should probably be an enumerations */	52	// tile map index
53	enum {	53	enum {
54	MAP_IN_MEMORY,	54	TILE_UP = 0,
		55	TILE_RIGHT = 1,
		56	TILE_DOWN = 2,
		57	TILE_LEFT = 3,
		58	};
		59
		60	/* Values for in_memory below */
		61	enum {
		62	MAP_ACTIVE,
		63	MAP_INACTIVE, // not used atm.
55	MAP_SWAPPED,	64	MAP_SWAPPED,
56	MAP_LOADING,	65	MAP_LOADING,
57	MAP_SAVING,	66	MAP_SAVING,
58	};	67	};
59		68
…		…
62	* where it is known the map is not tiled or the values are known	71	* where it is known the map is not tiled or the values are known
63	* consistent (eg, op->map, op->x, op->y)	72	* consistent (eg, op->map, op->x, op->y)
64	*/	73	*/
65	// all those macros are herewith declared legacy	74	// all those macros are herewith declared legacy
66	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()	75	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
67	#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
68	#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot	76	#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
69	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top	77	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70	#define GET_MAP_FACE(M,X,Y,L) (M)->at((X),(Y)).faces[L]
71	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]	78	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
72	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block	79	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
73	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow	80	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
74	#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on	81	#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on
75	#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off	82	#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off
…		…
100	* used in the get_map_flags value - that function is used to return	107	* used in the get_map_flags value - that function is used to return
101	* the flag value, as well as other conditions - using a more general	108	* the flag value, as well as other conditions - using a more general
102	* function that does more of the work can hopefully be used to replace	109	* function that does more of the work can hopefully be used to replace
103	* lots of duplicate checks currently in the code.	110	* lots of duplicate checks currently in the code.
104	*/	111	*/
105	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */	112	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
106	#define P_NEW_MAP 0x20000	113	#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
107	/* Coordinates passed result in a new tiled map */
108
109	/* P_NO_PASS is used for ob_blocked() return value. It needs
110	* to be here to make sure the bits don't match with anything.
111	*/
112	#define P_NO_PASS 0x80000
113		114
114	/* Instead of having numerous arrays that have information on a	115	/* Instead of having numerous arrays that have information on a
115	* particular space (was map, floor, floor2, map_ob),	116	* particular space (was map, floor, floor2, map_ob),
116	* have this structure take care of that information.	117	* have this structure take care of that information.
117	* This puts it all in one place, and should also make it easier	118	* This puts it all in one place, and should also make it easier
118	* to extend information about a space.	119	* to extend information about a space.
119	*/	120	*/
		121	INTERFACE_CLASS (mapspace)
120	struct mapspace	122	struct mapspace
121	{	123	{
		124	object *ACC (RW, bot);
122	object bot, top; /* lowest/highest object on this space */	125	object ACC (RW, top); / lowest/highest object on this space */
123	facetile faces[MAP_LAYERS]; / faces for the 3 layers */
124	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */	126	object ACC (RW, faces_obj[MAP_LAYERS]);/ face objects for the 3 layers */
		127	tick_t smell; // the last ptick a player was seen here, or 0
125	uint8 flags_; /* flags about this space (see the P_ values above) */	128	uint8 flags_; /* flags about this space (see the P_ values above) */
126	sint8 light; /* How much light this space provides */	129	sint8 ACC (RW, light); /* How much light this space provides */
127	MoveType move_block; /* What movement types this space blocks */	130	MoveType ACC (RW, move_block); /* What movement types this space blocks */
128	MoveType move_slow; /* What movement types this space slows */	131	MoveType ACC (RW, move_slow); /* What movement types this space slows */
129	MoveType move_on; /* What movement types are activated */	132	MoveType ACC (RW, move_on); /* What movement types are activated */
130	MoveType move_off; /* What movement types are activated */	133	MoveType ACC (RW, move_off); /* What movement types are activated */
131		134
132	void update_ ();	135	void update_ ();
133	void update ()	136	MTH void update ()
134	{	137	{
135	if (!(flags_ & P_UPTODATE))	138	if (!(flags_ & P_UPTODATE))
136	update_ ();	139	update_ ();
137	}	140	}
138		141
139	uint8 flags ()	142	MTH uint8 flags ()
140	{	143	{
141	update ();	144	update ();
142	return flags_;	145	return flags_;
143	}	146	}
		147
		148	MTH void invalidate ()
		149	{
		150	flags_ = 0;
		151	}
144		152
145	// maybe only inline quick flags_ checking?
146	object *player ()	153	MTH object *player ()
147	{	154	{
148	// search from the top, because players are usually on top	155	object *op;
149	// make usually == always and this non-amortized O(1)	156
150	// could gte rid of P_PLAYER, too, then
151	if (flags () & P_PLAYER)	157	if (flags () & P_PLAYER)
152	for (object *op = top; op; op = op->below)	158	for (op = top; op->type != PLAYER; op = op->below)
153	if (op->type == PLAYER)	159	;
154	return op;	160	else
		161	op = 0;
155		162
156	return 0;	163	return op;
157	}	164	}
158		165
159	// return the item volume on this mapspace in cm³	166	// return the item volume on this mapspace in cm³
160	uint64 volume () const;	167	MTH uint64 volume () const;
161	};
162		168
163	/*	169	bool blocks (MoveType mt) const
164	* Each map is in a given region of the game world and links to a region definiton, so	170	{
165	* they have to appear here in the headers, before the mapdef	171	return move_block && (mt & move_block) == mt;
166	*/	172	}
167	INTERFACE_CLASS (region)
168	struct region : zero_initialised
169	{
170	shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
171	region ACC (RW, parent); /
172	* Pointer to the region that is a parent of the current
173	* region, if a value isn't defined in the current region
174	* we traverse this series of pointers until it is.
175	*/
176	shstr ACC (RW, longname); /* Official title of the region, this might be defined
177	* to be the same as name*/
178	shstr ACC (RW, msg); /* the description of the region */
179	shstr ACC (RW, jailmap); /where a player that is arrested in this region should be imprisoned. /
180	int ACC (RW, index);
181	uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
182	sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */
183	bool ACC (RW, fallback); /* whether, in the event of a region not existing,
184	* this should be the one we fall back on as the default */
185		173
186	static region *default_region ();	174	bool blocks (object *op) const
187	static region find (const char name);	175	{
188	static region find_fuzzy (const char name);	176	return blocks (op->move_type);
189	static region *load (object_thawer &f);	177	}
190	};	178	};
191		179
192	typedef object_vector<region, &region::index> regionvec;	180	// a rectangular area of a map
193		181	struct maprect
194	extern regionvec regions;	182	{
195		183	maptile *m;
196	#define for_all_regions(var) \	184	int x0, y0;
197	for (int _i = 0; _i < regions.size (); ++_i) \	185	int x1, y1;
198	declvar (region *, var, regions [_i])	186	int dx, dy; // offset to go from local coordinates to original tile */
		187	};
199		188
200	struct shopitems : zero_initialised	189	struct shopitems : zero_initialised
201	{	190	{
202	const char name; / name of the item in question, null if it is the default item */	191	const char name; / name of the item in question, null if it is the default item */
203	const char name_pl; / plural name */	192	const char name_pl; / plural name */
…		…
226	struct maptile : zero_initialised, attachable	215	struct maptile : zero_initialised, attachable
227	{	216	{
228	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */	217	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
229	struct mapspace spaces; / Array of spaces on this map */	218	struct mapspace spaces; / Array of spaces on this map */
230	uint8 regions; / region index per mapspace, if != 0 */	219	uint8 regions; / region index per mapspace, if != 0 */
231	struct region *regionmap; / index to region */	220	region_ptr regionmap; / index to region */
232		221
233	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */	222	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
234		223
235	shstr ACC (RW, name); /* Name of map as given by its creator */	224	shstr ACC (RW, name); /* Name of map as given by its creator */
236	struct region ACC (RW, default_region); / What jurisdiction in the game world this map is ruled by	225	region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
237	* points to the struct containing all the properties of	226	* points to the struct containing all the properties of
238	* the region */	227	* the region */
239	double ACC (RW, reset_time);	228	double ACC (RW, reset_time);
240	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map	229	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
241	* should be reset	230	* should be reset
242	*/	231	*/
243	bool ACC (RW, dirty); /* if true, something was inserted or removed */	232	bool ACC (RW, dirty); /* if true, something was inserted or removed */
		233	bool ACC (RW, no_reset); // must not reset this map
244	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by	234	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
245	* players entering/exiting map	235	* players entering/exiting map
246	*/	236	*/
247	sint32 ACC (RW, timeout); /* swapout is set to this */	237	sint32 ACC (RW, timeout); /* swapout is set to this */
248	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */	238	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
…		…
253	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	243	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
254		244
255	bool ACC (RW, per_player);	245	bool ACC (RW, per_player);
256	bool ACC (RW, per_party);	246	bool ACC (RW, per_party);
257	bool ACC (RW, outdoor); /* True if an outdoor map */	247	bool ACC (RW, outdoor); /* True if an outdoor map */
258	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	248	bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
259	uint8 ACC (RW, darkness); /* indicates level of darkness of map */	249	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		250	static sint8 outdoor_darkness; /* the global darkness level outside */
260		251
261	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	252	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
262	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */	253	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
263	oblinkpt buttons; / Linked list of linked lists of buttons */	254	oblinkpt buttons; / Linked list of linked lists of buttons */
264	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	255	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
279	maptile ACC (RW, tile_map[4]); / Next map, linked list */	270	maptile ACC (RW, tile_map[4]); / Next map, linked list */
280	shstr ACC (RW, path); /* Filename of the map */	271	shstr ACC (RW, path); /* Filename of the map */
281	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace	272	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
282	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace	273	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
283		274
		275	// the maptile:: is neccessary here for the perl interface to work
		276	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		277	{
		278	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		279	}
		280
		281	static void adjust_daylight ();
		282
284	MTH void activate ();	283	MTH void activate ();
285	MTH void deactivate ();	284	MTH void deactivate ();
286		285
287	// allocates all (empty) mapspace	286	// allocates all (empty) mapspace
288	MTH void alloc ();	287	MTH void alloc ();
289	// deallocates the mapspaces (and destroys all objects)	288	// deallocates the mapspaces (and destroys all objects)
290	MTH void clear ();	289	MTH void clear ();
291		290
292	MTH void fix_auto_apply ();	291	MTH void fix_auto_apply ();
293	MTH void decay_objects ();	292	MTH void do_decay_objects ();
294	MTH void update_buttons ();	293	MTH void update_buttons ();
295	MTH int change_map_light (int change);	294	MTH int change_map_light (int change);
296	static void change_all_map_light (int change); //PERL
297	MTH void set_darkness_map ();
298	MTH int estimate_difficulty () const;	295	MTH int estimate_difficulty () const;
		296
		297	MTH void play_sound (faceidx sound, int x, int y) const;
299		298
300	// set the given flag on all objects in the map	299	// set the given flag on all objects in the map
301	MTH void set_object_flag (int flag, int value = 1);	300	MTH void set_object_flag (int flag, int value = 1);
		301	MTH void post_load_original ();
302		302
303	MTH void link_multipart_objects ();	303	MTH void link_multipart_objects ();
304	MTH void clear_unique_items ();	304	MTH void clear_unique_items ();
305		305
306	MTH void clear_header ();	306	MTH void clear_header ();
307	MTH void clear_links_to (maptile *m);	307	MTH void clear_links_to (maptile *m);
308		308
309	MTH struct region *region (int x, int y) const;	309	MTH struct region *region (int x, int y) const;
310		310
311	// loas the header pseudo-object	311	// load the header pseudo-object
312	bool _load_header (object_thawer &thawer);	312	bool _load_header (object_thawer &thawer);
313	MTH bool _load_header (const char *path);	313	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
314		314
315	// load objects into the map	315	// load objects into the map
316	bool _load_objects (object_thawer &thawer);	316	bool _load_objects (object_thawer &thawer);
317	MTH bool _load_objects (const char *path, bool skip_header = true);	317	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
318		318
319	// save objects into the given file (uses IO_ flags)	319	// save objects into the given file (uses IO_ flags)
320	bool _save_objects (object_freezer &freezer, int flags);	320	bool _save_objects (object_freezer &freezer, int flags);
321	MTH bool _save_objects (const char *path, int flags);	321	MTH bool _save_objects (const char *path, int flags);
322		322
…		…
334	MTH int size () const { return width * height; }	334	MTH int size () const { return width * height; }
335		335
336	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	336	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
337		337
338	MTH void touch () { last_access = runtime; }	338	MTH void touch () { last_access = runtime; }
		339
		340	MTH maptile *tile_available (int dir, bool load = true);
339		341
340	// find the map that is at coordinate x\|y relative to this map	342	// find the map that is at coordinate x\|y relative to this map
341	// TODO: need a better way than passing by reference	343	// TODO: need a better way than passing by reference
342	// TODO: make perl interface	344	// TODO: make perl interface
343	maptile *xy_find (sint16 &x, sint16 &y);	345	maptile *xy_find (sint16 &x, sint16 &y);
…		…
355	}	357	}
356		358
357	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	359	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
358	bool generate_random_map (random_map_params *RP);	360	bool generate_random_map (random_map_params *RP);
359		361
		362	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
360	static maptile find_sync (const char path, maptile *original = 0);//PERL	363	static maptile find_sync (const char path, maptile *original = 0);//PERL
361	// async prefetch	364	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
362	static maptile find_async (const char path, maptile *original = 0);//PERL	365	object *pick_random_object (rand_gen &gen = rndm) const;
363		366
364	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	367	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
365	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	368
		369	// return an array of maprects corresponding
		370	// to the given rectangular area. the last rect will have
		371	// a 0 map pointer.
		372	// the array will be stored in a static memory area,
		373	// so recursion is not atm. supported
		374	maprect *split_to_tiles (int x0, int y0, int x1, int y1);
366	};	375	};
367		376
368	/* This is used by get_rangevector to determine where the other	377	/* This is used by get_rangevector to determine where the other
369	* creature is. get_rangevector takes into account map tiling,	378	* creature is. get_rangevector takes into account map tiling,
370	* so you just can not look the the map coordinates and get the	379	* so you just can not look the the map coordinates and get the
…		…
381	int distance_y;	390	int distance_y;
382	int direction;	391	int direction;
383	object *part;	392	object *part;
384	};	393	};
385		394
		395	// comaptibility cruft start
386	//TODO: these should be refactored into things like xy_normalise	396	//TODO: these should be refactored into things like xy_normalise
387	// and so on.	397	// and so on.
388	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	398	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
389	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
390	int out_of_map (maptile *m, int x, int y);	399	int out_of_map (maptile *m, int x, int y);
391	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	400	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
392	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	401	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
393	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	402	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
394	int on_same_map (const object op1, const object op2);	403	int on_same_map (const object op1, const object op2);
395	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	404	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
396		405
397	// adjust map, x and y for tiled maps and return true if the position is valid at all	406	// adjust map, x and y for tiled maps and return true if the position is valid at all
398	inline bool	407	static inline bool
399	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	408	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
400	{	409	{
401	// when in range, do a quick return, otherwise go the slow route	410	// when in range, do a quick return, otherwise go the slow route
402	return	411	return
403	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	412	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
404	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	413	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
405	}	414	}
		415	// comaptibility cruft end
406		416
407	inline mapspace &	417	inline mapspace &
408	object::ms () const	418	object::ms () const
409	{	419	{
410	return map->at (x, y);	420	return map->at (x, y);
411	}	421	}
412		422
		423	struct mapxy {
		424	maptile *m;
		425	sint16 x, y;
		426
		427	mapxy (maptile *m, sint16 x, sint16 y)
		428	: m(m), x(x), y(y)
		429	{ }
		430
		431	mapxy (object *op)
		432	: m(op->map), x(op->x), y(op->y)
		433	{ }
		434
		435	mapxy &move (int dx, int dy)
		436	{
		437	x += dx;
		438	y += dy;
		439
		440	return *this;
		441	}
		442
		443	mapxy &move (int dir)
		444	{
		445	return move (freearr_x [dir], freearr_y [dir]);
		446	}
		447
		448	operator void () const { return (void )m; }
		449	mapxy &operator =(const object *op)
		450	{
		451	m = op->map;
		452	x = op->x;
		453	y = op->y;
		454
		455	return *this;
		456	}
		457
		458	mapspace *operator ->() const { return &m->at (x, y); }
		459	mapspace &operator * () const { return m->at (x, y); }
		460
		461	bool normalise ()
		462	{
		463	return xy_normalise (m, x, y);
		464	}
		465
		466	mapspace &ms () const
		467	{
		468	return m->at (x, y);
		469	}
		470
		471	object insert (object op, object *originator = 0, int flags = 0) const
		472	{
		473	return m->insert (op, x, y, originator, flags);
		474	}
		475	};
		476
		477	inline const mapxy &
		478	object::operator =(const mapxy &pos)
		479	{
		480	map = pos.m;
		481	x = pos.x;
		482	y = pos.y;
		483
		484	return pos;
		485	}
		486
		487	// iterate over a rectangular area relative to op
		488	// can be used as a single statement, but both iterate macros
		489	// invocations must not be followed by a ";"
		490	// see common/los.C for usage example
		491	// the walk will be ordered, outer loop x, inner loop y
		492	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		493	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		494	for (int dx = (dx0); dx <= (dx1); ++dx) \
		495	{ \
		496	sint16 nx, ny; \
		497	maptile *m = 0; \
		498	\
		499	for (int dy = (dy0); dy <= (dy1); ++dy) \
		500	{ \
		501	/* check to see if we can simply go one down quickly, */ \
		502	/* if not, do it the slow way */ \
		503	if (!m \|\| ++ny >= m->height) \
		504	{ \
		505	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		506	\
		507	if (xy_normalise (m, nx, ny)) \
		508	m->touch (); \
		509	else \
		510	m = 0; \
		511	}
		512
		513	#define ordered_mapwalk_end \
		514	} \
		515	}
		516
		517	// loop over every space in the given maprect,
		518	// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
		519	// the iterator code must be a single statement following this macro call, similar to "if"
		520	#define rect_mapwalk(rect,dx0,dy0) \
		521	statementvar (maptile *, m, (rect)->m) \
		522	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		523	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		524	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		525	statementvar (int, dy, ny + (rect)->dy - (dy0))
		526
		527	// same as above, but the walk will not follow any particular
		528	// order (unorded), but is likely faster.
		529	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		530	#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
		531	for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
		532	(op)->x + (dx0) , (op)->y + (dy0) , \
		533	(op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
		534	r_e_c_t->m; \
		535	++r_e_c_t) \
		536	rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
		537
413	#endif	538	#endif
414		539

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.67 by root, Thu Feb 15 21:07:49 2007 UTC vs. Revision 1.105 by root, Sat Dec 27 02:31:19 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.67 by root, Thu Feb 15 21:07:49 2007 UTC vs.
Revision 1.105 by root, Sat Dec 27 02:31:19 2008 UTC