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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.71 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.112 by root, Tue May 5 04:51:56 2009 UTC

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

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.71 by root, Sun Mar 11 02:12:44 2007 UTC vs. Revision 1.112 by root, Tue May 5 04:51:56 2009 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.71 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.112 by root, Tue May 5 04:51:56 2009 UTC