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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.61 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.102 by root, Tue Dec 23 06:58:23 2008 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	/* 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(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]	70	#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	71	#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	72	#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	73	#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	74	#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off
…		…
104	*/	103	*/
105	#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 */
106	#define P_NEW_MAP 0x20000	105	#define P_NEW_MAP 0x20000
107	/* Coordinates passed result in a new tiled map */	106	/* Coordinates passed result in a new tiled map */
108		107
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	/* Instead of having numerous arrays that have information on a	108	/* Instead of having numerous arrays that have information on a
115	* particular space (was map, floor, floor2, map_ob),	109	* particular space (was map, floor, floor2, map_ob),
116	* have this structure take care of that information.	110	* have this structure take care of that information.
117	* 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
118	* to extend information about a space.	112	* to extend information about a space.
119	*/	113	*/
		114	INTERFACE_CLASS (mapspace)
120	struct mapspace	115	struct mapspace
121	{	116	{
		117	object *ACC (RW, bot);
122	object bot, top; /* lowest/highest object on this space */	118	object ACC (RW, top); / lowest/highest object on this space */
123	facetile faces[MAP_LAYERS]; / faces for the 3 layers */
124	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 */
125	uint8 flags_; /* flags about this space (see the P_ values above) */	120	uint8 flags_; /* flags about this space (see the P_ values above) */
126	sint8 light; /* How much light this space provides */	121	sint8 ACC (RW, light); /* How much light this space provides */
127	MoveType move_block; /* What movement types this space blocks */	122	MoveType ACC (RW, move_block); /* What movement types this space blocks */
128	MoveType move_slow; /* What movement types this space slows */	123	MoveType ACC (RW, move_slow); /* What movement types this space slows */
129	MoveType move_on; /* What movement types are activated */	124	MoveType ACC (RW, move_on); /* What movement types are activated */
130	MoveType move_off; /* What movement types are activated */	125	MoveType ACC (RW, move_off); /* What movement types are activated */
131		126
132	void update_ ();	127	void update_ ();
133	void update ()	128	MTH void update ()
134	{	129	{
135	if (!(flags_ & P_UPTODATE))	130	if (!(flags_ & P_UPTODATE))
136	update_ ();	131	update_ ();
137	}	132	}
138		133
139	uint8 flags ()	134	MTH uint8 flags ()
140	{	135	{
141	update ();	136	update ();
142	return flags_;	137	return flags_;
143	}	138	}
		139
		140	MTH void invalidate ()
		141	{
		142	flags_ = 0;
		143	}
144		144
145	// maybe only inline quick flags_ checking?
146	object *player ()	145	MTH object *player ()
147	{	146	{
148	// search from the top, because players are usually on top	147	object *op;
149	// make usually == always and this non-amortized O(1)	148
150	// could gte rid of P_PLAYER, too, then
151	if (flags () & P_PLAYER)	149	if (flags () & P_PLAYER)
152	for (object *op = top; op; op = op->below)	150	for (op = top; op->type != PLAYER; op = op->below)
153	if (op->type == PLAYER)	151	;
154	return op;	152	else
		153	op = 0;
155		154
156	return 0;	155	return op;
157	}	156	}
158	};
159		157
160	/*	158	// return the item volume on this mapspace in cm³
161	* Each map is in a given region of the game world and links to a region definiton, so	159	MTH uint64 volume () const;
162	* they have to appear here in the headers, before the mapdef
163	*/
164	INTERFACE_CLASS (region)
165	struct region : zero_initialised
166	{
167	region ACC (RW, next); / pointer to next region, NULL for the last one */
168	shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
169	shstr ACC (RW, parent_name); /*
170	* So that parent and child regions can be defined in
171	* any order, we keep hold of the parent_name during
172	* initialisation, and the children get assigned to their
173	* parents later. (before runtime on the server though)
174	* nothing outside the init code should ever use this value.
175	*/
176	region ACC (RW, parent); /
177	* Pointer to the region that is a parent of the current
178	* region, if a value isn't defined in the current region
179	* we traverse this series of pointers until it is.
180	*/
181	char ACC (RW, longname); / Official title of the region, this might be defined
182	* to be the same as name*/
183	char ACC (RW, msg); / the description of the region */
184	uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
185	sint8 ACC (RW, fallback); /* whether, in the event of a region not existing,
186	* this should be the one we fall back on as the default */
187	shstr ACC (RW, jailmap); /where a player that is arrested in this region should be imprisoned. /
188	sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */
189		160
190	static region *default_region ();	161	bool blocks (MoveType mt) const
191	static region find (const char name);	162	{
192	static region find_fuzzy (const char name);	163	return move_block && (mt & move_block) == mt;
		164	}
		165
		166	bool blocks (object *op) const
		167	{
		168	return blocks (op->move_type);
		169	}
193	};	170	};
194		171
195	struct shopitems : zero_initialised	172	struct shopitems : zero_initialised
196	{	173	{
197	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 */
…		…
221	struct maptile : zero_initialised, attachable	198	struct maptile : zero_initialised, attachable
222	{	199	{
223	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. */
224	struct mapspace spaces; / Array of spaces on this map */	201	struct mapspace spaces; / Array of spaces on this map */
225	uint8 regions; / region index per mapspace, if != 0 */	202	uint8 regions; / region index per mapspace, if != 0 */
226	struct region *regionmap; / index to region */	203	region_ptr regionmap; / index to region */
227		204
228	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 */
229		206
230	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 */
231	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
232	* points to the struct containing all the properties of	209	* points to the struct containing all the properties of
233	* the region */	210	* the region */
234	double ACC (RW, reset_time);	211	double ACC (RW, reset_time);
235	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
236	* should be reset	213	* should be reset
237	*/	214	*/
238	bool ACC (RW, dirty); /* if true, something was inserted or removed */	215	bool ACC (RW, dirty); /* if true, something was inserted or removed */
		216	bool ACC (RW, no_reset); // must not reset this map
239	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by	217	bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
240	* players entering/exiting map	218	* players entering/exiting map
241	*/	219	*/
242	sint32 ACC (RW, timeout); /* swapout is set to this */	220	sint32 ACC (RW, timeout); /* swapout is set to this */
243	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */	221	sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
…		…
248	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 */
249		227
250	bool ACC (RW, per_player);	228	bool ACC (RW, per_player);
251	bool ACC (RW, per_party);	229	bool ACC (RW, per_party);
252	bool ACC (RW, outdoor); /* True if an outdoor map */	230	bool ACC (RW, outdoor); /* True if an outdoor map */
253	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 */
254	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 */
255		234
256	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 */
257	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 */
258	oblinkpt buttons; / Linked list of linked lists of buttons */	237	oblinkpt buttons; / Linked list of linked lists of buttons */
259	sint16 ACC (RW, temp); /* base temperature of this tile (F) */	238	sint16 ACC (RW, temp); /* base temperature of this tile (F) */
…		…
271	shstr ACC (RW, msg); /* Message map creator may have left */	250	shstr ACC (RW, msg); /* Message map creator may have left */
272	shstr ACC (RW, maplore); /* Map lore information */	251	shstr ACC (RW, maplore); /* Map lore information */
273	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */	252	shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
274	maptile ACC (RW, tile_map[4]); / Next map, linked list */	253	maptile ACC (RW, tile_map[4]); / Next map, linked list */
275	shstr ACC (RW, path); /* Filename of the map */	254	shstr ACC (RW, path); /* Filename of the map */
		255	int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
		256	uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
		257
		258	// the maptile:: is neccessary here for the perl interface to work
		259	MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
		260	{
		261	return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
		262	}
		263
		264	static void adjust_daylight ();
276		265
277	MTH void activate ();	266	MTH void activate ();
278	MTH void deactivate ();	267	MTH void deactivate ();
279		268
280	// allocates all (empty) mapspace	269	// allocates all (empty) mapspace
281	MTH void alloc ();	270	MTH void alloc ();
282	// deallocates the mapspaces (and destroys all objects)	271	// deallocates the mapspaces (and destroys all objects)
283	MTH void clear ();	272	MTH void clear ();
284		273
285	MTH void fix_auto_apply ();	274	MTH void fix_auto_apply ();
286	MTH void decay_objects ();	275	MTH void do_decay_objects ();
287	MTH void update_buttons ();	276	MTH void update_buttons ();
288	MTH int change_map_light (int change);	277	MTH int change_map_light (int change);
289	static void change_all_map_light (int change); //PERL
290	MTH void set_darkness_map ();
291	MTH int estimate_difficulty () const;	278	MTH int estimate_difficulty () const;
		279
		280	MTH void play_sound (faceidx sound, int x, int y) const;
292		281
293	// set the given flag on all objects in the map	282	// set the given flag on all objects in the map
294	MTH void set_object_flag (int flag, int value = 1);	283	MTH void set_object_flag (int flag, int value = 1);
		284	MTH void post_load_original ();
295		285
296	MTH void link_multipart_objects ();	286	MTH void link_multipart_objects ();
297	MTH void clear_unique_items ();	287	MTH void clear_unique_items ();
298		288
299	MTH void clear_header ();	289	MTH void clear_header ();
300	MTH void clear_links_to (maptile *m);	290	MTH void clear_links_to (maptile *m);
301		291
302	MTH struct region *region (int x, int y) const;	292	MTH struct region *region (int x, int y) const;
303		293
304	// loas the header pseudo-object	294	// load the header pseudo-object
305	bool _load_header (object_thawer &thawer);	295	bool _load_header (object_thawer &thawer);
306	MTH bool _load_header (const char *path);	296	MTH bool _load_header (object_thawer thawer) { return _load_header (thawer); }
307		297
308	// load objects into the map	298	// load objects into the map
309	bool _load_objects (object_thawer &thawer);	299	bool _load_objects (object_thawer &thawer);
310	MTH bool _load_objects (const char *path, bool skip_header = true);	300	MTH bool _load_objects (object_thawer thawer) { return _load_objects (thawer); }
311		301
312	// save objects into the given file (uses IO_ flags)	302	// save objects into the given file (uses IO_ flags)
313	bool _save_objects (object_freezer &freezer, int flags);	303	bool _save_objects (object_freezer &freezer, int flags);
314	MTH bool _save_objects (const char *path, int flags);	304	MTH bool _save_objects (const char *path, int flags);
315		305
…		…
327	MTH int size () const { return width * height; }	317	MTH int size () const { return width * height; }
328		318
329	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);	319	MTH object insert (object op, int x, int y, object *originator = 0, int flags = 0);
330		320
331	MTH void touch () { last_access = runtime; }	321	MTH void touch () { last_access = runtime; }
		322
		323	MTH bool tile_available (int dir, bool load = true);
332		324
333	// find the map that is at coordinate x\|y relative to this map	325	// find the map that is at coordinate x\|y relative to this map
334	// TODO: need a better way than passing by reference	326	// TODO: need a better way than passing by reference
335	// TODO: make perl interface	327	// TODO: make perl interface
336	maptile *xy_find (sint16 &x, sint16 &y);	328	maptile *xy_find (sint16 &x, sint16 &y);
…		…
348	}	340	}
349		341
350	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);	342	void make_map_floor (char *layout, char floorstyle, random_map_params *RP);
351	bool generate_random_map (random_map_params *RP);	343	bool generate_random_map (random_map_params *RP);
352		344
		345	static maptile find_async (const char path, maptile *original = 0, bool load = true);//PERL
353	static maptile find_sync (const char path, maptile *original = 0);//PERL	346	static maptile find_sync (const char path, maptile *original = 0);//PERL
354	// async prefetch	347	static maptile find_style_sync (const char dir, const char *file = 0);//PERL
355	static maptile find_async (const char path, maptile *original = 0);//PERL	348	object *pick_random_object (rand_gen &gen = rndm) const;
356		349
357	mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }	350	mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
358	mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
359	};	351	};
360		352
361	/* This is used by get_rangevector to determine where the other	353	/* This is used by get_rangevector to determine where the other
362	* creature is. get_rangevector takes into account map tiling,	354	* creature is. get_rangevector takes into account map tiling,
363	* so you just can not look the the map coordinates and get the	355	* so you just can not look the the map coordinates and get the
…		…
374	int distance_y;	366	int distance_y;
375	int direction;	367	int direction;
376	object *part;	368	object *part;
377	};	369	};
378		370
		371	// comaptibility cruft start
379	//TODO: these should be refactored into things like xy_normalise	372	//TODO: these should be refactored into things like xy_normalise
380	// and so on.	373	// and so on.
381	int get_map_flags(maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);	374	int get_map_flags (maptile oldmap, maptile newmap, sint16 x, sint16 y, sint16 nx, sint16 *ny);
382	int ob_blocked(const object ob, maptile m, sint16 x, sint16 y);
383	int out_of_map(maptile *m, int x, int y);	375	int out_of_map (maptile *m, int x, int y);
384	maptile get_map_from_coord(maptile m, sint16 x, sint16 y);	376	maptile get_map_from_coord (maptile m, sint16 x, sint16 y);
385	void get_rangevector(object op1, object op2, rv_vector *retval, int flags);	377	void get_rangevector (object op1, object op2, rv_vector *retval, int flags);
386	void get_rangevector_from_mapcoord(const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);	378	void get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags);
387	int on_same_map(const object op1, const object op2);	379	int on_same_map (const object op1, const object op2);
		380	int adjacent_map (const maptile map1, const maptile map2, int dx, int dy);
388		381
389	// adjust map, x and y for tiled maps and return true if the position is valid at all	382	// adjust map, x and y for tiled maps and return true if the position is valid at all
390	inline bool	383	static inline bool
391	xy_normalise (maptile *&map, sint16 &x, sint16 &y)	384	xy_normalise (maptile *&map, sint16 &x, sint16 &y)
392	{	385	{
393	// when in range, do a quick return, otherwise go the slow route	386	// when in range, do a quick return, otherwise go the slow route
394	return	387	return
395	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))	388	(IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
396	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);	389	\|\| !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
397	}	390	}
		391	// comaptibility cruft end
398		392
399	inline mapspace &	393	inline mapspace &
400	object::ms () const	394	object::ms () const
401	{	395	{
402	return map->at (x, y);	396	return map->at (x, y);
403	}	397	}
404		398
		399	struct mapxy {
		400	maptile *m;
		401	sint16 x, y;
		402
		403	mapxy (maptile *m, sint16 x, sint16 y)
		404	: m(m), x(x), y(y)
		405	{ }
		406
		407	mapxy (object *op)
		408	: m(op->map), x(op->x), y(op->y)
		409	{ }
		410
		411	mapxy &move (int dx, int dy)
		412	{
		413	x += dx;
		414	y += dy;
		415
		416	return *this;
		417	}
		418
		419	mapxy &move (int dir)
		420	{
		421	return move (freearr_x [dir], freearr_y [dir]);
		422	}
		423
		424	operator void () const { return (void )m; }
		425	mapxy &operator =(const object *op)
		426	{
		427	m = op->map;
		428	x = op->x;
		429	y = op->y;
		430
		431	return *this;
		432	}
		433
		434	mapspace *operator ->() const { return &m->at (x, y); }
		435	mapspace &operator * () const { return m->at (x, y); }
		436
		437	bool normalise ()
		438	{
		439	return xy_normalise (m, x, y);
		440	}
		441
		442	mapspace &ms () const
		443	{
		444	return m->at (x, y);
		445	}
		446
		447	object insert (object op, object *originator = 0, int flags = 0) const
		448	{
		449	return m->insert (op, x, y, originator, flags);
		450	}
		451	};
		452
		453	inline const mapxy &
		454	object::operator =(const mapxy &pos)
		455	{
		456	map = pos.m;
		457	x = pos.x;
		458	y = pos.y;
		459
		460	return pos;
		461	}
		462
405	#endif	463	#endif
406		464

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.61 by root, Mon Jan 29 14:46:01 2007 UTC vs. Revision 1.102 by root, Tue Dec 23 06:58:23 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.61 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.102 by root, Tue Dec 23 06:58:23 2008 UTC