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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.93 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.133 by root, Tue May 4 22:26:49 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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 <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/*	25	/*
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
		55	// tile map index
		56	enum {
		57	TILE_UP = 0,
		58	TILE_RIGHT = 1,
		59	TILE_DOWN = 2,
		60	TILE_LEFT = 3,
		61	};
		62
52	/* Values for in_memory below */	63	/* Values for in_memory below */
53	enum {	64	enum {
54	MAP_ACTIVE,	65	MAP_ACTIVE,
55	MAP_INACTIVE, // not used atm.	66	MAP_INACTIVE, // not used atm.
56	MAP_SWAPPED,	67	MAP_SWAPPED,
…		…
63	* 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
64	* consistent (eg, op->map, op->x, op->y)	75	* consistent (eg, op->map, op->x, op->y)
65	*/	76	*/
66	// all those macros are herewith declared legacy	77	// all those macros are herewith declared legacy
67	#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 ()
68	#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
69	#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
70	#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
71	#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]
72	#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
73	#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
…		…
83	/* 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
84	* in the object flags structure.	94	* in the object flags structure.
85	*/	95	*/
86	#define P_BLOCKSVIEW 0x01	96	#define P_BLOCKSVIEW 0x01
87	#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 */
88	#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 */
89	#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,
90	* that means, nothing harmful can be done,	100	* that means, nothing harmful can be done,
91	* such as: bombs, potion usage, alchemy, spells	101	* such as: bombs, potion usage, alchemy, spells
92	* this was introduced to make shops safer	102	* this was introduced to make shops safer
93	* 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 */
94	#define P_IS_ALIVE 0x10 /* something alive is on this space */	106	#define P_IS_ALIVE 0x20 /* something alive is on this space */
95	#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
96
97	#define P_UPTODATE 0x80 /* this space is up to date */	107	#define P_UPTODATE 0x80 // this space is up to date
98		108
99	/* 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
100	* 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
101	* 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
102	* 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
103	* lots of duplicate checks currently in the code.	113	* lots of duplicate checks currently in the code.
104	*/	114	*/
105	#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 */
106	#define P_NEW_MAP 0x20000	116	#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
107	/* Coordinates passed result in a new tiled map */
108		117
109	/* Instead of having numerous arrays that have information on a	118	/* Instead of having numerous arrays that have information on a
110	* particular space (was map, floor, floor2, map_ob),	119	* particular space (was map, floor, floor2, map_ob),
111	* have this structure take care of that information.	120	* have this structure take care of that information.
112	* 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
113	* to extend information about a space.	122	* to extend information about a space.
114	*/	123	*/
		124	INTERFACE_CLASS (mapspace)
115	struct mapspace	125	struct mapspace
116	{	126	{
		127	object *ACC (RW, bot);
117	object bot, top; /* lowest/highest object on this space */	128	object ACC (RW, top); / lowest/highest object on this space */
118	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 */
119	uint8 flags_; /* flags about this space (see the P_ values above) */	130	uint8 flags_; /* flags about this space (see the P_ values above) */
120	sint8 light; /* How much light this space provides */	131	sint8 ACC (RW, light); /* How much light this space provides */
121	MoveType move_block; /* What movement types this space blocks */	132	MoveType ACC (RW, move_block); /* What movement types this space blocks */
122	MoveType move_slow; /* What movement types this space slows */	133	MoveType ACC (RW, move_slow); /* What movement types this space slows */
123	MoveType move_on; /* What movement types are activated */	134	MoveType ACC (RW, move_on); /* What movement types are activated */
124	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
125		144
126	void update_ ();	145	void update_ ();
127	void update ()	146	MTH void update ()
128	{	147	{
129	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))
130	update_ ();	154	update_ ();
131	}
132		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
133	uint8 flags ()	161	MTH uint8 flags ()
134	{	162	{
135	update ();	163	update ();
136	return flags_;	164	return flags_;
137	}	165	}
		166
		167	MTH void invalidate ()
		168	{
		169	flags_ = 0;
		170	}
138		171
139	// maybe only inline quick flags_ checking?
140	object *player ()	172	MTH object *player ()
141	{	173	{
142	// search from the top, because players are usually on top	174	object *op;
143	// make usually == always and this non-amortized O(1)	175
144	// could gte rid of P_PLAYER, too, then
145	if (flags () & P_PLAYER)	176	if (flags () & P_PLAYER)
146	for (object *op = top; op; op = op->below)	177	for (op = top; op->type != PLAYER; op = op->below)
147	if (op->type == PLAYER)	178	;
148	return op;	179	else
		180	op = 0;
149		181
150	return 0;	182	return op;
		183	}
		184
		185	MTH uint32 items()
		186	{
		187	update ();
		188	return items_;
151	}	189	}
152		190
153	// return the item volume on this mapspace in cm³	191	// return the item volume on this mapspace in cm³
154	uint64 volume () const;	192	MTH uint64 volume ()
		193	{
		194	update ();
		195	return volume_ * 1024;
		196	}
155		197
156	bool blocks (MoveType mt) const	198	bool blocks (MoveType mt) const
157	{	199	{
158	return move_block && (mt & move_block) == mt;	200	return move_block && (mt & move_block) == mt;
159	}	201	}
		202
		203	bool blocks (object *op) const
		204	{
		205	return blocks (op->move_type);
		206	}
160	};	207	};
		208
		209	// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
		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
161		219
162	struct shopitems : zero_initialised	220	struct shopitems : zero_initialised
163	{	221	{
164	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 */
165	const char name_pl; / plural name */	223	const char name_pl; / plural name */
…		…
216	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 */
217		275
218	bool ACC (RW, per_player);	276	bool ACC (RW, per_player);
219	bool ACC (RW, per_party);	277	bool ACC (RW, per_party);
220	bool ACC (RW, outdoor); /* True if an outdoor map */	278	bool ACC (RW, outdoor); /* True if an outdoor map */
221	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 */
222	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 */
223		282
224	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 */
225	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 */
226	oblinkpt buttons; / Linked list of linked lists of buttons */	285	oblinkpt buttons; / Linked list of linked lists of buttons */
227	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
228	sint16 ACC (RW, pressure); /* barometric pressure (mb) */
229	sint8 ACC (RW, humid); /* humitidy of this tile */
230	sint8 ACC (RW, windspeed); /* windspeed of this tile */
231	sint8 ACC (RW, winddir); /* direction of wind */
232	sint8 ACC (RW, sky); /* sky conditions */
233	int ACC (RW, worldpartx), ACC (RW, worldparty); /Highly fasten conversion between worldmap and weathermap /
234	struct shopitems shopitems; / a semi-colon seperated list of item-types the map's shop will trade in */	286	struct shopitems shopitems; / a semi-colon seperated list of item-types the map's shop will trade in */
235	shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */	287	shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
236	double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */	288	double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
237	sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */	289	sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
238	sint64 ACC (RW, shopmax); /* maximum price a shop will offer */	290	sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
239	shstr ACC (RW, msg); /* Message map creator may have left */	291	shstr ACC (RW, msg); /* Message map creator may have left */
240	shstr ACC (RW, maplore); /* Map lore information */	292	shstr ACC (RW, maplore); /* Map lore information */
241	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	293	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
242	maptile ACC (RW, tile_map[4]); / Next map, linked list */	294	maptile ACC (RW, tile_map[4]); / Next map, linked list */
243	shstr ACC (RW, path); /* Filename of the map */	295	shstr ACC (RW, path); /* Filename of the map */
244	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
245	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace	296	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
		297	int ACC (RW, max_items); // maximum number of items on a mapspace
		298
		299	//-GPL
		300
		301	// the maptile:: is neccessary here for the perl interface to work
		302	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		303	{
		304	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		305	}
		306
		307	static void adjust_daylight ();
246		308
247	MTH void activate ();	309	MTH void activate ();
248	MTH void deactivate ();	310	MTH void deactivate ();
249		311
250	// allocates all (empty) mapspace	312	// allocates all (empty) mapspace
251	MTH void alloc ();	313	MTH void alloc ();
252	// deallocates the mapspaces (and destroys all objects)	314	// deallocates the mapspaces (and destroys all objects)
253	MTH void clear ();	315	MTH void clear ();
254		316
		317	MTH void post_load (); // update cached values in mapspaces etc.
255	MTH void fix_auto_apply ();	318	MTH void fix_auto_apply ();
256	MTH void do_decay_objects ();	319	MTH void do_decay_objects ();
257	MTH void update_buttons ();	320	MTH void update_buttons ();
258	MTH int change_map_light (int change);	321	MTH int change_map_light (int change);
259	static void change_all_map_light (int change); //PERL
260	MTH void set_darkness_map ();
261	MTH int estimate_difficulty () const;	322	MTH int estimate_difficulty () const;
262		323
263	MTH void play_sound (faceidx sound, int x, int y) const;	324	MTH void play_sound (faceidx sound, int x, int y) const;
		325	MTH void say_msg (const_utf8_string msg, int x, int y) const;
		326
		327	// connected links
		328	oblinkpt *find_link (shstr_tmp id);
		329	MTH void trigger (shstr_tmp id, int state = 1, object activator = 0, object originator = 0);
264		330
265	// set the given flag on all objects in the map	331	// set the given flag on all objects in the map
266	MTH void set_object_flag (int flag, int value = 1);	332	MTH void set_object_flag (int flag, int value = 1);
		333	MTH void post_load_original ();
267		334
268	MTH void link_multipart_objects ();	335	MTH void link_multipart_objects ();
269	MTH void clear_unique_items ();	336	MTH void clear_unique_items ();
270		337
271	MTH void clear_header ();	338	MTH void clear_header ();
…		…
281	bool _load_objects (object_thawer &thawer);	348	bool _load_objects (object_thawer &thawer);
282	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }	349	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
283		350
284	// save objects into the given file (uses IO_ flags)	351	// save objects into the given file (uses IO_ flags)
285	bool _save_objects (object_freezer &freezer, int flags);	352	bool _save_objects (object_freezer &freezer, int flags);
286	MTH bool _save_objects (const char *path, int flags);	353	MTH bool _save_objects (const_octet_string path, int flags);
287		354
288	// save the header pseudo object _only_	355	// save the header pseudo object _only_
289	bool _save_header (object_freezer &freezer);	356	bool _save_header (object_freezer &freezer);
290	MTH bool _save_header (const char *path);	357	MTH bool _save_header (const_octet_string path);
291		358
292	maptile ();	359	maptile ();
293	maptile (int w, int h);	360	maptile (int w, int h);
		361	void init ();
294	~maptile ();	362	~maptile ();
295		363
296	void do_destroy ();	364	void do_destroy ();
297	void gather_callbacks (AV *&callbacks, event_type event) const;	365	void gather_callbacks (AV *&callbacks, event_type event) const;
298		366
…		…
300		368
301	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	369	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
302		370
303	MTH void touch () { last_access = runtime; }	371	MTH void touch () { last_access = runtime; }
304		372
305	MTH bool tile_available (int dir, bool load = true);	373	MTH maptile *tile_available (int dir, bool load = true);
306		374
307	// find the map that is at coordinate x\|y relative to this map	375	// find the map that is at coordinate x\|y relative to this map
308	// TODO: need a better way than passing by reference	376	// TODO: need a better way than passing by reference
309	// TODO: make perl interface	377	// TODO: make perl interface
310	maptile *xy_find (sint16 &x, sint16 &y);	378	maptile *xy_find (sint16 &x, sint16 &y);
…		…
322	}	390	}
323		391
324	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	392	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
325	bool generate_random_map (random_map_params *RP);	393	bool generate_random_map (random_map_params *RP);
326		394
327	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL	395	static maptile find_async (const_utf8_string path, maptile original = 0, bool load = true);//PERL
328	static maptile find_sync (const char path, maptile *original = 0);//PERL	396	static maptile find_sync (const_utf8_string path, maptile original = 0);//PERL
329	static maptile find_style_sync (const char dir, const char *file = 0);//PERL	397	static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
330	object *pick_random_object (rand_gen &gen = rndm) const;	398	object *pick_random_object (rand_gen &gen = rndm) const;
331		399
332	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	400	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
333	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	401
		402	// return an array of maprects corresponding
		403	// to the given rectangular area. the last rect will have
		404	// a 0 map pointer.
		405	maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
		406
		407	MTH bool is_in_shop (int x, int y) const;
334	};	408	};
		409
		410	inline bool
		411	object::is_in_shop () const
		412	{
		413	return is_on_map ()
		414	&& map->is_in_shop (x, y);
		415	}
		416
		417	//+GPL
335		418
336	/* This is used by get_rangevector to determine where the other	419	/* This is used by get_rangevector to determine where the other
337	* creature is. get_rangevector takes into account map tiling,	420	* creature is. get_rangevector takes into account map tiling,
338	* so you just can not look the the map coordinates and get the	421	* so you just can not look the the map coordinates and get the
339	* righte value. distance_x/y are distance away, which	422	* righte value. distance_x/y are distance away, which
…		…
356	// and so on.	439	// and so on.
357	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	440	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
358	int out_of_map (maptile *m, int x, int y);	441	int out_of_map (maptile *m, int x, int y);
359	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	442	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
360	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	443	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
361	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	444	void get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector retval, int flags = 0 /unused*/);
362	int on_same_map (const object op1, const object op2);	445	int on_same_map (const object op1, const object op2);
363	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	446	int adjacent_map (maptile map1, maptile map2, int dx, int dy);
364		447
365	// adjust map, x and y for tiled maps and return true if the position is valid at all	448	// adjust map, x and y for tiled maps and return true if the position is valid at all
366	static inline bool	449	static inline bool
367	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	450	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
368	{	451	{
…		…
371	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	454	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
372	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	455	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
373	}	456	}
374	// comaptibility cruft end	457	// comaptibility cruft end
375		458
		459	//-GPL
		460
376	inline mapspace &	461	inline mapspace &
377	object::ms () const	462	object::ms () const
378	{	463	{
379	return map->at (x, y);	464	return map->at (x, y);
380	}	465	}
…		…
420	bool normalise ()	505	bool normalise ()
421	{	506	{
422	return xy_normalise (m, x, y);	507	return xy_normalise (m, x, y);
423	}	508	}
424		509
		510	mapspace &ms () const
		511	{
		512	return m->at (x, y);
		513	}
		514
425	object insert (object op, object *originator = 0, int flags = 0) const	515	object insert (object op, object *originator = 0, int flags = 0) const
426	{	516	{
427	m->insert (op, x, y, originator, flags);	517	return m->insert (op, x, y, originator, flags);
428	}	518	}
429	};	519	};
430		520
431	inline const mapxy &	521	inline const mapxy &
432	object::operator =(const mapxy &pos)	522	object::operator =(const mapxy &pos)
…		…
436	y = pos.y;	526	y = pos.y;
437		527
438	return pos;	528	return pos;
439	}	529	}
440		530
		531	// iterate over a rectangular area relative to op
		532	// can be used as a single statement, but both iterate macros
		533	// invocations must not be followed by a ";"
		534	// see common/los.C for usage example
		535	// the walk will be ordered, outer loop x, inner loop y
		536	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		537	// "continue" will skip to the next space
		538	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		539	for (int dx = (dx0); dx <= (dx1); ++dx) \
		540	{ \
		541	sint16 nx, ny; \
		542	maptile *m = 0; \
		543	\
		544	for (int dy = (dy0); dy <= (dy1); ++dy) \
		545	{ \
		546	/* check to see if we can simply go one down quickly, */ \
		547	/* if not, do it the slow way */ \
		548	if (!m \|\| ++ny >= m->height) \
		549	{ \
		550	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		551	\
		552	if (!xy_normalise (m, nx, ny)) \
		553	m = 0; \
		554	}
		555
		556	#define ordered_mapwalk_end \
		557	} \
		558	}
		559
		560	extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
		561
		562	// loop over every space in the given maprect,
		563	// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
		564	// the iterator code must be a single statement following this macro call, similar to "if"
		565	// "continue" will skip to the next space
		566	#define rect_mapwalk(rect,dx0,dy0) \
		567	statementvar (maptile *, m, (rect)->m) \
		568	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		569	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		570	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		571	statementvar (int, dy, ny + (rect)->dy - (dy0))
		572
		573	// same as ordered_mapwalk, but the walk will not follow any particular
		574	// order (unorded), but is likely faster.
		575	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		576	// "continue" will skip to the next space
		577	#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
		578	for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
		579	(ox) + (dx0) , (oy) + (dy0) , \
		580	(ox) + (dx1) + 1, (oy) + (dy1) + 1); \
		581	r_e_c_t->m; \
		582	++r_e_c_t) \
		583	rect_mapwalk (r_e_c_t, (ox), (oy))
		584
		585	#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
		586	unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
		587
441	#endif	588	#endif
442		589

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.93 by root, Tue May 6 16:55:26 2008 UTC vs. Revision 1.133 by root, Tue May 4 22:26:49 2010 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.93 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.133 by root, Tue May 4 22:26:49 2010 UTC