[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.144 by root, Sat May 7 17:12:28 2011 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,2011 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
…		…
45	* map pointers.	48	* map pointers.
46	*/	49	*/
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 */	55	// tile map index
53	enum {	56	enum
54	MAP_ACTIVE,	57	{
55	MAP_INACTIVE, // not used atm.	58	TILE_NORTH,
56	MAP_SWAPPED,	59	TILE_EAST,
57	MAP_LOADING,	60	TILE_SOUTH,
58	MAP_SAVING,	61	TILE_WEST,
		62	TILE_UP,
		63	TILE_DOWN,
		64	TILE_NUM,
		65	};
		66
		67	/* Values for state below */
		68	enum
		69	{
		70	MAP_SWAPPED, // header loaded, nothing else
		71	MAP_INACTIVE, // in memory, linkable, but not active
		72	MAP_ACTIVE, // running!
59	};	73	};
60		74
61	/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should	75	/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
62	* really be used, as it is multi tile aware. However, there are some cases	76	* really be used, as it is multi tile aware. However, there are some cases
63	* where it is known the map is not tiled or the values are known	77	* where it is known the map is not tiled or the values are known
64	* consistent (eg, op->map, op->x, op->y)	78	* consistent (eg, op->map, op->x, op->y)
65	*/	79	*/
66	// all those macros are herewith declared legacy	80	// all those macros are herewith declared legacy
67	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()	81	#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	82	#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	83	#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]	84	#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	85	#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	86	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
…		…
78	* should almost always be using out_of_map instead, which takes into account	91	* should almost always be using out_of_map instead, which takes into account
79	* map tiling.	92	* map tiling.
80	*/	93	*/
81	#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))	94	#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
82		95
83	/* These are used in the MapLook flags element. They are not used in	96	/* These are used in the mapspace flags element. They are not used in
84	* in the object flags structure.	97	* in the object flags structure.
85	*/	98	*/
86	#define P_BLOCKSVIEW 0x01	99	#define P_BLOCKSVIEW 0x01
87	#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */	100	#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 */	101	#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,	102	#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
90	* that means, nothing harmful can be done,	103	* that means, nothing harmful can be done,
91	* such as: bombs, potion usage, alchemy, spells	104	* such as: bombs, potion usage, alchemy, spells
92	* this was introduced to make shops safer	105	* this was introduced to make shops safer
93	* but is useful in other situations */	106	* but is useful in other situations */
		107
		108	#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 */	109	#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 */	110	#define P_UPTODATE 0x80 // this space is up to date
98		111
99	/* The following two values are not stored in the MapLook flags, but instead	112	/* 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	113	* 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	114	* 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	115	* function that does more of the work can hopefully be used to replace
103	* lots of duplicate checks currently in the code.	116	* lots of duplicate checks currently in the code.
104	*/	117	*/
105	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */	118	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
106	#define P_NEW_MAP 0x20000	119	#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
107	/* Coordinates passed result in a new tiled map */	120
		121	// persistent flags (pflags) in mapspace
		122	enum
		123	{
		124	PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
		125	};
108		126
109	/* Instead of having numerous arrays that have information on a	127	/* Instead of having numerous arrays that have information on a
110	* particular space (was map, floor, floor2, map_ob),	128	* particular space (was map, floor, floor2, map_ob),
111	* have this structure take care of that information.	129	* have this structure take care of that information.
112	* This puts it all in one place, and should also make it easier	130	* This puts it all in one place, and should also make it easier
113	* to extend information about a space.	131	* to extend information about a space.
114	*/	132	*/
		133	INTERFACE_CLASS (mapspace)
115	struct mapspace	134	struct mapspace
116	{	135	{
		136	object *ACC (RW, bot);
117	object bot, top; /* lowest/highest object on this space */	137	object ACC (RW, top); / lowest/highest object on this space */
118	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */	138	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) */	139	uint8 flags_; /* flags about this space (see the P_ values above) */
120	sint8 light; /* How much light this space provides */	140	sint8 ACC (RW, light); /* How much light this space provides */
121	MoveType move_block; /* What movement types this space blocks */	141	MoveType ACC (RW, move_block); /* What movement types this space blocks */
122	MoveType move_slow; /* What movement types this space slows */	142	MoveType ACC (RW, move_slow); /* What movement types this space slows */
123	MoveType move_on; /* What movement types are activated */	143	MoveType ACC (RW, move_on); /* What movement types are activated */
124	MoveType move_off; /* What movement types are activated */	144	MoveType ACC (RW, move_off); /* What movement types are activated */
		145	uint16_t ACC (RW, items_); // saturates at 64k
		146	uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
		147	uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
		148	static uint32_t ACC (RW, smellcount); // global smell counter
		149
		150	uint8_t pflags; // additional, persistent flags
		151	uint8_t pad [3]; // pad to 64 bytes on LP64 systems
		152
		153	//-GPL
125		154
126	void update_ ();	155	void update_ ();
127	void update ()	156	MTH void update ()
128	{	157	{
129	if (!(flags_ & P_UPTODATE))	158	// we take advantage of the fact that 0x80 is the sign bit
		159	// to generate more efficient code on many cpus
		160	assert (sint8 (P_UPTODATE) < 0);
		161	assert (sint8 (-1 & ~P_UPTODATE) >= 0);
		162
		163	if (expect_false (sint8 (flags_) >= 0))
130	update_ ();	164	update_ ();
131	}
132		165
		166	// must be true by now (gcc seems content with only the second test)
		167	assume (sint8 (flags_) < 0);
		168	assume (flags_ & P_UPTODATE);
		169	}
		170
133	uint8 flags ()	171	MTH uint8 flags ()
134	{	172	{
135	update ();	173	update ();
136	return flags_;	174	return flags_;
137	}	175	}
		176
		177	MTH void invalidate ()
		178	{
		179	flags_ = 0;
		180	}
138		181
139	// maybe only inline quick flags_ checking?
140	object *player ()	182	MTH object *player ()
141	{	183	{
142	// search from the top, because players are usually on top	184	object *op;
143	// make usually == always and this non-amortized O(1)	185
144	// could gte rid of P_PLAYER, too, then
145	if (flags () & P_PLAYER)	186	if (flags () & P_PLAYER)
146	for (object *op = top; op; op = op->below)	187	for (op = top; op->type != PLAYER; op = op->below)
147	if (op->type == PLAYER)	188	;
148	return op;	189	else
		190	op = 0;
149		191
150	return 0;	192	return op;
		193	}
		194
		195	MTH uint32 items()
		196	{
		197	update ();
		198	return items_;
151	}	199	}
152		200
153	// return the item volume on this mapspace in cm³	201	// return the item volume on this mapspace in cm³
154	uint64 volume () const;	202	MTH uint64 volume ()
		203	{
		204	update ();
		205	return volume_ * 1024;
		206	}
155		207
156	bool blocks (MoveType mt) const	208	bool blocks (MoveType mt) const
157	{	209	{
158	return move_block && (mt & move_block) == mt;	210	return move_block && (mt & move_block) == mt;
159	}	211	}
		212
		213	bool blocks (object *op) const
		214	{
		215	return blocks (op->move_type);
		216	}
160	};	217	};
		218
		219	// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
		220	struct maprect
		221	{
		222	maptile *m;
		223	int x0, y0;
		224	int x1, y1;
		225	int dx, dy; // offset to go from local coordinates to original tile */
		226	};
		227
		228	// (refcounted) list of objects on this map that need physics processing
		229	struct physics_queue
		230	: unordered_vector<object *>
		231	{
		232	int i; // already processed
		233	physics_queue ();
		234	~physics_queue ();
		235	object *pop ();
		236	};
		237
		238	#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks
		239
		240	//+GPL
161		241
162	struct shopitems : zero_initialised	242	struct shopitems : zero_initialised
163	{	243	{
164	const char name; / name of the item in question, null if it is the default item */	244	const char name; / name of the item in question, null if it is the default item */
165	const char name_pl; / plural name */	245	const char name_pl; / plural name */
…		…
205	bool ACC (RW, dirty); /* if true, something was inserted or removed */	285	bool ACC (RW, dirty); /* if true, something was inserted or removed */
206	bool ACC (RW, no_reset); // must not reset this map	286	bool ACC (RW, no_reset); // must not reset this map
207	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by	287	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
208	* players entering/exiting map	288	* players entering/exiting map
209	*/	289	*/
		290	uint8 ACC (RW, state); /* If not true, the map has been freed and must
		291	* be loaded before used. The map,omap and map_ob
		292	* arrays will be allocated when the map is loaded */
210	sint32 ACC (RW, timeout); /* swapout is set to this */	293	sint32 ACC (RW, timeout); /* swapout is set to this */
211	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */	294	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
212	uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
213	* be loaded before used. The map,omap and map_ob
214	* arrays will be allocated when the map is loaded */
215	sint16 players; /* How many players are on this map right now */	295	sint16 players; /* How many players are on this map right now */
216	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	296	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
217		297
218	bool ACC (RW, per_player);	298	bool ACC (RW, per_player);
219	bool ACC (RW, per_party);	299	bool ACC (RW, per_party);
220	bool ACC (RW, outdoor); /* True if an outdoor map */	300	bool ACC (RW, outdoor); /* True if an outdoor map */
221	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	301	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 */	302	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		303	static sint8 outdoor_darkness; /* the global darkness level outside */
223		304
224	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	305	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 */	306	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 */	307	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 */	308	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 */	309	shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
236	double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */	310	double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
237	sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */	311	sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
238	sint64 ACC (RW, shopmax); /* maximum price a shop will offer */	312	sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
239	shstr ACC (RW, msg); /* Message map creator may have left */	313	shstr ACC (RW, msg); /* Message map creator may have left */
240	shstr ACC (RW, maplore); /* Map lore information */	314	shstr ACC (RW, maplore); /* Map lore information */
241	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	315	shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
242	maptile ACC (RW, tile_map[4]); / Next map, linked list */	316	maptile ACC (RW, tile_map[TILE_NUM]); / Next map, linked list */
243	shstr ACC (RW, path); /* Filename of the map */	317	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	318	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
		319	int ACC (RW, max_items); // maximum number of items on a mapspace
		320
		321	//-GPL
		322
		323	physics_queue pq[PHYSICS_QUEUES];
		324	MTH void queue_physics (object *ob, int after = 0);
		325	MTH void queue_physics_at (int x, int y);
		326	MTH void post_load_physics ();
		327	MTH int run_physics (tick_t tick, int max_objects);
		328
		329	// the maptile:: is neccessary here for the perl interface to work
		330	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		331	{
		332	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		333	}
		334
		335	static void adjust_daylight ();
246		336
247	MTH void activate ();	337	MTH void activate ();
		338	MTH void activate_physics ();
248	MTH void deactivate ();	339	MTH void deactivate ();
249		340
250	// allocates all (empty) mapspace	341	// allocates all (empty) mapspace
251	MTH void alloc ();	342	MTH void alloc ();
252	// deallocates the mapspaces (and destroys all objects)	343	// deallocates the mapspaces (and destroys all objects)
253	MTH void clear ();	344	MTH void clear ();
254		345
		346	MTH void post_load (); // update cached values in mapspaces etc.
255	MTH void fix_auto_apply ();	347	MTH void fix_auto_apply ();
256	MTH void do_decay_objects ();	348	MTH void do_decay_objects ();
257	MTH void update_buttons ();	349	MTH void update_buttons ();
258	MTH int change_map_light (int change);	350	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;	351	MTH int estimate_difficulty () const;
262		352
263	MTH void play_sound (faceidx sound, int x, int y) const;	353	MTH void play_sound (faceidx sound, int x, int y) const;
		354	MTH void say_msg (const_utf8_string msg, int x, int y) const;
		355
		356	// connected links
		357	oblinkpt *find_link (shstr_tmp id);
		358	MTH void trigger (shstr_tmp id, int state = 1, object activator = 0, object originator = 0);
264		359
265	// set the given flag on all objects in the map	360	// set the given flag on all objects in the map
266	MTH void set_object_flag (int flag, int value = 1);	361	MTH void set_object_flag (int flag, int value = 1);
		362	MTH void post_load_original ();
267		363
268	MTH void link_multipart_objects ();	364	MTH void link_multipart_objects ();
269	MTH void clear_unique_items ();	365	MTH void clear_unique_items ();
270		366
271	MTH void clear_header ();	367	MTH void clear_header ();
…		…
281	bool _load_objects (object_thawer &thawer);	377	bool _load_objects (object_thawer &thawer);
282	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }	378	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
283		379
284	// save objects into the given file (uses IO_ flags)	380	// save objects into the given file (uses IO_ flags)
285	bool _save_objects (object_freezer &freezer, int flags);	381	bool _save_objects (object_freezer &freezer, int flags);
286	MTH bool _save_objects (const char *path, int flags);	382	MTH bool _save_objects (const_octet_string path, int flags);
287		383
288	// save the header pseudo object _only_	384	// save the header pseudo object _only_
289	bool _save_header (object_freezer &freezer);	385	bool _save_header (object_freezer &freezer);
290	MTH bool _save_header (const char *path);	386	MTH bool _save_header (const_octet_string path);
291		387
292	maptile ();	388	maptile ();
293	maptile (int w, int h);	389	maptile (int w, int h);
		390	void init ();
294	~maptile ();	391	~maptile ();
295		392
296	void do_destroy ();	393	void do_destroy ();
297	void gather_callbacks (AV *&callbacks, event_type event) const;	394	void gather_callbacks (AV *&callbacks, event_type event) const;
298		395
		396	MTH bool linkable () { return state >= MAP_INACTIVE; }
		397
299	MTH int size () const { return width * height; }	398	MTH int size () const { return width * height; }
300		399
301	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	400	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
302		401
303	MTH void touch () { last_access = runtime; }	402	MTH void touch () { last_access = runtime; }
304		403
305	MTH bool tile_available (int dir, bool load = true);	404	MTH maptile *tile_available (int dir, bool load = true);
306		405
307	// find the map that is at coordinate x\|y relative to this map	406	// find the map that is at coordinate x\|y relative to this map
308	// TODO: need a better way than passing by reference	407	// TODO: need a better way than passing by reference
309	// TODO: make perl interface	408	// TODO: make perl interface
310	maptile *xy_find (sint16 &x, sint16 &y);	409	maptile *xy_find (sint16 &x, sint16 &y);
…		…
319	{	418	{
320	if (!spaces)	419	if (!spaces)
321	do_load_sync ();	420	do_load_sync ();
322	}	421	}
323		422
324	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	423	void make_map_floor (char *layout, const char floorstyle, random_map_params *RP);
325	bool generate_random_map (random_map_params *RP);	424	bool generate_random_map (random_map_params *RP);
326		425
327	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL	426	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	427	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	428	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;	429	object *pick_random_object (rand_gen &gen = rndm) const;
331		430
332	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	431	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
333	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	432
		433	// return an array of maprects corresponding
		434	// to the given rectangular area. the last rect will have
		435	// a 0 map pointer.
		436	maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
		437
		438	MTH bool is_in_shop (int x, int y) const;
334	};	439	};
		440
		441	inline bool
		442	object::is_in_shop () const
		443	{
		444	return is_on_map ()
		445	&& map->is_in_shop (x, y);
		446	}
		447
		448	//+GPL
335		449
336	/* This is used by get_rangevector to determine where the other	450	/* This is used by get_rangevector to determine where the other
337	* creature is. get_rangevector takes into account map tiling,	451	* creature is. get_rangevector takes into account map tiling,
338	* so you just can not look the the map coordinates and get the	452	* so you just can not look the the map coordinates and get the
339	* righte value. distance_x/y are distance away, which	453	* righte value. distance_x/y are distance away, which
…		…
356	// and so on.	470	// and so on.
357	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	471	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);	472	int out_of_map (maptile *m, int x, int y);
359	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	473	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
360	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	474	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);	475	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);	476	int on_same_map (const object op1, const object op2);
363	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	477	int adjacent_map (maptile map1, maptile map2, int dx, int dy);
364		478
365	// adjust map, x and y for tiled maps and return true if the position is valid at all	479	// adjust map, x and y for tiled maps and return true if the position is valid at all
366	static inline bool	480	static inline bool
367	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	481	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
368	{	482	{
…		…
371	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	485	(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);	486	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
373	}	487	}
374	// comaptibility cruft end	488	// comaptibility cruft end
375		489
		490	//-GPL
		491
376	inline mapspace &	492	inline mapspace &
377	object::ms () const	493	object::ms () const
378	{	494	{
379	return map->at (x, y);	495	return map->at (x, y);
380	}	496	}
…		…
420	bool normalise ()	536	bool normalise ()
421	{	537	{
422	return xy_normalise (m, x, y);	538	return xy_normalise (m, x, y);
423	}	539	}
424		540
		541	mapspace &ms () const
		542	{
		543	return m->at (x, y);
		544	}
		545
425	object insert (object op, object *originator = 0, int flags = 0) const	546	object insert (object op, object *originator = 0, int flags = 0) const
426	{	547	{
427	m->insert (op, x, y, originator, flags);	548	return m->insert (op, x, y, originator, flags);
428	}	549	}
429	};	550	};
430		551
431	inline const mapxy &	552	inline const mapxy &
432	object::operator =(const mapxy &pos)	553	object::operator =(const mapxy &pos)
…		…
436	y = pos.y;	557	y = pos.y;
437		558
438	return pos;	559	return pos;
439	}	560	}
440		561
		562	// iterate over a rectangular area relative to op
		563	// can be used as a single statement, but both iterate macros
		564	// invocations must not be followed by a ";"
		565	// see common/los.C for usage example
		566	// the walk will be ordered, outer loop x, inner loop y
		567	// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
		568	// "continue" will skip to the next space
		569	#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
		570	for (int dx = (dx0); dx <= (dx1); ++dx) \
		571	{ \
		572	sint16 nx, ny; \
		573	maptile *m = 0; \
		574	\
		575	for (int dy = (dy0); dy <= (dy1); ++dy) \
		576	{ \
		577	/* check to see if we can simply go one down quickly, */ \
		578	/* if not, do it the slow way */ \
		579	if (!m \|\| ++ny >= m->height) \
		580	{ \
		581	nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
		582	\
		583	if (!xy_normalise (m, nx, ny)) \
		584	m = 0; \
		585	}
		586
		587	#define ordered_mapwalk_end \
		588	} \
		589	}
		590
		591	extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
		592
		593	// loop over every space in the given maprect,
		594	// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
		595	// the iterator code must be a single statement following this macro call, similar to "if"
		596	// "continue" will skip to the next space
		597	#define rect_mapwalk(rect,dx0,dy0) \
		598	statementvar (maptile *, m, (rect)->m) \
		599	for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
		600	for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
		601	statementvar (int, dx, nx + (rect)->dx - (dx0)) \
		602	statementvar (int, dy, ny + (rect)->dy - (dy0))
		603
		604	// same as ordered_mapwalk, but the walk will not follow any particular
		605	// order (unorded), but is likely faster.
		606	// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
		607	// "continue" will skip to the next space
		608	#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
		609	for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
		610	(ox) + (dx0) , (oy) + (dy0) , \
		611	(ox) + (dx1) + 1, (oy) + (dy1) + 1); \
		612	r_e_c_t->m; \
		613	++r_e_c_t) \
		614	rect_mapwalk (r_e_c_t, (ox), (oy))
		615
		616	#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
		617	unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
		618
441	#endif	619	#endif
442		620

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.144 by root, Sat May 7 17:12:28 2011 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.144 by root, Sat May 7 17:12:28 2011 UTC