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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.78 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.101 by root, Tue Dec 23 01:51:28 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.
…		…
29	#ifndef MAP_H	29	#ifndef MAP_H
30	#define MAP_H	30	#define MAP_H
31		31
32	#include <tr1/unordered_map>	32	#include <tr1/unordered_map>
33		33
		34	#include "region.h"
34	#include "cfperl.h"	35	#include "cfperl.h"
35		36
36	/* 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
37	* tiled maps. There is no requirement that this matches the	38	* tiled maps. There is no requirement that this matches the
38	* tiled maps size - it just seemed like a reasonable value.	39	* tiled maps size - it just seemed like a reasonable value.
…		…
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	/* Values for in_memory below. Should probably be an enumerations */	52	/* Values for in_memory below */
52	enum {	53	enum {
53	MAP_IN_MEMORY,	54	MAP_ACTIVE,
		55	MAP_INACTIVE, // not used atm.
54	MAP_SWAPPED,	56	MAP_SWAPPED,
55	MAP_LOADING,	57	MAP_LOADING,
56	MAP_SAVING,	58	MAP_SAVING,
57	};	59	};
58		60
…		…
61	* 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
62	* consistent (eg, op->map, op->x, op->y)	64	* consistent (eg, op->map, op->x, op->y)
63	*/	65	*/
64	// all those macros are herewith declared legacy	66	// all those macros are herewith declared legacy
65	#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 ()
66	#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
67	#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
68	#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
69	#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]
70	#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
71	#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
…		…
102	*/	103	*/
103	#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 */
104	#define P_NEW_MAP 0x20000	105	#define P_NEW_MAP 0x20000
105	/* Coordinates passed result in a new tiled map */	106	/* Coordinates passed result in a new tiled map */
106		107
107	/* P_NO_PASS is used for ob_blocked() return value. It needs
108	* to be here to make sure the bits don't match with anything.
109	*/
110	#define P_NO_PASS 0x80000
111
112	/* Instead of having numerous arrays that have information on a	108	/* Instead of having numerous arrays that have information on a
113	* particular space (was map, floor, floor2, map_ob),	109	* particular space (was map, floor, floor2, map_ob),
114	* have this structure take care of that information.	110	* have this structure take care of that information.
115	* 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
116	* to extend information about a space.	112	* to extend information about a space.
117	*/	113	*/
		114	INTERFACE_CLASS (mapspace)
118	struct mapspace	115	struct mapspace
119	{	116	{
		117	object *ACC (RW, bot);
120	object bot, top; /* lowest/highest object on this space */	118	object ACC (RW, top); / lowest/highest object on this space */
121	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 */
122	uint8 flags_; /* flags about this space (see the P_ values above) */	120	uint8 flags_; /* flags about this space (see the P_ values above) */
123	sint8 light; /* How much light this space provides */	121	sint8 ACC (RW, light); /* How much light this space provides */
124	MoveType move_block; /* What movement types this space blocks */	122	MoveType ACC (RW, move_block); /* What movement types this space blocks */
125	MoveType move_slow; /* What movement types this space slows */	123	MoveType ACC (RW, move_slow); /* What movement types this space slows */
126	MoveType move_on; /* What movement types are activated */	124	MoveType ACC (RW, move_on); /* What movement types are activated */
127	MoveType move_off; /* What movement types are activated */	125	MoveType ACC (RW, move_off); /* What movement types are activated */
128		126
129	void update_ ();	127	void update_ ();
130	void update ()	128	MTH void update ()
131	{	129	{
132	if (!(flags_ & P_UPTODATE))	130	if (!(flags_ & P_UPTODATE))
133	update_ ();	131	update_ ();
134	}	132	}
135		133
136	uint8 flags ()	134	MTH uint8 flags ()
137	{	135	{
138	update ();	136	update ();
139	return flags_;	137	return flags_;
140	}	138	}
		139
		140	MTH void invalidate ()
		141	{
		142	flags_ = 0;
		143	}
141		144
142	// maybe only inline quick flags_ checking?
143	object *player ()	145	MTH object *player ()
144	{	146	{
145	// search from the top, because players are usually on top	147	object *op;
146	// make usually == always and this non-amortized O(1)	148
147	// could gte rid of P_PLAYER, too, then
148	if (flags () & P_PLAYER)	149	if (flags () & P_PLAYER)
149	for (object *op = top; op; op = op->below)	150	for (op = top; op->type != PLAYER; op = op->below)
150	if (op->type == PLAYER)	151	;
151	return op;	152	else
		153	op = 0;
152		154
153	return 0;	155	return op;
154	}	156	}
155		157
156	// return the item volume on this mapspace in cm³	158	// return the item volume on this mapspace in cm³
157	uint64 volume () const;	159	MTH uint64 volume () const;
		160
		161	bool blocks (MoveType mt) const
		162	{
		163	return move_block && (mt & move_block) == mt;
		164	}
		165
		166	bool blocks (object *op) const
		167	{
		168	return blocks (op->move_type);
		169	}
158	};	170	};
159		171
160	struct shopitems : zero_initialised	172	struct shopitems : zero_initialised
161	{	173	{
162	const char name; / name of the item in question, null if it is the default item */	174	const char name; / name of the item in question, null if it is the default item */
…		…
186	struct maptile : zero_initialised, attachable	198	struct maptile : zero_initialised, attachable
187	{	199	{
188	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */	200	sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
189	struct mapspace spaces; / Array of spaces on this map */	201	struct mapspace spaces; / Array of spaces on this map */
190	uint8 regions; / region index per mapspace, if != 0 */	202	uint8 regions; / region index per mapspace, if != 0 */
191	struct region *regionmap; / index to region */	203	region_ptr regionmap; / index to region */
192		204
193	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */	205	tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
194		206
195	shstr ACC (RW, name); /* Name of map as given by its creator */	207	shstr ACC (RW, name); /* Name of map as given by its creator */
196	struct region ACC (RW, default_region); / What jurisdiction in the game world this map is ruled by	208	region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
197	* points to the struct containing all the properties of	209	* points to the struct containing all the properties of
198	* the region */	210	* the region */
199	double ACC (RW, reset_time);	211	double ACC (RW, reset_time);
200	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map	212	uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
201	* should be reset	213	* should be reset
…		…
211	* be loaded before used. The map,omap and map_ob	223	* be loaded before used. The map,omap and map_ob
212	* arrays will be allocated when the map is loaded */	224	* arrays will be allocated when the map is loaded */
213	sint16 players; /* How many players are on this map right now */	225	sint16 players; /* How many players are on this map right now */
214	uint16 ACC (RW, difficulty); /* What level the player should be to play here */	226	uint16 ACC (RW, difficulty); /* What level the player should be to play here */
215		227
216	bool ACC (RW, active); // wether this map is active or not
217	bool ACC (RW, per_player);	228	bool ACC (RW, per_player);
218	bool ACC (RW, per_party);	229	bool ACC (RW, per_party);
219	bool ACC (RW, outdoor); /* True if an outdoor map */	230	bool ACC (RW, outdoor); /* True if an outdoor map */
220	bool ACC (RW, nodrop); /* avoid dropping anything on this map */	231	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 */	232	sint8 ACC (RW, darkness); /* indicates level of darkness of map */
		233	static sint8 outdoor_darkness; /* the global darkness level outside */
222		234
223	uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */	235	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 */	236	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 */	237	oblinkpt buttons; / Linked list of linked lists of buttons */
226	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	238	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
241	maptile ACC (RW, tile_map[4]); / Next map, linked list */	253	maptile ACC (RW, tile_map[4]); / Next map, linked list */
242	shstr ACC (RW, path); /* Filename of the map */	254	shstr ACC (RW, path); /* Filename of the map */
243	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace	255	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
244	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace	256	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
245		257
		258	MTH sint8 darklevel () const
		259	{
		260	return clamp (outdoor ? darkness + outdoor_darkness : darkness, 0, MAX_DARKNESS);
		261	}
		262
246	MTH void activate ();	263	MTH void activate ();
247	MTH void deactivate ();	264	MTH void deactivate ();
248		265
249	// allocates all (empty) mapspace	266	// allocates all (empty) mapspace
250	MTH void alloc ();	267	MTH void alloc ();
…		…
257	MTH int change_map_light (int change);	274	MTH int change_map_light (int change);
258	static void change_all_map_light (int change); //PERL	275	static void change_all_map_light (int change); //PERL
259	MTH void set_darkness_map ();	276	MTH void set_darkness_map ();
260	MTH int estimate_difficulty () const;	277	MTH int estimate_difficulty () const;
261		278
		279	MTH void play_sound (faceidx sound, int x, int y) const;
		280
262	// set the given flag on all objects in the map	281	// set the given flag on all objects in the map
263	MTH void set_object_flag (int flag, int value = 1);	282	MTH void set_object_flag (int flag, int value = 1);
		283	MTH void post_load_original ();
264		284
265	MTH void link_multipart_objects ();	285	MTH void link_multipart_objects ();
266	MTH void clear_unique_items ();	286	MTH void clear_unique_items ();
267		287
268	MTH void clear_header ();	288	MTH void clear_header ();
269	MTH void clear_links_to (maptile *m);	289	MTH void clear_links_to (maptile *m);
270		290
271	MTH struct region *region (int x, int y) const;	291	MTH struct region *region (int x, int y) const;
272		292
273	// loas the header pseudo-object	293	// load the header pseudo-object
274	bool _load_header (object_thawer &thawer);	294	bool _load_header (object_thawer &thawer);
275	MTH bool _load_header (const char *path);	295	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
276		296
277	// load objects into the map	297	// load objects into the map
278	bool _load_objects (object_thawer &thawer);	298	bool _load_objects (object_thawer &thawer);
279	MTH bool _load_objects (const char *path, bool skip_header = true);	299	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
280		300
281	// save objects into the given file (uses IO_ flags)	301	// save objects into the given file (uses IO_ flags)
282	bool _save_objects (object_freezer &freezer, int flags);	302	bool _save_objects (object_freezer &freezer, int flags);
283	MTH bool _save_objects (const char *path, int flags);	303	MTH bool _save_objects (const char *path, int flags);
284		304
…		…
296	MTH int size () const { return width * height; }	316	MTH int size () const { return width * height; }
297		317
298	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	318	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
299		319
300	MTH void touch () { last_access = runtime; }	320	MTH void touch () { last_access = runtime; }
		321
		322	MTH bool tile_available (int dir, bool load = true);
301		323
302	// find the map that is at coordinate x\|y relative to this map	324	// find the map that is at coordinate x\|y relative to this map
303	// TODO: need a better way than passing by reference	325	// TODO: need a better way than passing by reference
304	// TODO: make perl interface	326	// TODO: make perl interface
305	maptile *xy_find (sint16 &x, sint16 &y);	327	maptile *xy_find (sint16 &x, sint16 &y);
…		…
317	}	339	}
318		340
319	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	341	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
320	bool generate_random_map (random_map_params *RP);	342	bool generate_random_map (random_map_params *RP);
321		343
322	static maptile find_async (const char path, maptile *original = 0);//PERL	344	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
323	static maptile find_sync (const char path, maptile *original = 0);//PERL	345	static maptile find_sync (const char path, maptile *original = 0);//PERL
324	static maptile find_style_sync (const char dir, const char *file = 0);//PERL	346	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
325	MTH object *pick_random_object () const;	347	object *pick_random_object (rand_gen &gen = rndm) const;
326		348
327	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	349	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
328	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
329	};	350	};
330		351
331	/* This is used by get_rangevector to determine where the other	352	/* This is used by get_rangevector to determine where the other
332	* creature is. get_rangevector takes into account map tiling,	353	* creature is. get_rangevector takes into account map tiling,
333	* so you just can not look the the map coordinates and get the	354	* so you just can not look the the map coordinates and get the
…		…
344	int distance_y;	365	int distance_y;
345	int direction;	366	int direction;
346	object *part;	367	object *part;
347	};	368	};
348		369
		370	// comaptibility cruft start
349	//TODO: these should be refactored into things like xy_normalise	371	//TODO: these should be refactored into things like xy_normalise
350	// and so on.	372	// and so on.
351	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	373	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
352	int ob_blocked (const object ob, maptile m, sint16 x, sint16 y);
353	int out_of_map (maptile *m, int x, int y);	374	int out_of_map (maptile *m, int x, int y);
354	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);	375	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
355	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);	376	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
356	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	377	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
357	int on_same_map (const object op1, const object op2);	378	int on_same_map (const object op1, const object op2);
358	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);	379	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
359		380
360	// adjust map, x and y for tiled maps and return true if the position is valid at all	381	// adjust map, x and y for tiled maps and return true if the position is valid at all
361	inline bool	382	static inline bool
362	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	383	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
363	{	384	{
364	// when in range, do a quick return, otherwise go the slow route	385	// when in range, do a quick return, otherwise go the slow route
365	return	386	return
366	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	387	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
367	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	388	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
368	}	389	}
		390	// comaptibility cruft end
369		391
370	inline mapspace &	392	inline mapspace &
371	object::ms () const	393	object::ms () const
372	{	394	{
373	return map->at (x, y);	395	return map->at (x, y);
374	}	396	}
375		397
		398	struct mapxy {
		399	maptile *m;
		400	sint16 x, y;
		401
		402	mapxy (maptile *m, sint16 x, sint16 y)
		403	: m(m), x(x), y(y)
		404	{ }
		405
		406	mapxy (object *op)
		407	: m(op->map), x(op->x), y(op->y)
		408	{ }
		409
		410	mapxy &move (int dx, int dy)
		411	{
		412	x += dx;
		413	y += dy;
		414
		415	return *this;
		416	}
		417
		418	mapxy &move (int dir)
		419	{
		420	return move (freearr_x [dir], freearr_y [dir]);
		421	}
		422
		423	operator void () const { return (void )m; }
		424	mapxy &operator =(const object *op)
		425	{
		426	m = op->map;
		427	x = op->x;
		428	y = op->y;
		429
		430	return *this;
		431	}
		432
		433	mapspace *operator ->() const { return &m->at (x, y); }
		434	mapspace &operator * () const { return m->at (x, y); }
		435
		436	bool normalise ()
		437	{
		438	return xy_normalise (m, x, y);
		439	}
		440
		441	mapspace &ms () const
		442	{
		443	return m->at (x, y);
		444	}
		445
		446	object insert (object op, object *originator = 0, int flags = 0) const
		447	{
		448	return m->insert (op, x, y, originator, flags);
		449	}
		450	};
		451
		452	inline const mapxy &
		453	object::operator =(const mapxy &pos)
		454	{
		455	map = pos.m;
		456	x = pos.x;
		457	y = pos.y;
		458
		459	return pos;
		460	}
		461
376	#endif	462	#endif
377		463

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.78 by root, Sun Jul 1 05:00:18 2007 UTC vs. Revision 1.101 by root, Tue Dec 23 01:51:28 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.78 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.101 by root, Tue Dec 23 01:51:28 2008 UTC