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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.99 by root, Thu Dec 4 03:48:19 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
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 3 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,
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, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/*	24	/*
25	* The maptile is allocated each time a new map is opened.	25	* The maptile is allocated each time a new map is opened.
26	* It contains pointers (very indirectly) to all objects on the map.	26	* It contains pointers (very indirectly) to all objects on the map.
…		…
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	/* Values for in_memory below */
53	enum {	53	enum {
54	MAP_IN_MEMORY,	54	MAP_ACTIVE,
		55	MAP_INACTIVE, // not used atm.
55	MAP_SWAPPED,	56	MAP_SWAPPED,
56	MAP_LOADING,	57	MAP_LOADING,
57	MAP_SAVING,	58	MAP_SAVING,
58	};	59	};
59		60
…		…
62	* where it is known the map is not tiled or the values are known	63	* where it is known the map is not tiled or the values are known
63	* consistent (eg, op->map, op->x, op->y)	64	* consistent (eg, op->map, op->x, op->y)
64	*/	65	*/
65	// all those macros are herewith declared legacy	66	// all those macros are herewith declared legacy
66	#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()	67	#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	68	#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	69	#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]	70	#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
71	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block	71	#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
72	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow	72	#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
…		…
103	*/	103	*/
104	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */	104	#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
105	#define P_NEW_MAP 0x20000	105	#define P_NEW_MAP 0x20000
106	/* Coordinates passed result in a new tiled map */	106	/* Coordinates passed result in a new tiled map */
107		107
108	/* P_NO_PASS is used for ob_blocked() return value. It needs
109	* to be here to make sure the bits don't match with anything.
110	*/
111	#define P_NO_PASS 0x80000
112
113	/* Instead of having numerous arrays that have information on a	108	/* Instead of having numerous arrays that have information on a
114	* particular space (was map, floor, floor2, map_ob),	109	* particular space (was map, floor, floor2, map_ob),
115	* have this structure take care of that information.	110	* have this structure take care of that information.
116	* This puts it all in one place, and should also make it easier	111	* This puts it all in one place, and should also make it easier
117	* to extend information about a space.	112	* to extend information about a space.
118	*/	113	*/
		114	INTERFACE_CLASS (mapspace)
119	struct mapspace	115	struct mapspace
120	{	116	{
		117	object *ACC (RW, bot);
121	object bot, top; /* lowest/highest object on this space */	118	object ACC (RW, top); / lowest/highest object on this space */
122	object faces_obj[MAP_LAYERS];/ face objects for the 3 layers */	119	object ACC (RW, faces_obj[MAP_LAYERS]);/ face objects for the 3 layers */
123	uint8 flags_; /* flags about this space (see the P_ values above) */	120	uint8 flags_; /* flags about this space (see the P_ values above) */
124	sint8 light; /* How much light this space provides */	121	sint8 ACC (RW, light); /* How much light this space provides */
125	MoveType move_block; /* What movement types this space blocks */	122	MoveType ACC (RW, move_block); /* What movement types this space blocks */
126	MoveType move_slow; /* What movement types this space slows */	123	MoveType ACC (RW, move_slow); /* What movement types this space slows */
127	MoveType move_on; /* What movement types are activated */	124	MoveType ACC (RW, move_on); /* What movement types are activated */
128	MoveType move_off; /* What movement types are activated */	125	MoveType ACC (RW, move_off); /* What movement types are activated */
129		126
130	void update_ ();	127	void update_ ();
131	void update ()	128	MTH void update ()
132	{	129	{
133	if (!(flags_ & P_UPTODATE))	130	if (!(flags_ & P_UPTODATE))
134	update_ ();	131	update_ ();
135	}	132	}
136		133
137	uint8 flags ()	134	MTH uint8 flags ()
138	{	135	{
139	update ();	136	update ();
140	return flags_;	137	return flags_;
141	}	138	}
142		139
143	// maybe only inline quick flags_ checking?
144	object *player ()	140	MTH object *player ()
145	{	141	{
146	// search from the top, because players are usually on top	142	object *op;
147	// make usually == always and this non-amortized O(1)	143
148	// could gte rid of P_PLAYER, too, then
149	if (flags () & P_PLAYER)	144	if (flags () & P_PLAYER)
150	for (object *op = top; op; op = op->below)	145	for (op = top; op->type != PLAYER; op = op->below)
151	if (op->type == PLAYER)	146	;
152	return op;	147	else
		148	op = 0;
153		149
154	return 0;	150	return op;
155	}	151	}
156		152
157	// return the item volume on this mapspace in cm³	153	// return the item volume on this mapspace in cm³
158	uint64 volume () const;	154	MTH uint64 volume () const;
		155
		156	bool blocks (MoveType mt) const
		157	{
		158	return move_block && (mt & move_block) == mt;
		159	}
		160
		161	bool blocks (object *op) const
		162	{
		163	return blocks (op->move_type);
		164	}
159	};	165	};
160		166
161	struct shopitems : zero_initialised	167	struct shopitems : zero_initialised
162	{	168	{
163	const char name; / name of the item in question, null if it is the default item */	169	const char name; / name of the item in question, null if it is the default item */
…		…
215	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	221	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216		222
217	bool ACC (RW, per_player);	223	bool ACC (RW, per_player);
218	bool ACC (RW, per_party);	224	bool ACC (RW, per_party);
219	bool ACC (RW, outdoor); /* True if an outdoor map */	225	bool ACC (RW, outdoor); /* True if an outdoor map */
220	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	226	bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221	uint8 ACC (RW, darkness); /* indicates level of darkness of map */	227	uint8 ACC (RW, darkness); /* indicates level of darkness of map */
222		228
223	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	229	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */	230	uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225	oblinkpt buttons; / Linked list of linked lists of buttons */	231	oblinkpt buttons; / Linked list of linked lists of buttons */
…		…
261		267
262	MTH void play_sound (faceidx sound, int x, int y) const;	268	MTH void play_sound (faceidx sound, int x, int y) const;
263		269
264	// set the given flag on all objects in the map	270	// set the given flag on all objects in the map
265	MTH void set_object_flag (int flag, int value = 1);	271	MTH void set_object_flag (int flag, int value = 1);
		272	MTH void post_load_original ();
266		273
267	MTH void link_multipart_objects ();	274	MTH void link_multipart_objects ();
268	MTH void clear_unique_items ();	275	MTH void clear_unique_items ();
269		276
270	MTH void clear_header ();	277	MTH void clear_header ();
271	MTH void clear_links_to (maptile *m);	278	MTH void clear_links_to (maptile *m);
272		279
273	MTH struct region *region (int x, int y) const;	280	MTH struct region *region (int x, int y) const;
274		281
275	// loas the header pseudo-object	282	// load the header pseudo-object
276	bool _load_header (object_thawer &thawer);	283	bool _load_header (object_thawer &thawer);
277	MTH bool _load_header (const char *path);	284	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
278		285
279	// load objects into the map	286	// load objects into the map
280	bool _load_objects (object_thawer &thawer);	287	bool _load_objects (object_thawer &thawer);
281	MTH bool _load_objects (const char *path, bool skip_header = true);	288	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
282		289
283	// save objects into the given file (uses IO_ flags)	290	// save objects into the given file (uses IO_ flags)
284	bool _save_objects (object_freezer &freezer, int flags);	291	bool _save_objects (object_freezer &freezer, int flags);
285	MTH bool _save_objects (const char *path, int flags);	292	MTH bool _save_objects (const char *path, int flags);
286		293
…		…
298	MTH int size () const { return width * height; }	305	MTH int size () const { return width * height; }
299		306
300	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	307	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
301		308
302	MTH void touch () { last_access = runtime; }	309	MTH void touch () { last_access = runtime; }
		310
		311	MTH bool tile_available (int dir, bool load = true);
303		312
304	// find the map that is at coordinate x\|y relative to this map	313	// find the map that is at coordinate x\|y relative to this map
305	// TODO: need a better way than passing by reference	314	// TODO: need a better way than passing by reference
306	// TODO: make perl interface	315	// TODO: make perl interface
307	maptile *xy_find (sint16 &x, sint16 &y);	316	maptile *xy_find (sint16 &x, sint16 &y);
…		…
319	}	328	}
320		329
321	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	330	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
322	bool generate_random_map (random_map_params *RP);	331	bool generate_random_map (random_map_params *RP);
323		332
324	static maptile find_async (const char path, maptile *original = 0);//PERL	333	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
325	static maptile find_sync (const char path, maptile *original = 0);//PERL	334	static maptile find_sync (const char path, maptile *original = 0);//PERL
326	static maptile find_style_sync (const char dir, const char *file = 0);//PERL	335	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
327	MTH object *pick_random_object () const;	336	object *pick_random_object (rand_gen &gen = rndm) const;
328		337
329	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	338	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
330	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }	339	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
331	};	340	};
332		341
…		…
346	int distance_y;	355	int distance_y;
347	int direction;	356	int direction;
348	object *part;	357	object *part;
349	};	358	};
350		359
		360	// comaptibility cruft start
351	//TODO: these should be refactored into things like xy_normalise	361	//TODO: these should be refactored into things like xy_normalise
352	// and so on.	362	// and so on.
353	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	363	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
354	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
355	int out_of_map (maptile *m, int x, int y);	364	int out_of_map (maptile *m, int x, int y);
356	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	365	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
357	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	366	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
358	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	367	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
359	int on_same_map (const object op1, const object op2);	368	int on_same_map (const object op1, const object op2);
360	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	369	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
361		370
362	// adjust map, x and y for tiled maps and return true if the position is valid at all	371	// adjust map, x and y for tiled maps and return true if the position is valid at all
363	inline bool	372	static inline bool
364	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	373	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
365	{	374	{
366	// when in range, do a quick return, otherwise go the slow route	375	// when in range, do a quick return, otherwise go the slow route
367	return	376	return
368	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	377	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
369	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	378	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
370	}	379	}
		380	// comaptibility cruft end
371		381
372	inline mapspace &	382	inline mapspace &
373	object::ms () const	383	object::ms () const
374	{	384	{
375	return map->at (x, y);	385	return map->at (x, y);
376	}	386	}
377		387
		388	struct mapxy {
		389	maptile *m;
		390	sint16 x, y;
		391
		392	mapxy (maptile *m, sint16 x, sint16 y)
		393	: m(m), x(x), y(y)
		394	{ }
		395
		396	mapxy (object *op)
		397	: m(op->map), x(op->x), y(op->y)
		398	{ }
		399
		400	mapxy &move (int dx, int dy)
		401	{
		402	x += dx;
		403	y += dy;
		404
		405	return *this;
		406	}
		407
		408	mapxy &move (int dir)
		409	{
		410	return move (freearr_x [dir], freearr_y [dir]);
		411	}
		412
		413	operator void () const { return (void )m; }
		414	mapxy &operator =(const object *op)
		415	{
		416	m = op->map;
		417	x = op->x;
		418	y = op->y;
		419
		420	return *this;
		421	}
		422
		423	mapspace *operator ->() const { return &m->at (x, y); }
		424	mapspace &operator * () const { return m->at (x, y); }
		425
		426	bool normalise ()
		427	{
		428	return xy_normalise (m, x, y);
		429	}
		430
		431	mapspace &ms () const
		432	{
		433	return m->at (x, y);
		434	}
		435
		436	object insert (object op, object *originator = 0, int flags = 0) const
		437	{
		438	return m->insert (op, x, y, originator, flags);
		439	}
		440	};
		441
		442	inline const mapxy &
		443	object::operator =(const mapxy &pos)
		444	{
		445	map = pos.m;
		446	x = pos.x;
		447	y = pos.y;
		448
		449	return pos;
		450	}
		451
378	#endif	452	#endif
379		453

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs. Revision 1.99 by root, Thu Dec 4 03:48:19 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.99 by root, Thu Dec 4 03:48:19 2008 UTC