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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs.
Revision 1.120 by root, Sun Nov 8 20:55:39 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
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		117
113	/* Instead of having numerous arrays that have information on a	118	/* Instead of having numerous arrays that have information on a
114	* particular space (was map, floor, floor2, map_ob),	119	* particular space (was map, floor, floor2, map_ob),
115	* have this structure take care of that information.	120	* have this structure take care of that information.
116	* 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
117	* to extend information about a space.	122	* to extend information about a space.
118	*/	123	*/
		124	INTERFACE_CLASS (mapspace)
119	struct mapspace	125	struct mapspace
120	{	126	{
		127	object *ACC (RW, bot);
121	object bot, top; /* lowest/highest object on this space */	128	object ACC (RW, top); / lowest/highest object on this space */
122	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 */
123	uint8 flags_; /* flags about this space (see the P_ values above) */	130	uint8 flags_; /* flags about this space (see the P_ values above) */
124	sint8 light; /* How much light this space provides */	131	sint8 ACC (RW, light); /* How much light this space provides */
125	MoveType move_block; /* What movement types this space blocks */	132	MoveType ACC (RW, move_block); /* What movement types this space blocks */
126	MoveType move_slow; /* What movement types this space slows */	133	MoveType ACC (RW, move_slow); /* What movement types this space slows */
127	MoveType move_on; /* What movement types are activated */	134	MoveType ACC (RW, move_on); /* What movement types are activated */
128	MoveType move_off; /* What movement types are activated */	135	MoveType ACC (RW, move_off); /* What movement types are activated */
		136	uint16_t ACC (RW, items_); // 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
129		144
130	void update_ ();	145	void update_ ();
131	void update ()	146	MTH void update ()
132	{	147	{
133	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 (sint8 (P_UPTODATE) < 0);
		151	assert (sint8 (-1 & ~P_UPTODATE) >= 0);
		152
		153	if (expect_false (sint8 (flags_) >= 0))
134	update_ ();	154	update_ ();
135	}
136		155
		156	// must be true by now (gcc seems content with only the second test)
		157	assume (sint8 (flags_) < 0);
		158	assume (flags_ & P_UPTODATE);
		159	}
		160
137	uint8 flags ()	161	MTH uint8 flags ()
138	{	162	{
139	update ();	163	update ();
140	return flags_;	164	return flags_;
141	}	165	}
		166
		167	MTH void invalidate ()
		168	{
		169	flags_ = 0;
		170	}
142		171
143	// maybe only inline quick flags_ checking?
144	object *player ()	172	MTH object *player ()
145	{	173	{
146	// search from the top, because players are usually on top	174	object *op;
147	// make usually == always and this non-amortized O(1)	175
148	// could gte rid of P_PLAYER, too, then
149	if (flags () & P_PLAYER)	176	if (flags () & P_PLAYER)
150	for (object *op = top; op; op = op->below)	177	for (op = top; op->type != PLAYER; op = op->below)
151	if (op->type == PLAYER)	178	;
152	return op;	179	else
		180	op = 0;
153		181
154	return 0;	182	return op;
		183	}
		184
		185	MTH uint32 items()
		186	{
		187	update ();
		188	return items_;
155	}	189	}
156		190
157	// return the item volume on this mapspace in cm³	191	// return the item volume on this mapspace in cm³
158	uint64 volume () const;	192	MTH uint64 volume ()
		193	{
		194	update ();
		195	return volume_ * 1024;
		196	}
		197
		198	bool blocks (MoveType mt) const
		199	{
		200	return move_block && (mt & move_block) == mt;
		201	}
		202
		203	bool blocks (object *op) const
		204	{
		205	return blocks (op->move_type);
		206	}
159	};	207	};
		208
		209	// a rectangular area of a map
		210	struct maprect
		211	{
		212	maptile *m;
		213	int x0, y0;
		214	int x1, y1;
		215	int dx, dy; // offset to go from local coordinates to original tile */
		216	};
		217
		218	//+GPL
160		219
161	struct shopitems : zero_initialised	220	struct shopitems : zero_initialised
162	{	221	{
163	const char name; / name of the item in question, null if it is the default item */	222	const char name; / name of the item in question, null if it is the default item */
164	const char name_pl; / plural name */	223	const char name_pl; / plural name */
…		…
215	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	274	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216		275
217	bool ACC (RW, per_player);	276	bool ACC (RW, per_player);
218	bool ACC (RW, per_party);	277	bool ACC (RW, per_party);
219	bool ACC (RW, outdoor); /* True if an outdoor map */	278	bool ACC (RW, outdoor); /* True if an outdoor map */
220	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	279	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 */	280	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		281	static sint8 outdoor_darkness; /* the global darkness level outside */
222		282
223	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	283	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 */	284	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 */	285	oblinkpt buttons; / Linked list of linked lists of buttons */
226	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	286	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
240	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	300	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
241	maptile ACC (RW, tile_map[4]); / Next map, linked list */	301	maptile ACC (RW, tile_map[4]); / Next map, linked list */
242	shstr ACC (RW, path); /* Filename of the map */	302	shstr ACC (RW, path); /* Filename of the map */
243	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace	303	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	304	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
		305	int ACC (RW, max_items); // maximum number of items on a mapspace
		306
		307	//-GPL
		308
		309	// the maptile:: is neccessary here for the perl interface to work
		310	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		311	{
		312	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		313	}
		314
		315	static void adjust_daylight ();
245		316
246	MTH void activate ();	317	MTH void activate ();
247	MTH void deactivate ();	318	MTH void deactivate ();
248		319
249	// allocates all (empty) mapspace	320	// allocates all (empty) mapspace
…		…
253		324
254	MTH void fix_auto_apply ();	325	MTH void fix_auto_apply ();
255	MTH void do_decay_objects ();	326	MTH void do_decay_objects ();
256	MTH void update_buttons ();	327	MTH void update_buttons ();
257	MTH int change_map_light (int change);	328	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;	329	MTH int estimate_difficulty () const;
261		330
262	MTH void play_sound (faceidx sound, int x, int y) const;	331	MTH void play_sound (faceidx sound, int x, int y) const;
		332	MTH void say_msg (const char *msg, int x, int y) const;
		333
		334	// connected links
		335	oblinkpt *find_link (shstr_tmp id);
		336	MTH void trigger (shstr_tmp id, int state = 1, object activator = 0, object originator = 0);
263		337
264	// set the given flag on all objects in the map	338	// set the given flag on all objects in the map
265	MTH void set_object_flag (int flag, int value = 1);	339	MTH void set_object_flag (int flag, int value = 1);
		340	MTH void post_load_original ();
266		341
267	MTH void link_multipart_objects ();	342	MTH void link_multipart_objects ();
268	MTH void clear_unique_items ();	343	MTH void clear_unique_items ();
269		344
270	MTH void clear_header ();	345	MTH void clear_header ();
271	MTH void clear_links_to (maptile *m);	346	MTH void clear_links_to (maptile *m);
272		347
273	MTH struct region *region (int x, int y) const;	348	MTH struct region *region (int x, int y) const;
274		349
275	// loas the header pseudo-object	350	// load the header pseudo-object
276	bool _load_header (object_thawer &thawer);	351	bool _load_header (object_thawer &thawer);
277	MTH bool _load_header (const char *path);	352	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
278		353
279	// load objects into the map	354	// load objects into the map
280	bool _load_objects (object_thawer &thawer);	355	bool _load_objects (object_thawer &thawer);
281	MTH bool _load_objects (const char *path, bool skip_header = true);	356	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
282		357
283	// save objects into the given file (uses IO_ flags)	358	// save objects into the given file (uses IO_ flags)
284	bool _save_objects (object_freezer &freezer, int flags);	359	bool _save_objects (object_freezer &freezer, int flags);
285	MTH bool _save_objects (const char *path, int flags);	360	MTH bool _save_objects (const char *path, int flags);
286		361
…		…
299		374
300	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	375	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
301		376
302	MTH void touch () { last_access = runtime; }	377	MTH void touch () { last_access = runtime; }
303		378
304	MTH bool tile_available (int dir, bool load = true);	379	MTH maptile *tile_available (int dir, bool load = true);
305		380
306	// find the map that is at coordinate x\|y relative to this map	381	// find the map that is at coordinate x\|y relative to this map
307	// TODO: need a better way than passing by reference	382	// TODO: need a better way than passing by reference
308	// TODO: make perl interface	383	// TODO: make perl interface
309	maptile *xy_find (sint16 &x, sint16 &y);	384	maptile *xy_find (sint16 &x, sint16 &y);
…		…
324	bool generate_random_map (random_map_params *RP);	399	bool generate_random_map (random_map_params *RP);
325		400
326	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL	401	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	402	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	403	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
329	MTH object *pick_random_object () const;	404	object *pick_random_object (rand_gen &gen = rndm) const;
330		405
331	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	406	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	407
		408	// return an array of maprects corresponding
		409	// to the given rectangular area. the last rect will have
		410	// a 0 map pointer.
		411	// the array will be stored in a static memory area,
		412	// so recursion is not atm. supported
		413	maprect *split_to_tiles (int x0, int y0, int x1, int y1);
333	};	414	};
		415
		416	//+GPL
334		417
335	/* This is used by get_rangevector to determine where the other	418	/* This is used by get_rangevector to determine where the other
336	* creature is. get_rangevector takes into account map tiling,	419	* creature is. get_rangevector takes into account map tiling,
337	* so you just can not look the the map coordinates and get the	420	* so you just can not look the the map coordinates and get the
338	* righte value. distance_x/y are distance away, which	421	* righte value. distance_x/y are distance away, which
…		…
348	int distance_y;	431	int distance_y;
349	int direction;	432	int direction;
350	object *part;	433	object *part;
351	};	434	};
352		435
		436	// comaptibility cruft start
353	//TODO: these should be refactored into things like xy_normalise	437	//TODO: these should be refactored into things like xy_normalise
354	// and so on.	438	// and so on.
355	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	439	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
356	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
357	int out_of_map (maptile *m, int x, int y);	440	int out_of_map (maptile *m, int x, int y);
358	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	441	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
359	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	442	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);	443	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);	444	int on_same_map (const object op1, const object op2);
362	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	445	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
363		446
364	// adjust map, x and y for tiled maps and return true if the position is valid at all	447	// adjust map, x and y for tiled maps and return true if the position is valid at all
365	inline bool	448	static inline bool
366	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	449	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
367	{	450	{
368	// when in range, do a quick return, otherwise go the slow route	451	// when in range, do a quick return, otherwise go the slow route
369	return	452	return
370	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	453	(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);	454	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
372	}	455	}
		456	// comaptibility cruft end
		457
		458	//-GPL
373		459
374	inline mapspace &	460	inline mapspace &
375	object::ms () const	461	object::ms () const
376	{	462	{
377	return map->at (x, y);	463	return map->at (x, y);
378	}	464	}
379		465
380	// not used anywhere yet
381	struct mapxy {	466	struct mapxy {
382	maptile *m;	467	maptile *m;
383	sint16 x, y;	468	sint16 x, y;
384		469
385	mapxy (maptile *m, sint16 x, sint16 y)	470	mapxy (maptile *m, sint16 x, sint16 y)
…		…
388		473
389	mapxy (object *op)	474	mapxy (object *op)
390	: m(op->map), x(op->x), y(op->y)	475	: m(op->map), x(op->x), y(op->y)
391	{ }	476	{ }
392		477
		478	mapxy &move (int dx, int dy)
		479	{
		480	x += dx;
		481	y += dy;
		482
		483	return *this;
		484	}
		485
393	mapxy &move (int dir)	486	mapxy &move (int dir)
394	{	487	{
395	x += freearr_x [dir];	488	return move (freearr_x [dir], freearr_y [dir]);
396	y += freearr_y [dir];
397
398	return *this;
399	}	489	}
400		490
401	operator void () const { return (void )m; }	491	operator void () const { return (void )m; }
402	mapxy &operator =(const object *op)	492	mapxy &operator =(const object *op)
403	{	493	{
…		…
407		497
408	return *this;	498	return *this;
409	}	499	}
410		500
411	mapspace *operator ->() const { return &m->at (x, y); }	501	mapspace *operator ->() const { return &m->at (x, y); }
412	mapspace operator () const { return &m->at (x, y); }	502	mapspace &operator * () const { return m->at (x, y); }
413		503
414	bool normalise ()	504	bool normalise ()
415	{	505	{
416	return xy_normalise (m, x, y);	506	return xy_normalise (m, x, y);
417	}	507	}
418		508
		509	mapspace &ms () const
		510	{
		511	return m->at (x, y);
		512	}
		513
419	object insert (object op, object *originator = 0, int flags = 0) const	514	object insert (object op, object *originator = 0, int flags = 0) const
420	{	515	{
421	m->insert (op, x, y, originator, flags);	516	return m->insert (op, x, y, originator, flags);
422	}	517	}
423	};	518	};
424		519
425	inline const mapxy &	520	inline const mapxy &
426	object::operator =(const mapxy &pos)	521	object::operator =(const mapxy &pos)
…		…
430	y = pos.y;	525	y = pos.y;
431		526
432	return pos;	527	return pos;
433	}	528	}
434		529
		530	// iterate over a rectangular area relative to op
		531	// can be used as a single statement, but both iterate macros
		532	// invocations must not be followed by a ";"
		533	// see common/los.C for usage example
		534	// the walk will be ordered, outer loop x, inner loop y
		535	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		536	// "continue" will skip to the next space
		537	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		538	for (int dx = (dx0); dx <= (dx1); ++dx) \
		539	{ \
		540	sint16 nx, ny; \
		541	maptile *m = 0; \
		542	\
		543	for (int dy = (dy0); dy <= (dy1); ++dy) \
		544	{ \
		545	/* check to see if we can simply go one down quickly, */ \
		546	/* if not, do it the slow way */ \
		547	if (!m \|\| ++ny >= m->height) \
		548	{ \
		549	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		550	\
		551	if (!xy_normalise (m, nx, ny)) \
		552	m = 0; \
		553	}
		554
		555	#define ordered_mapwalk_end \
		556	} \
		557	}
		558
		559	// loop over every space in the given maprect,
		560	// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
		561	// the iterator code must be a single statement following this macro call, similar to "if"
		562	// "continue" will skip to the next space
		563	#define rect_mapwalk(rect,dx0,dy0) \
		564	statementvar (maptile *, m, (rect)->m) \
		565	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		566	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		567	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		568	statementvar (int, dy, ny + (rect)->dy - (dy0))
		569
		570	// same as ordered_mapwalk, but the walk will not follow any particular
		571	// order (unorded), but is likely faster.
		572	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		573	// "continue" will skip to the next space
		574	#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \
		575	for (maprect *r_e_c_t = (map)->split_to_tiles ( \
		576	(ox) + (dx0) , (oy) + (dy0) , \
		577	(ox) + (dx1) + 1, (oy) + (dy1) + 1); \
		578	r_e_c_t->m; \
		579	++r_e_c_t) \
		580	rect_mapwalk (r_e_c_t, (ox), (oy))
		581
		582	#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
		583	unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
		584
435	#endif	585	#endif
436		586

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs. Revision 1.120 by root, Sun Nov 8 20:55:39 2009 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs.
Revision 1.120 by root, Sun Nov 8 20:55:39 2009 UTC