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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.46 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at crossfire@schmorp.de	22	* The authors can be reached via e-mail at crossfire@schmorp.de
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.
27	*/	28	*/
46	#define MAGIC_MAP_SIZE 50	47	#define MAGIC_MAP_SIZE 50
47	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2	48	#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
48		49
49	#define MAP_LAYERS 3	50	#define MAP_LAYERS 3
50		51
51	/* options passed to ready_map_name and load_original_map */
52	#define MAP_FLUSH 0x01
53	#define MAP_PLAYER_UNIQUE 0x02
54	#define MAP_BLOCK 0x04
55	#define MAP_STYLE 0x08
56	#define MAP_OVERLAY 0x10
57
58	/* Values for in_memory below. Should probably be an enumerations */	52	/* Values for in_memory below. Should probably be an enumerations */
59	#define MAP_IN_MEMORY 1	53	enum {
60	#define MAP_SWAPPED 2	54	MAP_IN_MEMORY,
61	#define MAP_LOADING 3	55	MAP_SWAPPED,
62	#define MAP_SAVING 4	56	MAP_LOADING,
		57	MAP_SAVING,
		58	};
63		59
64	/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should	60	/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
65	* really be used, as it is multi tile aware. However, there are some cases	61	* really be used, as it is multi tile aware. However, there are some cases
66	* where it is known the map is not tiled or the values are known	62	* where it is known the map is not tiled or the values are known
67	* consistent (eg, op->map, op->x, op->y)	63	* consistent (eg, op->map, op->x, op->y)
…		…
69	// all those macros are herewith declared legacy	65	// all those macros are herewith declared legacy
70	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()	66	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
71	#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light	67	#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
72	#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot	68	#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
73	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top	69	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
74	#define GET_MAP_FACE(M,X,Y,L) (M)->at((X),(Y)).faces[L]
75	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]	70	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
76	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block	71	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
77	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow	72	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
78	#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on	73	#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on
79	#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off	74	#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off
80		75
81	/* You should really know what you are doing before using this - you	76	/* You should really know what you are doing before using this - you
82	* should almost always be using out_of_map instead, which takes into account	77	* should almost always be using out_of_map instead, which takes into account
83	* map tiling.	78	* map tiling.
84	*/	79	*/
85	#define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 \|\| (Y)<0 \|\| (X)>=(M)->width \|\| (Y)>=(M)->height)	80	#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
86		81
87	/* These are used in the MapLook flags element. They are not used in	82	/* These are used in the MapLook flags element. They are not used in
88	* in the object flags structure.	83	* in the object flags structure.
89	*/	84	*/
90	#define P_BLOCKSVIEW 0x01	85	#define P_BLOCKSVIEW 0x01
…		…
122	* to extend information about a space.	117	* to extend information about a space.
123	*/	118	*/
124	struct mapspace	119	struct mapspace
125	{	120	{
126	object bot, top; /* lowest/highest object on this space */	121	object bot, top; /* lowest/highest object on this space */
127	New_Face faces[MAP_LAYERS]; / faces for the 3 layers */
128	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */	122	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */
129	uint8 flags_; /* flags about this space (see the P_ values above) */	123	uint8 flags_; /* flags about this space (see the P_ values above) */
130	sint8 light; /* How much light this space provides */	124	sint8 light; /* How much light this space provides */
131	MoveType move_block; /* What movement types this space blocks */	125	MoveType move_block; /* What movement types this space blocks */
132	MoveType move_slow; /* What movement types this space slows */	126	MoveType move_slow; /* What movement types this space slows */
…		…
157	if (op->type == PLAYER)	151	if (op->type == PLAYER)
158	return op;	152	return op;
159		153
160	return 0;	154	return 0;
161	}	155	}
		156
		157	// return the item volume on this mapspace in cm³
		158	uint64 volume () const;
162	};	159	};
163		160
164	/*	161	/*
165	* Each map is in a given region of the game world and links to a region definiton, so	162	* Each map is in a given region of the game world and links to a region definiton, so
166	* they have to appear here in the headers, before the mapdef	163	* they have to appear here in the headers, before the mapdef
167	*/	164	*/
168	INTERFACE_CLASS (region)	165	INTERFACE_CLASS (region)
169	struct region : zero_initialised	166	struct region : zero_initialised
170	{	167	{
171	struct region ACC (RW, next); / pointer to next region, NULL for the last one */
172	char ACC (RW, name); / Shortend name of the region as maps refer to it */	168	shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
173	char ACC (RW, parent_name); /	169	shstr ACC (RW, match); // a perl regex that matches map paths
174	* So that parent and child regions can be defined in
175	* any order, we keep hold of the parent_name during
176	* initialisation, and the children get assigned to their
177	* parents later. (before runtime on the server though)
178	* nothing outside the init code should ever use this value.
179	*/
180	struct region ACC (RW, parent); /	170	region ACC (RW, parent); /
181	* Pointer to the region that is a parent of the current	171	* Pointer to the region that is a parent of the current
182	* region, if a value isn't defined in the current region	172	* region, if a value isn't defined in the current region
183	* we traverse this series of pointers until it is.	173	* we traverse this series of pointers until it is.
184	*/	174	*/
185	char ACC (RW, longname); / Official title of the region, this might be defined	175	shstr ACC (RW, longname); /* Official title of the region, this might be defined
186	* to be the same as name*/	176	* to be the same as name*/
187	char ACC (RW, msg); / the description of the region */	177	shstr ACC (RW, msg); /* the description of the region */
		178	shstr ACC (RW, jailmap); /where a player that is arrested in this region should be imprisoned. /
		179	int ACC (RW, index);
188	uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */	180	uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
		181	sint16 ACC (RW, jailx), ACC (RW, jaily);/* The coodinates in jailmap to which the player should be sent. */
189	sint8 ACC (RW, fallback); /* whether, in the event of a region not existing,	182	bool ACC (RW, fallback); /* whether, in the event of a region not existing,
190	* this should be the one we fall back on as the default */	183	* this should be the one we fall back on as the default */
191	char ACC (RW, jailmap); /where a player that is arrested in this region should be imprisoned. */	184
192	sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */	185	static region *default_region ();
		186	static region find (const char name);
		187	static region find_fuzzy (const char name);
		188	static region *read (object_thawer &f);
193	};	189	};
		190
		191	typedef object_vector<region, &region::index> regionvec;
		192
		193	extern regionvec regions;
		194
		195	#define for_all_regions(var) \
		196	for (unsigned _i = 0; _i < regions.size (); ++_i) \
		197	declvar (region *, var, regions [_i])
194		198
195	struct shopitems : zero_initialised	199	struct shopitems : zero_initialised
196	{	200	{
197	const char name; / name of the item in question, null if it is the default item */	201	const char name; / name of the item in question, null if it is the default item */
198	const char name_pl; / plural name */	202	const char name_pl; / plural name */
…		…
220	INTERFACE_CLASS (maptile)	224	INTERFACE_CLASS (maptile)
221	struct maptile : zero_initialised, attachable	225	struct maptile : zero_initialised, attachable
222	{	226	{
223	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */	227	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
224	struct mapspace spaces; / Array of spaces on this map */	228	struct mapspace spaces; / Array of spaces on this map */
		229	uint8 regions; / region index per mapspace, if != 0 */
		230	struct region *regionmap; / index to region */
225		231
226	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */	232	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
227		233
228	shstr ACC (RW, name); /* Name of map as given by its creator */	234	shstr ACC (RW, name); /* Name of map as given by its creator */
229	struct region ACC (RW, region); / What jurisdiction in the game world this map is ruled by	235	struct region ACC (RW, default_region); / What jurisdiction in the game world this map is ruled by
230	* points to the struct containing all the properties of	236	* points to the struct containing all the properties of
231	* the region */	237	* the region */
232	double ACC (RW, reset_time);	238	double ACC (RW, reset_time);
233	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map	239	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
234	* should be reset	240	* should be reset
…		…
246	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	252	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
247		253
248	bool ACC (RW, per_player);	254	bool ACC (RW, per_player);
249	bool ACC (RW, per_party);	255	bool ACC (RW, per_party);
250	bool ACC (RW, outdoor); /* True if an outdoor map */	256	bool ACC (RW, outdoor); /* True if an outdoor map */
		257	bool ACC (RW, nodrop); /* avoid dropping anything on this map */
251	uint8 ACC (RW, darkness); /* indicates level of darkness of map */	258	uint8 ACC (RW, darkness); /* indicates level of darkness of map */
252		259
253	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	260	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
254	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */	261	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
255	oblinkpt buttons; / Linked list of linked lists of buttons */	262	oblinkpt buttons; / Linked list of linked lists of buttons */
…		…
268	shstr ACC (RW, msg); /* Message map creator may have left */	275	shstr ACC (RW, msg); /* Message map creator may have left */
269	shstr ACC (RW, maplore); /* Map lore information */	276	shstr ACC (RW, maplore); /* Map lore information */
270	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	277	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
271	maptile ACC (RW, tile_map[4]); / Next map, linked list */	278	maptile ACC (RW, tile_map[4]); / Next map, linked list */
272	shstr ACC (RW, path); /* Filename of the map */	279	shstr ACC (RW, path); /* Filename of the map */
		280	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
		281	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
273		282
274	MTH void activate ();	283	MTH void activate ();
275	MTH void deactivate ();	284	MTH void deactivate ();
276		285
277	// allocates all (empty) mapspace	286	// allocates all (empty) mapspace
…		…
294	MTH void clear_unique_items ();	303	MTH void clear_unique_items ();
295		304
296	MTH void clear_header ();	305	MTH void clear_header ();
297	MTH void clear_links_to (maptile *m);	306	MTH void clear_links_to (maptile *m);
298		307
		308	MTH struct region *region (int x, int y) const;
		309
299	// loas the header pseudo-object	310	// loas the header pseudo-object
300	bool load_header (object_thawer &thawer);	311	bool _load_header (object_thawer &thawer);
301	MTH bool load_header (const char *path);	312	MTH bool _load_header (const char *path);
302		313
303	// load objects into the map	314	// load objects into the map
304	bool load_objects (object_thawer &thawer);	315	bool _load_objects (object_thawer &thawer);
305	MTH bool load_objects (const char *path, bool skip_header = true);	316	MTH bool _load_objects (const char *path, bool skip_header = true);
306		317
307	// save objects into the given file (uses IO_ flags)	318	// save objects into the given file (uses IO_ flags)
308	bool save_objects (object_freezer &freezer, int flags);	319	bool _save_objects (object_freezer &freezer, int flags);
309	MTH bool save_objects (const char *path, int flags);	320	MTH bool _save_objects (const char *path, int flags);
310		321
311	// save the header pseudo object _only_	322	// save the header pseudo object _only_
312	bool save_header (object_freezer &freezer);	323	bool _save_header (object_freezer &freezer);
313	MTH bool save_header (const char *path);	324	MTH bool _save_header (const char *path);
314		325
315	maptile ();	326	maptile ();
316	maptile (int w, int h);	327	maptile (int w, int h);
317	~maptile ();	328	~maptile ();
318		329
…		…
323		334
324	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	335	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
325		336
326	MTH void touch () { last_access = runtime; }	337	MTH void touch () { last_access = runtime; }
327		338
328	// static maptile find_map (const char path, maptile *origin);//PERL	339	// find the map that is at coordinate x\|y relative to this map
329	//	340	// TODO: need a better way than passing by reference
330	// // load a map relative to this one	341	// TODO: make perl interface
331	// maptile find_map (const char path)	342	maptile *xy_find (sint16 &x, sint16 &y);
332	// {	343
333	// return find_map (path, this);	344	// like xy_find, but also loads the map
334	// }	345	maptile *xy_load (sint16 &x, sint16 &y);
335	//	346
336	// // customise this map for the given player
337	// // might return this or a completely new map
338	// maptile customise_for (object op);
339	//
340	// void do_force_map_sync ();//PERL	347	void do_load_sync ();//PERL
341	//	348
342	// // make sure the map is loaded	349	// make sure the map is loaded
343	// MTH void force_map_sync ()	350	MTH void load_sync ()
344	// {	351	{
345	// if (in_memory != MAP_IN_MEMORY)	352	if (!spaces)
346	// do_force_map_sync ();	353	do_load_sync ();
347	// }	354	}
348		355
		356	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
		357	bool generate_random_map (random_map_params *RP);
		358
349	static maptile load_map_sync (const char path, maptile *original = 0);//PERL	359	static maptile find_async (const char path, maptile *original = 0);//PERL
350	static void emergency_save ();//PERL	360	static maptile find_sync (const char path, maptile *original = 0);//PERL
		361	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
		362	MTH object *pick_random_object () const;
351		363
352	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	364	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
353	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	365	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
354	};	366	};
355		367
…		…
369	int distance_y;	381	int distance_y;
370	int direction;	382	int direction;
371	object *part;	383	object *part;
372	};	384	};
373		385
		386	//TODO: these should be refactored into things like xy_normalise
		387	// and so on.
		388	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
		389	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
		390	int out_of_map (maptile *m, int x, int y);
		391	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
		392	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
		393	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
		394	int on_same_map (const object op1, const object op2);
		395	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
		396
		397	// adjust map, x and y for tiled maps and return true if the position is valid at all
		398	inline bool
		399	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
		400	{
		401	// when in range, do a quick return, otherwise go the slow route
		402	return
		403	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
		404	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
		405	}
		406
374	inline mapspace &	407	inline mapspace &
375	object::ms () const	408	object::ms () const
376	{	409	{
377	return map->at (x, y);	410	return map->at (x, y);
378	}	411	}

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.46 by root, Mon Jan 1 12:28:47 2007 UTC vs. Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.46 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC