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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.76 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.107 by root, Sat Dec 27 08:41:44 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	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 it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <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_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]
71	#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
72	#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
…		…
99	* 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
100	* 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
101	* 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
102	* lots of duplicate checks currently in the code.	110	* lots of duplicate checks currently in the code.
103	*/	111	*/
104	#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 */
105	#define P_NEW_MAP 0x20000	113	#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
106	/* Coordinates passed result in a new tiled map */
107
108	/* P_NO_PASS is used for ob_blocked() return value. It needs
109	* to be here to make sure the bits don't match with anything.
110	*/
111	#define P_NO_PASS 0x80000
112		114
113	/* Instead of having numerous arrays that have information on a	115	/* Instead of having numerous arrays that have information on a
114	* particular space (was map, floor, floor2, map_ob),	116	* particular space (was map, floor, floor2, map_ob),
115	* have this structure take care of that information.	117	* have this structure take care of that information.
116	* 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
117	* to extend information about a space.	119	* to extend information about a space.
118	*/	120	*/
		121	INTERFACE_CLASS (mapspace)
119	struct mapspace	122	struct mapspace
120	{	123	{
		124	object *ACC (RW, bot);
121	object bot, top; /* lowest/highest object on this space */	125	object ACC (RW, top); / lowest/highest object on this space */
122	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	uint32_t smell; // the last count a player was seen here, or 0
		128	static uint32_t smellcount; // global smell counter
123	uint8 flags_; /* flags about this space (see the P_ values above) */	129	uint8 flags_; /* flags about this space (see the P_ values above) */
124	sint8 light; /* How much light this space provides */	130	sint8 ACC (RW, light); /* How much light this space provides */
125	MoveType move_block; /* What movement types this space blocks */	131	MoveType ACC (RW, move_block); /* What movement types this space blocks */
126	MoveType move_slow; /* What movement types this space slows */	132	MoveType ACC (RW, move_slow); /* What movement types this space slows */
127	MoveType move_on; /* What movement types are activated */	133	MoveType ACC (RW, move_on); /* What movement types are activated */
128	MoveType move_off; /* What movement types are activated */	134	MoveType ACC (RW, move_off); /* What movement types are activated */
129		135
130	void update_ ();	136	void update_ ();
131	void update ()	137	MTH void update ()
132	{	138	{
133	if (!(flags_ & P_UPTODATE))	139	if (!(flags_ & P_UPTODATE))
134	update_ ();	140	update_ ();
135	}	141	}
136		142
137	uint8 flags ()	143	MTH uint8 flags ()
138	{	144	{
139	update ();	145	update ();
140	return flags_;	146	return flags_;
141	}	147	}
		148
		149	MTH void invalidate ()
		150	{
		151	flags_ = 0;
		152	}
142		153
143	// maybe only inline quick flags_ checking?
144	object *player ()	154	MTH object *player ()
145	{	155	{
146	// search from the top, because players are usually on top	156	object *op;
147	// make usually == always and this non-amortized O(1)	157
148	// could gte rid of P_PLAYER, too, then
149	if (flags () & P_PLAYER)	158	if (flags () & P_PLAYER)
150	for (object *op = top; op; op = op->below)	159	for (op = top; op->type != PLAYER; op = op->below)
151	if (op->type == PLAYER)	160	;
152	return op;	161	else
		162	op = 0;
153		163
154	return 0;	164	return op;
155	}	165	}
156		166
157	// return the item volume on this mapspace in cm³	167	// return the item volume on this mapspace in cm³
158	uint64 volume () const;	168	MTH uint64 volume () const;
		169
		170	bool blocks (MoveType mt) const
		171	{
		172	return move_block && (mt & move_block) == mt;
		173	}
		174
		175	bool blocks (object *op) const
		176	{
		177	return blocks (op->move_type);
		178	}
		179	};
		180
		181	// a rectangular area of a map
		182	struct maprect
		183	{
		184	maptile *m;
		185	int x0, y0;
		186	int x1, y1;
		187	int dx, dy; // offset to go from local coordinates to original tile */
159	};	188	};
160		189
161	struct shopitems : zero_initialised	190	struct shopitems : zero_initialised
162	{	191	{
163	const char name; / name of the item in question, null if it is the default item */	192	const char name; / name of the item in question, null if it is the default item */
…		…
187	struct maptile : zero_initialised, attachable	216	struct maptile : zero_initialised, attachable
188	{	217	{
189	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */	218	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
190	struct mapspace spaces; / Array of spaces on this map */	219	struct mapspace spaces; / Array of spaces on this map */
191	uint8 regions; / region index per mapspace, if != 0 */	220	uint8 regions; / region index per mapspace, if != 0 */
192	struct region *regionmap; / index to region */	221	region_ptr regionmap; / index to region */
193		222
194	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */	223	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
195		224
196	shstr ACC (RW, name); /* Name of map as given by its creator */	225	shstr ACC (RW, name); /* Name of map as given by its creator */
197	struct region ACC (RW, default_region); / What jurisdiction in the game world this map is ruled by	226	region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
198	* points to the struct containing all the properties of	227	* points to the struct containing all the properties of
199	* the region */	228	* the region */
200	double ACC (RW, reset_time);	229	double ACC (RW, reset_time);
201	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map	230	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
202	* should be reset	231	* should be reset
203	*/	232	*/
204	bool ACC (RW, dirty); /* if true, something was inserted or removed */	233	bool ACC (RW, dirty); /* if true, something was inserted or removed */
		234	bool ACC (RW, no_reset); // must not reset this map
205	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by	235	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
206	* players entering/exiting map	236	* players entering/exiting map
207	*/	237	*/
208	sint32 ACC (RW, timeout); /* swapout is set to this */	238	sint32 ACC (RW, timeout); /* swapout is set to this */
209	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */	239	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
…		…
211	* be loaded before used. The map,omap and map_ob	241	* be loaded before used. The map,omap and map_ob
212	* arrays will be allocated when the map is loaded */	242	* arrays will be allocated when the map is loaded */
213	sint16 players; /* How many players are on this map right now */	243	sint16 players; /* How many players are on this map right now */
214	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	244	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
215		245
216	bool ACC (RW, active); // wether this map is active or not
217	bool ACC (RW, per_player);	246	bool ACC (RW, per_player);
218	bool ACC (RW, per_party);	247	bool ACC (RW, per_party);
219	bool ACC (RW, outdoor); /* True if an outdoor map */	248	bool ACC (RW, outdoor); /* True if an outdoor map */
220	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	249	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 */	250	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		251	static sint8 outdoor_darkness; /* the global darkness level outside */
222		252
223	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	253	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 */	254	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 */	255	oblinkpt buttons; / Linked list of linked lists of buttons */
226	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	256	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
241	maptile ACC (RW, tile_map[4]); / Next map, linked list */	271	maptile ACC (RW, tile_map[4]); / Next map, linked list */
242	shstr ACC (RW, path); /* Filename of the map */	272	shstr ACC (RW, path); /* Filename of the map */
243	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace	273	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	274	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
245		275
		276	// the maptile:: is neccessary here for the perl interface to work
		277	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		278	{
		279	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		280	}
		281
		282	static void adjust_daylight ();
		283
246	MTH void activate ();	284	MTH void activate ();
247	MTH void deactivate ();	285	MTH void deactivate ();
248		286
249	// allocates all (empty) mapspace	287	// allocates all (empty) mapspace
250	MTH void alloc ();	288	MTH void alloc ();
251	// deallocates the mapspaces (and destroys all objects)	289	// deallocates the mapspaces (and destroys all objects)
252	MTH void clear ();	290	MTH void clear ();
253		291
254	MTH void fix_auto_apply ();	292	MTH void fix_auto_apply ();
255	MTH void decay_objects ();	293	MTH void do_decay_objects ();
256	MTH void update_buttons ();	294	MTH void update_buttons ();
257	MTH int change_map_light (int change);	295	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;	296	MTH int estimate_difficulty () const;
		297
		298	MTH void play_sound (faceidx sound, int x, int y) const;
261		299
262	// set the given flag on all objects in the map	300	// set the given flag on all objects in the map
263	MTH void set_object_flag (int flag, int value = 1);	301	MTH void set_object_flag (int flag, int value = 1);
		302	MTH void post_load_original ();
264		303
265	MTH void link_multipart_objects ();	304	MTH void link_multipart_objects ();
266	MTH void clear_unique_items ();	305	MTH void clear_unique_items ();
267		306
268	MTH void clear_header ();	307	MTH void clear_header ();
269	MTH void clear_links_to (maptile *m);	308	MTH void clear_links_to (maptile *m);
270		309
271	MTH struct region *region (int x, int y) const;	310	MTH struct region *region (int x, int y) const;
272		311
273	// loas the header pseudo-object	312	// load the header pseudo-object
274	bool _load_header (object_thawer &thawer);	313	bool _load_header (object_thawer &thawer);
275	MTH bool _load_header (const char *path);	314	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
276		315
277	// load objects into the map	316	// load objects into the map
278	bool _load_objects (object_thawer &thawer);	317	bool _load_objects (object_thawer &thawer);
279	MTH bool _load_objects (const char *path, bool skip_header = true);	318	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
280		319
281	// save objects into the given file (uses IO_ flags)	320	// save objects into the given file (uses IO_ flags)
282	bool _save_objects (object_freezer &freezer, int flags);	321	bool _save_objects (object_freezer &freezer, int flags);
283	MTH bool _save_objects (const char *path, int flags);	322	MTH bool _save_objects (const char *path, int flags);
284		323
…		…
296	MTH int size () const { return width * height; }	335	MTH int size () const { return width * height; }
297		336
298	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	337	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
299		338
300	MTH void touch () { last_access = runtime; }	339	MTH void touch () { last_access = runtime; }
		340
		341	MTH maptile *tile_available (int dir, bool load = true);
301		342
302	// find the map that is at coordinate x\|y relative to this map	343	// find the map that is at coordinate x\|y relative to this map
303	// TODO: need a better way than passing by reference	344	// TODO: need a better way than passing by reference
304	// TODO: make perl interface	345	// TODO: make perl interface
305	maptile *xy_find (sint16 &x, sint16 &y);	346	maptile *xy_find (sint16 &x, sint16 &y);
…		…
317	}	358	}
318		359
319	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	360	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
320	bool generate_random_map (random_map_params *RP);	361	bool generate_random_map (random_map_params *RP);
321		362
322	static maptile find_async (const char path, maptile *original = 0);//PERL	363	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
323	static maptile find_sync (const char path, maptile *original = 0);//PERL	364	static maptile find_sync (const char path, maptile *original = 0);//PERL
324	static maptile find_style_sync (const char dir, const char *file = 0);//PERL	365	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
325	MTH object *pick_random_object () const;	366	object *pick_random_object (rand_gen &gen = rndm) const;
326		367
327	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	368	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
328	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	369
		370	// return an array of maprects corresponding
		371	// to the given rectangular area. the last rect will have
		372	// a 0 map pointer.
		373	// the array will be stored in a static memory area,
		374	// so recursion is not atm. supported
		375	maprect *split_to_tiles (int x0, int y0, int x1, int y1);
329	};	376	};
330		377
331	/* This is used by get_rangevector to determine where the other	378	/* This is used by get_rangevector to determine where the other
332	* creature is. get_rangevector takes into account map tiling,	379	* creature is. get_rangevector takes into account map tiling,
333	* so you just can not look the the map coordinates and get the	380	* so you just can not look the the map coordinates and get the
…		…
344	int distance_y;	391	int distance_y;
345	int direction;	392	int direction;
346	object *part;	393	object *part;
347	};	394	};
348		395
		396	// comaptibility cruft start
349	//TODO: these should be refactored into things like xy_normalise	397	//TODO: these should be refactored into things like xy_normalise
350	// and so on.	398	// and so on.
351	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	399	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
352	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
353	int out_of_map (maptile *m, int x, int y);	400	int out_of_map (maptile *m, int x, int y);
354	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	401	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
355	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	402	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
356	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	403	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
357	int on_same_map (const object op1, const object op2);	404	int on_same_map (const object op1, const object op2);
358	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	405	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
359		406
360	// adjust map, x and y for tiled maps and return true if the position is valid at all	407	// adjust map, x and y for tiled maps and return true if the position is valid at all
361	inline bool	408	static inline bool
362	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	409	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
363	{	410	{
364	// when in range, do a quick return, otherwise go the slow route	411	// when in range, do a quick return, otherwise go the slow route
365	return	412	return
366	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	413	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
367	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	414	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
368	}	415	}
		416	// comaptibility cruft end
369		417
370	inline mapspace &	418	inline mapspace &
371	object::ms () const	419	object::ms () const
372	{	420	{
373	return map->at (x, y);	421	return map->at (x, y);
374	}	422	}
375		423
		424	struct mapxy {
		425	maptile *m;
		426	sint16 x, y;
		427
		428	mapxy (maptile *m, sint16 x, sint16 y)
		429	: m(m), x(x), y(y)
		430	{ }
		431
		432	mapxy (object *op)
		433	: m(op->map), x(op->x), y(op->y)
		434	{ }
		435
		436	mapxy &move (int dx, int dy)
		437	{
		438	x += dx;
		439	y += dy;
		440
		441	return *this;
		442	}
		443
		444	mapxy &move (int dir)
		445	{
		446	return move (freearr_x [dir], freearr_y [dir]);
		447	}
		448
		449	operator void () const { return (void )m; }
		450	mapxy &operator =(const object *op)
		451	{
		452	m = op->map;
		453	x = op->x;
		454	y = op->y;
		455
		456	return *this;
		457	}
		458
		459	mapspace *operator ->() const { return &m->at (x, y); }
		460	mapspace &operator * () const { return m->at (x, y); }
		461
		462	bool normalise ()
		463	{
		464	return xy_normalise (m, x, y);
		465	}
		466
		467	mapspace &ms () const
		468	{
		469	return m->at (x, y);
		470	}
		471
		472	object insert (object op, object *originator = 0, int flags = 0) const
		473	{
		474	return m->insert (op, x, y, originator, flags);
		475	}
		476	};
		477
		478	inline const mapxy &
		479	object::operator =(const mapxy &pos)
		480	{
		481	map = pos.m;
		482	x = pos.x;
		483	y = pos.y;
		484
		485	return pos;
		486	}
		487
		488	// iterate over a rectangular area relative to op
		489	// can be used as a single statement, but both iterate macros
		490	// invocations must not be followed by a ";"
		491	// see common/los.C for usage example
		492	// the walk will be ordered, outer loop x, inner loop y
		493	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		494	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		495	for (int dx = (dx0); dx <= (dx1); ++dx) \
		496	{ \
		497	sint16 nx, ny; \
		498	maptile *m = 0; \
		499	\
		500	for (int dy = (dy0); dy <= (dy1); ++dy) \
		501	{ \
		502	/* check to see if we can simply go one down quickly, */ \
		503	/* if not, do it the slow way */ \
		504	if (!m \|\| ++ny >= m->height) \
		505	{ \
		506	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		507	\
		508	if (!xy_normalise (m, nx, ny)) \
		509	m = 0; \
		510	}
		511
		512	#define ordered_mapwalk_end \
		513	} \
		514	}
		515
		516	// loop over every space in the given maprect,
		517	// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
		518	// the iterator code must be a single statement following this macro call, similar to "if"
		519	#define rect_mapwalk(rect,dx0,dy0) \
		520	statementvar (maptile *, m, (rect)->m) \
		521	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		522	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		523	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		524	statementvar (int, dy, ny + (rect)->dy - (dy0))
		525
		526	// same as above, but the walk will not follow any particular
		527	// order (unorded), but is likely faster.
		528	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		529	#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
		530	for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
		531	(op)->x + (dx0) , (op)->y + (dy0) , \
		532	(op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
		533	r_e_c_t->m; \
		534	++r_e_c_t) \
		535	rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
		536
376	#endif	537	#endif
377		538

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.76 by root, Mon May 28 21:15:56 2007 UTC vs. Revision 1.107 by root, Sat Dec 27 08:41:44 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.76 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.107 by root, Sat Dec 27 08:41:44 2008 UTC