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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.89 by root, Sun Sep 30 20:22:18 2007 UTC vs.
Revision 1.117 by root, Sun Nov 8 15:11:23 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/*	25	/*
25	* The maptile is allocated each time a new map is opened.	26	* The maptile is allocated each time a new map is opened.
26	* It contains pointers (very indirectly) to all objects on the map.	27	* It contains pointers (very indirectly) to all objects on the map.
28		29
29	#ifndef MAP_H	30	#ifndef MAP_H
30	#define MAP_H	31	#define MAP_H
31		32
32	#include <tr1/unordered_map>	33	#include <tr1/unordered_map>
		34
		35	//+GPL
33		36
34	#include "region.h"	37	#include "region.h"
35	#include "cfperl.h"	38	#include "cfperl.h"
36		39
37	/* We set this size - this is to make magic map work properly on	40	/* We set this size - this is to make magic map work properly on
…		…
47	#define MAGIC_MAP_SIZE 50	50	#define MAGIC_MAP_SIZE 50
48	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2	51	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49		52
50	#define MAP_LAYERS 3	53	#define MAP_LAYERS 3
51		54
52	/* Values for in_memory below. Should probably be an enumerations */	55	// tile map index
53	enum {	56	enum {
54	MAP_IN_MEMORY,	57	TILE_UP = 0,
		58	TILE_RIGHT = 1,
		59	TILE_DOWN = 2,
		60	TILE_LEFT = 3,
		61	};
		62
		63	/* Values for in_memory below */
		64	enum {
		65	MAP_ACTIVE,
		66	MAP_INACTIVE, // not used atm.
55	MAP_SWAPPED,	67	MAP_SWAPPED,
56	MAP_LOADING,	68	MAP_LOADING,
57	MAP_SAVING,	69	MAP_SAVING,
58	};	70	};
59		71
…		…
62	* where it is known the map is not tiled or the values are known	74	* where it is known the map is not tiled or the values are known
63	* consistent (eg, op->map, op->x, op->y)	75	* consistent (eg, op->map, op->x, op->y)
64	*/	76	*/
65	// all those macros are herewith declared legacy	77	// all those macros are herewith declared legacy
66	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()	78	#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	79	#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	80	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]	81	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
71	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block	82	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
72	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow	83	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
…		…
82	/* These are used in the MapLook flags element. They are not used in	93	/* These are used in the MapLook flags element. They are not used in
83	* in the object flags structure.	94	* in the object flags structure.
84	*/	95	*/
85	#define P_BLOCKSVIEW 0x01	96	#define P_BLOCKSVIEW 0x01
86	#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */	97	#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
87	#define P_PLAYER 0x04 /* a player (or something seeing these objects) is on this mapspace */	98	#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
88	#define P_SAFE 0x08 /* If this is set the map tile is a safe space,	99	#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
89	* that means, nothing harmful can be done,	100	* that means, nothing harmful can be done,
90	* such as: bombs, potion usage, alchemy, spells	101	* such as: bombs, potion usage, alchemy, spells
91	* this was introduced to make shops safer	102	* this was introduced to make shops safer
92	* but is useful in other situations */	103	* but is useful in other situations */
		104
		105	#define P_PLAYER 0x10 /* a player (or something seeing these objects) is on this mapspace */
93	#define P_IS_ALIVE 0x10 /* something alive is on this space */	106	#define P_IS_ALIVE 0x20 /* something alive is on this space */
94	#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
95
96	#define P_UPTODATE 0x80 /* this space is up to date */	107	#define P_UPTODATE 0x80 // this space is up to date
97		108
98	/* The following two values are not stored in the MapLook flags, but instead	109	/* The following two values are not stored in the MapLook flags, but instead
99	* used in the get_map_flags value - that function is used to return	110	* used in the get_map_flags value - that function is used to return
100	* the flag value, as well as other conditions - using a more general	111	* the flag value, as well as other conditions - using a more general
101	* function that does more of the work can hopefully be used to replace	112	* function that does more of the work can hopefully be used to replace
102	* lots of duplicate checks currently in the code.	113	* lots of duplicate checks currently in the code.
103	*/	114	*/
104	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */	115	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
105	#define P_NEW_MAP 0x20000	116	#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
106	/* Coordinates passed result in a new tiled map */
107		117
108	/* Instead of having numerous arrays that have information on a	118	/* Instead of having numerous arrays that have information on a
109	* particular space (was map, floor, floor2, map_ob),	119	* particular space (was map, floor, floor2, map_ob),
110	* have this structure take care of that information.	120	* have this structure take care of that information.
111	* This puts it all in one place, and should also make it easier	121	* This puts it all in one place, and should also make it easier
112	* to extend information about a space.	122	* to extend information about a space.
113	*/	123	*/
		124	INTERFACE_CLASS (mapspace)
114	struct mapspace	125	struct mapspace
115	{	126	{
		127	object *ACC (RW, bot);
116	object bot, top; /* lowest/highest object on this space */	128	object ACC (RW, top); / lowest/highest object on this space */
117	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */	129	object ACC (RW, faces_obj[MAP_LAYERS]);/ face objects for the 3 layers */
118	uint8 flags_; /* flags about this space (see the P_ values above) */	130	uint8 flags_; /* flags about this space (see the P_ values above) */
119	sint8 light; /* How much light this space provides */	131	sint8 ACC (RW, light); /* How much light this space provides */
120	MoveType move_block; /* What movement types this space blocks */	132	MoveType ACC (RW, move_block); /* What movement types this space blocks */
121	MoveType move_slow; /* What movement types this space slows */	133	MoveType ACC (RW, move_slow); /* What movement types this space slows */
122	MoveType move_on; /* What movement types are activated */	134	MoveType ACC (RW, move_on); /* What movement types are activated */
123	MoveType move_off; /* What movement types are activated */	135	MoveType ACC (RW, move_off); /* What movement types are activated */
		136	uint16_t ACC (RW, nrof_); // saturates at 64k
		137	uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
		138	uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
		139	static uint32_t ACC (RW, smellcount); // global smell counter
		140
		141	uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
		142
		143	//-GPL
124		144
125	void update_ ();	145	void update_ ();
126	void update ()	146	MTH void update ()
127	{	147	{
128	if (!(flags_ & P_UPTODATE))	148	// we take advantage of the fact that 0x80 is the sign bit
		149	// to generate more efficient code on many cpus
		150	assert (P_UPTODATE == 0x80);
		151
		152	if (expect_false (sint8 (flags_) < 0))
129	update_ ();	153	update_ ();
130	}
131		154
		155	// must be true by now
		156	assume (sint8 (flags_) < 0);
		157	assume (flags_ & P_UPTODATE);
		158	}
		159
132	uint8 flags ()	160	MTH uint8 flags ()
133	{	161	{
134	update ();	162	update ();
135	return flags_;	163	return flags_;
136	}	164	}
		165
		166	MTH void invalidate ()
		167	{
		168	flags_ = 0;
		169	}
137		170
138	// maybe only inline quick flags_ checking?
139	object *player ()	171	MTH object *player ()
140	{	172	{
141	// search from the top, because players are usually on top	173	object *op;
142	// make usually == always and this non-amortized O(1)	174
143	// could gte rid of P_PLAYER, too, then
144	if (flags () & P_PLAYER)	175	if (flags () & P_PLAYER)
145	for (object *op = top; op; op = op->below)	176	for (op = top; op->type != PLAYER; op = op->below)
146	if (op->type == PLAYER)	177	;
147	return op;	178	else
		179	op = 0;
148		180
149	return 0;	181	return op;
		182	}
		183
		184	MTH uint32 nrof ()
		185	{
		186	update ();
		187	return nrof_;
150	}	188	}
151		189
152	// return the item volume on this mapspace in cm³	190	// return the item volume on this mapspace in cm³
153	uint64 volume () const;	191	MTH uint64 volume ()
		192	{
		193	update ();
		194	return volume_ * 1024;
		195	}
154		196
155	bool blocks (MoveType mt) const	197	bool blocks (MoveType mt) const
156	{	198	{
157	return move_block && (mt & move_block) == mt;	199	return move_block && (mt & move_block) == mt;
158	}	200	}
		201
		202	bool blocks (object *op) const
		203	{
		204	return blocks (op->move_type);
		205	}
159	};	206	};
		207
		208	// a rectangular area of a map
		209	struct maprect
		210	{
		211	maptile *m;
		212	int x0, y0;
		213	int x1, y1;
		214	int dx, dy; // offset to go from local coordinates to original tile */
		215	};
		216
		217	//+GPL
160		218
161	struct shopitems : zero_initialised	219	struct shopitems : zero_initialised
162	{	220	{
163	const char name; / name of the item in question, null if it is the default item */	221	const char name; / name of the item in question, null if it is the default item */
164	const char name_pl; / plural name */	222	const char name_pl; / plural name */
…		…
215	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	273	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216		274
217	bool ACC (RW, per_player);	275	bool ACC (RW, per_player);
218	bool ACC (RW, per_party);	276	bool ACC (RW, per_party);
219	bool ACC (RW, outdoor); /* True if an outdoor map */	277	bool ACC (RW, outdoor); /* True if an outdoor map */
220	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	278	bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221	uint8 ACC (RW, darkness); /* indicates level of darkness of map */	279	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		280	static sint8 outdoor_darkness; /* the global darkness level outside */
222		281
223	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	282	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */	283	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225	oblinkpt buttons; / Linked list of linked lists of buttons */	284	oblinkpt buttons; / Linked list of linked lists of buttons */
226	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	285	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
240	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	299	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
241	maptile ACC (RW, tile_map[4]); / Next map, linked list */	300	maptile ACC (RW, tile_map[4]); / Next map, linked list */
242	shstr ACC (RW, path); /* Filename of the map */	301	shstr ACC (RW, path); /* Filename of the map */
243	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace	302	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
244	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace	303	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
		304	int ACC (RW, max_items); // maximum number of items on a mapspace
		305
		306	//-GPL
		307
		308	// the maptile:: is neccessary here for the perl interface to work
		309	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		310	{
		311	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		312	}
		313
		314	static void adjust_daylight ();
245		315
246	MTH void activate ();	316	MTH void activate ();
247	MTH void deactivate ();	317	MTH void deactivate ();
248		318
249	// allocates all (empty) mapspace	319	// allocates all (empty) mapspace
…		…
253		323
254	MTH void fix_auto_apply ();	324	MTH void fix_auto_apply ();
255	MTH void do_decay_objects ();	325	MTH void do_decay_objects ();
256	MTH void update_buttons ();	326	MTH void update_buttons ();
257	MTH int change_map_light (int change);	327	MTH int change_map_light (int change);
258	static void change_all_map_light (int change); //PERL
259	MTH void set_darkness_map ();
260	MTH int estimate_difficulty () const;	328	MTH int estimate_difficulty () const;
261		329
262	MTH void play_sound (faceidx sound, int x, int y) const;	330	MTH void play_sound (faceidx sound, int x, int y) const;
		331	MTH void say_msg (const char *msg, int x, int y) const;
		332
		333	// connected links
		334	oblinkpt *find_link (shstr_tmp id);
		335	MTH void trigger (shstr_tmp id, int state = 1, object activator = 0, object originator = 0);
263		336
264	// set the given flag on all objects in the map	337	// set the given flag on all objects in the map
265	MTH void set_object_flag (int flag, int value = 1);	338	MTH void set_object_flag (int flag, int value = 1);
		339	MTH void post_load_original ();
266		340
267	MTH void link_multipart_objects ();	341	MTH void link_multipart_objects ();
268	MTH void clear_unique_items ();	342	MTH void clear_unique_items ();
269		343
270	MTH void clear_header ();	344	MTH void clear_header ();
…		…
299		373
300	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	374	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
301		375
302	MTH void touch () { last_access = runtime; }	376	MTH void touch () { last_access = runtime; }
303		377
304	MTH bool tile_available (int dir, bool load = true);	378	MTH maptile *tile_available (int dir, bool load = true);
305		379
306	// find the map that is at coordinate x\|y relative to this map	380	// find the map that is at coordinate x\|y relative to this map
307	// TODO: need a better way than passing by reference	381	// TODO: need a better way than passing by reference
308	// TODO: make perl interface	382	// TODO: make perl interface
309	maptile *xy_find (sint16 &x, sint16 &y);	383	maptile *xy_find (sint16 &x, sint16 &y);
…		…
324	bool generate_random_map (random_map_params *RP);	398	bool generate_random_map (random_map_params *RP);
325		399
326	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL	400	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
327	static maptile find_sync (const char path, maptile *original = 0);//PERL	401	static maptile find_sync (const char path, maptile *original = 0);//PERL
328	static maptile find_style_sync (const char dir, const char *file = 0);//PERL	402	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
329	MTH object *pick_random_object () const;	403	object *pick_random_object (rand_gen &gen = rndm) const;
330		404
331	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	405	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	406
		407	// return an array of maprects corresponding
		408	// to the given rectangular area. the last rect will have
		409	// a 0 map pointer.
		410	// the array will be stored in a static memory area,
		411	// so recursion is not atm. supported
		412	maprect *split_to_tiles (int x0, int y0, int x1, int y1);
333	};	413	};
		414
		415	//+GPL
334		416
335	/* This is used by get_rangevector to determine where the other	417	/* This is used by get_rangevector to determine where the other
336	* creature is. get_rangevector takes into account map tiling,	418	* creature is. get_rangevector takes into account map tiling,
337	* so you just can not look the the map coordinates and get the	419	* so you just can not look the the map coordinates and get the
338	* righte value. distance_x/y are distance away, which	420	* righte value. distance_x/y are distance away, which
…		…
355	// and so on.	437	// and so on.
356	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	438	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
357	int out_of_map (maptile *m, int x, int y);	439	int out_of_map (maptile *m, int x, int y);
358	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	440	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
359	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	441	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
360	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	442	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector retval, int flags = 0 /unused*/);
361	int on_same_map (const object op1, const object op2);	443	int on_same_map (const object op1, const object op2);
362	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	444	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
363		445
364	// adjust map, x and y for tiled maps and return true if the position is valid at all	446	// adjust map, x and y for tiled maps and return true if the position is valid at all
365	static inline bool	447	static inline bool
…		…
370	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	452	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
371	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	453	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
372	}	454	}
373	// comaptibility cruft end	455	// comaptibility cruft end
374		456
		457	//-GPL
		458
375	inline mapspace &	459	inline mapspace &
376	object::ms () const	460	object::ms () const
377	{	461	{
378	return map->at (x, y);	462	return map->at (x, y);
379	}	463	}
…		…
419	bool normalise ()	503	bool normalise ()
420	{	504	{
421	return xy_normalise (m, x, y);	505	return xy_normalise (m, x, y);
422	}	506	}
423		507
		508	mapspace &ms () const
		509	{
		510	return m->at (x, y);
		511	}
		512
424	object insert (object op, object *originator = 0, int flags = 0) const	513	object insert (object op, object *originator = 0, int flags = 0) const
425	{	514	{
426	m->insert (op, x, y, originator, flags);	515	return m->insert (op, x, y, originator, flags);
427	}	516	}
428	};	517	};
429		518
430	inline const mapxy &	519	inline const mapxy &
431	object::operator =(const mapxy &pos)	520	object::operator =(const mapxy &pos)
…		…
435	y = pos.y;	524	y = pos.y;
436		525
437	return pos;	526	return pos;
438	}	527	}
439		528
		529	// iterate over a rectangular area relative to op
		530	// can be used as a single statement, but both iterate macros
		531	// invocations must not be followed by a ";"
		532	// see common/los.C for usage example
		533	// the walk will be ordered, outer loop x, inner loop y
		534	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		535	// "continue" will skip to the next space
		536	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		537	for (int dx = (dx0); dx <= (dx1); ++dx) \
		538	{ \
		539	sint16 nx, ny; \
		540	maptile *m = 0; \
		541	\
		542	for (int dy = (dy0); dy <= (dy1); ++dy) \
		543	{ \
		544	/* check to see if we can simply go one down quickly, */ \
		545	/* if not, do it the slow way */ \
		546	if (!m \|\| ++ny >= m->height) \
		547	{ \
		548	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		549	\
		550	if (!xy_normalise (m, nx, ny)) \
		551	m = 0; \
		552	}
		553
		554	#define ordered_mapwalk_end \
		555	} \
		556	}
		557
		558	// loop over every space in the given maprect,
		559	// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
		560	// the iterator code must be a single statement following this macro call, similar to "if"
		561	// "continue" will skip to the next space
		562	#define rect_mapwalk(rect,dx0,dy0) \
		563	statementvar (maptile *, m, (rect)->m) \
		564	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		565	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		566	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		567	statementvar (int, dy, ny + (rect)->dy - (dy0))
		568
		569	// same as ordered_mapwalk, but the walk will not follow any particular
		570	// order (unorded), but is likely faster.
		571	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		572	// "continue" will skip to the next space
		573	#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \
		574	for (maprect *r_e_c_t = (map)->split_to_tiles ( \
		575	(ox) + (dx0) , (oy) + (dy0) , \
		576	(ox) + (dx1) + 1, (oy) + (dy1) + 1); \
		577	r_e_c_t->m; \
		578	++r_e_c_t) \
		579	rect_mapwalk (r_e_c_t, (ox), (oy))
		580
		581	#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
		582	unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
		583
440	#endif	584	#endif
441		585

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.89 by root, Sun Sep 30 20:22:18 2007 UTC vs. Revision 1.117 by root, Sun Nov 8 15:11:23 2009 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.89 by root, Sun Sep 30 20:22:18 2007 UTC vs.
Revision 1.117 by root, Sun Nov 8 15:11:23 2009 UTC