[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.162 by root, Tue Oct 13 18:22:44 2009 UTC vs.
Revision 1.218 by root, Mon Oct 29 23:55:52 2012 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,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* 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 Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* 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>
23	*/	23	*/
24		24
25	#include <unistd.h>	25	#include <unistd.h>
26		26
27	#include "global.h"	27	#include "global.h"
28	#include "loader.h"
29	#include "path.h"	28	#include "path.h"
		29
		30	//+GPL
30		31
31	sint8 maptile::outdoor_darkness;	32	sint8 maptile::outdoor_darkness;
32		33
33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	34	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34	* one function that just returns a P_.. value (see map.h)	35	* one function that just returns a P_.. value (see map.h)
76	/* Make sure the coordinates are valid - they should be, as caller should	77	/* Make sure the coordinates are valid - they should be, as caller should
77	* have already checked this.	78	* have already checked this.
78	*/	79	*/
79	if (OUT_OF_REAL_MAP (m, sx, sy))	80	if (OUT_OF_REAL_MAP (m, sx, sy))
80	{	81	{
81	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	82	LOG (llevError \| logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
82	return 1;	83	return 1;
83	}	84	}
84		85
85	/* Save some cycles - instead of calling get_map_flags(), just get the value
86	* directly.
87	*/
88	mapspace &ms = m->at (sx, sy);	86	mapspace &ms = m->at (sx, sy);
89		87
90	int mflags = ms.flags ();	88	int mflags = ms.flags ();
91	int blocked = ms.move_block;	89	int blocked = ms.move_block;
92		90
93	/* If space is currently not blocked by anything, no need to	91	/* If space is currently not blocked by anything, no need to
94	* go further. Not true for players - all sorts of special	92	* go further. Not true for players - all sorts of special
95	* things we need to do for players.	93	* things we need to do for players.
96	*/	94	*/
97	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	95	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
98	return 0;	96	return 0;
99		97
100	/* if there isn't anything alive on this space, and this space isn't	98	/* if there isn't anything alive on this space, and this space isn't
101	* otherwise blocked, we can return now. Only if there is a living	99	* otherwise blocked, we can return now. Only if there is a living
102	* creature do we need to investigate if it is part of this creature	100	* creature do we need to investigate if it is part of this creature
…		…
112	/* We basically go through the stack of objects, and if there is	110	/* We basically go through the stack of objects, and if there is
113	* some other object that has NO_PASS or FLAG_ALIVE set, return	111	* some other object that has NO_PASS or FLAG_ALIVE set, return
114	* true. If we get through the entire stack, that must mean	112	* true. If we get through the entire stack, that must mean
115	* ob is blocking it, so return 0.	113	* ob is blocking it, so return 0.
116	*/	114	*/
117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	115	for (object *tmp = ms.top; tmp; tmp = tmp->below)
118	{	116	{
119	bool block = OB_MOVE_BLOCK (ob, tmp);	117	if (OB_MOVE_BLOCK (ob, tmp))
120
121	/* This must be before the checks below. Code for inventory checkers. */
122	if (block && tmp->type == CHECK_INV)
123	{	118	{
124	bool have = check_inv_recursive (ob, tmp);	119	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125		120	if (RESULT_INT (0))
126	/* If last_sp is set, the player/monster needs an object,	121	return 1;
127	* so we check for it. If they don't have it, they can't
128	* pass through this space.
129	*/	122	else
130	if (tmp->last_sp)	123	continue;
		124
		125	if (tmp->type == CHECK_INV)
131	{	126	{
132	if (!have)	127	bool have = check_inv_recursive (ob, tmp);
		128
		129	// last_sp set means we block if we don't have.
		130	if (logical_xor (have, tmp->last_sp))
		131	return 1;
		132	}
		133	else if (tmp->type == T_MATCH)
		134	{
		135	// T_MATCH allows "entrance" iff the match is true
		136	// == blocks if the match fails
		137
		138	// we could have used an INVOKE_OBJECT, but decided against it, as we
		139	// assume that T_MATCH is relatively common.
		140	if (!match (tmp->slaying, ob, tmp, ob))
133	return 1;	141	return 1;
134	}	142	}
135	else	143	else
136	{	144	return 1; // unconditional block
137	/* In this case, the player must not have the object -	145
138	* if they do, they can't pass through.
139	*/
140	if (have)
141	return 1;
142	}
143	}
144	else if (block && tmp->type == T_MATCH)
145	{
146	//TODO
147	}
148	else	146	} else {
149	{	147	// space does not block the ob, directly, but
150	/* Broke apart a big nasty if into several here to make	148	// anything alive that is not a door still
151	* this more readable. first check - if the space blocks	149	// blocks anything
152	* movement, can't move here.
153	* second - if a monster, can't move there, unless it is a
154	* dm.
155	*/
156	if (block)
157	return 1;
158		150
159	if (tmp->flag [FLAG_ALIVE]	151	if (tmp->flag [FLAG_ALIVE]
160	&& tmp->head_ () != ob
161	&& tmp != ob
162	&& tmp->type != DOOR	152	&& tmp->type != DOOR
163	&& !tmp->flag [FLAG_WIZ])	153	&& tmp->head_ () != ob) //TODO: maybe move these check up?
164	return 1;	154	return 1;
165	}	155	}
166	}	156	}
167		157
168	return 0;	158	return 0;
169	}	159	}
170		160
171	/*	161	/*
172	* Returns qthe blocking object if the given object can't fit in the given	162	* Returns the blocking object if the given object can't fit in the given
173	* spot. This is meant for multi space objects - for single space objecs,	163	* spot. This is meant for multi space objects - for single space objecs,
174	* just calling get_map_blocked and checking that against movement type	164	* just calling get_map_blocked and checking that against movement type
175	* of object. This function goes through all the parts of the multipart	165	* of object. This function goes through all the parts of the multipart
176	* object and makes sure they can be inserted.	166	* object and makes sure they can be inserted.
177	*	167	*
…		…
224	}	214	}
225		215
226	return 0;	216	return 0;
227	}	217	}
228		218
229	/* When the map is loaded, load_object does not actually insert objects	219	//-GPL
230	* into inventory, but just links them. What this does is go through
231	* and insert them properly.
232	* The object 'container' is the object that contains the inventory.
233	* This is needed so that we can update the containers weight.
234	*/
235	void
236	fix_container (object *container)
237	{
238	object tmp = container->inv, next;
239
240	container->inv = 0;
241	while (tmp)
242	{
243	next = tmp->below;
244	if (tmp->inv)
245	fix_container (tmp);
246
247	insert_ob_in_ob (tmp, container);
248	tmp = next;
249	}
250
251	// go through and calculate what all the containers are carrying.
252	//TODO: remove
253	container->update_weight ();
254	}
255		220
256	void	221	void
257	maptile::set_object_flag (int flag, int value)	222	maptile::set_object_flag (int flag, int value)
258	{	223	{
259	if (!spaces)	224	if (!spaces)
…		…
274		239
275	for (mapspace *ms = spaces + size (); ms-- > spaces; )	240	for (mapspace *ms = spaces + size (); ms-- > spaces; )
276	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	241	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
277	INVOKE_OBJECT (RESET, tmp);	242	INVOKE_OBJECT (RESET, tmp);
278	}	243	}
		244
		245	void
		246	maptile::post_load ()
		247	{
		248	#if 0
		249	if (!spaces)
		250	return;
		251
		252	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		253	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		254	; // nop
		255	#endif
		256	}
		257
		258	//+GPL
279		259
280	/* link_multipart_objects go through all the objects on the map looking	260	/* link_multipart_objects go through all the objects on the map looking
281	* for objects whose arch says they are multipart yet according to the	261	* for objects whose arch says they are multipart yet according to the
282	* info we have, they only have the head (as would be expected when	262	* info we have, they only have the head (as would be expected when
283	* they are saved).	263	* they are saved).
…		…
311	op = op->above;	291	op = op->above;
312	}	292	}
313	}	293	}
314	}	294	}
315		295
		296	//-GPL
		297
316	/*	298	/*
317	* Loads (ands parses) the objects into a given map from the specified	299	* Loads (ands parses) the objects into a given map from the specified
318	* file pointer.	300	* file pointer.
319	*/	301	*/
320	bool	302	bool
…		…
329	case KW_arch:	311	case KW_arch:
330	if (object *op = object::read (f, this))	312	if (object *op = object::read (f, this))
331	{	313	{
332	// TODO: why?	314	// TODO: why?
333	if (op->inv)	315	if (op->inv)
		316	{
		317	op->carrying = 0;
334	op->update_weight ();	318	op->update_weight ();
		319	}
335		320
336	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))	321	if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
337	{	322	{
338	// we insert manually because	323	// we insert manually because
339	// a) its way faster	324	// a) its way faster
…		…
376	}	361	}
377		362
378	void	363	void
379	maptile::activate ()	364	maptile::activate ()
380	{	365	{
381	if (spaces)	366	if (state != MAP_INACTIVE)
		367	return;
		368
382	for (mapspace *ms = spaces + size (); ms-- > spaces; )	369	for (mapspace *ms = spaces + size (); ms-- > spaces; )
383	for (object *op = ms->bot; op; op = op->above)	370	for (object *op = ms->bot; op; op = op->above)
384	op->activate_recursive ();	371	op->activate_recursive ();
		372
		373	state = MAP_ACTIVE;
		374
		375	activate_physics ();
385	}	376	}
386		377
387	void	378	void
388	maptile::deactivate ()	379	maptile::deactivate ()
389	{	380	{
390	if (spaces)	381	if (state != MAP_ACTIVE)
		382	return;
		383
391	for (mapspace *ms = spaces + size (); ms-- > spaces; )	384	for (mapspace *ms = spaces + size (); ms-- > spaces; )
392	for (object *op = ms->bot; op; op = op->above)	385	for (object *op = ms->bot; op; op = op->above)
393	op->deactivate_recursive ();	386	op->deactivate_recursive ();
		387
		388	state = MAP_INACTIVE;
394	}	389	}
395		390
396	bool	391	bool
397	maptile::_save_objects (object_freezer &f, int flags)	392	maptile::_save_objects (object_freezer &f, int flags)
398	{	393	{
…		…
439	return false;	434	return false;
440		435
441	return freezer.save (path);	436	return freezer.save (path);
442	}	437	}
443		438
444	maptile::maptile ()	439	void
		440	maptile::init ()
445	{	441	{
446	in_memory = MAP_SWAPPED;	442	state = MAP_SWAPPED;
447		443
448	/* The maps used to pick up default x and y values from the	444	/* The maps used to pick up default x and y values from the
449	* map archetype. Mimic that behaviour.	445	* map archetype. Mimic that behaviour.
450	*/	446	*/
451	width = 16;	447	width = 16;
452	height = 16;	448	height = 16;
453	timeout = 300;	449	timeout = 300;
454	max_nrof = 1000; // 1000 items of anything	450	max_items = MAX_ITEM_PER_ACTION;
455	max_volume = 2000000; // 2m³	451	max_volume = 2000000; // 2m³
456	}
457
458	maptile::maptile (int w, int h)
459	{
460	in_memory = MAP_SWAPPED;
461
462	width = w;
463	height = h;
464	reset_timeout = 0;	452	reset_timeout = 0;
465	timeout = 300;
466	enter_x = 0;	453	enter_x = 0;
467	enter_y = 0;	454	enter_y = 0;
		455	}
		456
		457	maptile::maptile ()
		458	{
		459	init ();
		460	}
		461
		462	maptile::maptile (int w, int h)
		463	{
		464	init ();
		465
		466	width = w;
		467	height = h;
468		468
469	alloc ();	469	alloc ();
470	}	470	}
471		471
472	/*	472	/*
…		…
480	if (spaces)	480	if (spaces)
481	return;	481	return;
482		482
483	spaces = salloc0<mapspace> (size ());	483	spaces = salloc0<mapspace> (size ());
484	}	484	}
		485
		486	//+GPL
485		487
486	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	488	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
487	* corresponding to that string. Memory is allocated for this, it must be freed	489	* corresponding to that string. Memory is allocated for this, it must be freed
488	* at a later date.	490	* at a later date.
489	* Called by parse_map_headers below.	491	* Called by parse_map_headers below.
…		…
541	*q = '\0';	543	*q = '\0';
542		544
543	current_type = get_typedata_by_name (p);	545	current_type = get_typedata_by_name (p);
544	if (current_type)	546	if (current_type)
545	{	547	{
546	items[i].name = current_type->name;	548	items[i].name = current_type->name;
547	items[i].typenum = current_type->number;	549	items[i].typenum = current_type->number;
548	items[i].name_pl = current_type->name_pl;	550	items[i].name_pl = current_type->name_pl;
549	}	551	}
550	else	552	else
551	{ /* oh uh, something's wrong, let's free up this one, and try	553	{ /* oh uh, something's wrong, let's free up this one, and try
…		…
566	return items;	568	return items;
567	}	569	}
568		570
569	/* opposite of parse string, this puts the string that was originally fed in to	571	/* opposite of parse string, this puts the string that was originally fed in to
570	* the map (or something equivilent) into output_string. */	572	* the map (or something equivilent) into output_string. */
571	static void	573	static const char *
572	print_shop_string (maptile m, char output_string)	574	print_shop_string (maptile *m)
573	{	575	{
574	int i;	576	static dynbuf_text buf; buf.clear ();
575	char tmp[MAX_BUF];	577	bool first = true;
576		578
577	strcpy (output_string, "");
578	for (i = 0; i < m->shopitems[0].index; i++)	579	for (int i = 0; i < m->shopitems[0].index; i++)
579	{	580	{
		581	if (!first)
		582	buf << ';';
		583
		584	first = false;
		585
580	if (m->shopitems[i].typenum)	586	if (m->shopitems[i].typenum)
581	{	587	{
582	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
583	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	589	buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
584	else	590	else
585	sprintf (tmp, "%s;", m->shopitems[i].name);	591	buf.printf ("%s", m->shopitems[i].name);
586	}	592	}
587	else	593	else
588	{	594	{
589	if (m->shopitems[i].strength)	595	if (m->shopitems[i].strength)
590	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	596	buf.printf ("*:%d", m->shopitems[i].strength);
591	else	597	else
592	sprintf (tmp, "*");	598	buf.printf ("*");
593	}	599	}
594
595	strcat (output_string, tmp);
596	}	600	}
		601
		602	return buf;
597	}	603	}
		604
		605	//-GPL
598		606
599	/* This loads the header information of the map. The header	607	/* This loads the header information of the map. The header
600	* contains things like difficulty, size, timeout, etc.	608	* contains things like difficulty, size, timeout, etc.
601	* this used to be stored in the map object, but with the	609	* this used to be stored in the map object, but with the
602	* addition of tiling, fields beyond that easily named in an	610	* addition of tiling, fields beyond that easily named in an
…		…
616	{	624	{
617	case KW_msg:	625	case KW_msg:
618	thawer.get_ml (KW_endmsg, msg);	626	thawer.get_ml (KW_endmsg, msg);
619	break;	627	break;
620		628
621	case KW_lore: // CF+ extension	629	case KW_lore: // deliantra extension
622	thawer.get_ml (KW_endlore, maplore);	630	thawer.get_ml (KW_endlore, maplore);
623	break;	631	break;
624		632
625	case KW_maplore:	633	case KW_maplore:
626	thawer.get_ml (KW_endmaplore, maplore);	634	thawer.get_ml (KW_endmaplore, maplore);
…		…
643	case KW_shopgreed: thawer.get (shopgreed); break;	651	case KW_shopgreed: thawer.get (shopgreed); break;
644	case KW_shopmin: thawer.get (shopmin); break;	652	case KW_shopmin: thawer.get (shopmin); break;
645	case KW_shopmax: thawer.get (shopmax); break;	653	case KW_shopmax: thawer.get (shopmax); break;
646	case KW_shoprace: thawer.get (shoprace); break;	654	case KW_shoprace: thawer.get (shoprace); break;
647	case KW_outdoor: thawer.get (outdoor); break;	655	case KW_outdoor: thawer.get (outdoor); break;
648	case KW_temp: thawer.get (temp); break;
649	case KW_pressure: thawer.get (pressure); break;
650	case KW_humid: thawer.get (humid); break;
651	case KW_windspeed: thawer.get (windspeed); break;
652	case KW_winddir: thawer.get (winddir); break;
653	case KW_sky: thawer.get (sky); break;
654		656
655	case KW_per_player: thawer.get (per_player); break;	657	case KW_per_player: thawer.get (per_player); break;
656	case KW_per_party: thawer.get (per_party); break;	658	case KW_per_party: thawer.get (per_party); break;
657	case KW_no_reset: thawer.get (no_reset); break;	659	case KW_no_reset: thawer.get (no_reset); break;
658	case KW_no_drop: thawer.get (no_drop); break;	660	case KW_no_drop: thawer.get (no_drop); break;
659		661
660	case KW_region: default_region = region::find (thawer.get_str ()); break;	662	case KW_region: thawer.get (default_region); break;
661	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	663	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
662		664
663	// old names new names	665	// old names new names
664	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	666	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
665	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	667	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
669	case KW_value: case KW_swap_time: thawer.get (timeout); break;	671	case KW_value: case KW_swap_time: thawer.get (timeout); break;
670	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;	672	case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
671	case KW_invisible: case KW_darkness: thawer.get (darkness); break;	673	case KW_invisible: case KW_darkness: thawer.get (darkness); break;
672	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;	674	case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
673		675
674	case KW_tile_path_1: thawer.get (tile_path [0]); break;	676	case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
675	case KW_tile_path_2: thawer.get (tile_path [1]); break;	677	case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
676	case KW_tile_path_3: thawer.get (tile_path [2]); break;	678	case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
677	case KW_tile_path_4: thawer.get (tile_path [3]); break;	679	case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
		680	case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
		681	case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
678		682
679	case KW_ERROR:	683	case KW_ERROR:
680	set_key_text (thawer.kw_str, thawer.value);	684	set_key_text (thawer.kw_str, thawer.value);
681	break;	685	break;
682		686
683	case KW_end:	687	case KW_end:
684	thawer.next ();	688	thawer.next ();
685	return true;	689	return true;
686		690
687	default:	691	default:
688	if (!thawer.parse_error ("map", 0))	692	if (!thawer.parse_error ("map"))
689	return false;	693	return false;
690	break;	694	break;
691	}	695	}
692		696
693	thawer.next ();	697	thawer.next ();
694	}	698	}
695		699
696	abort ();	700	abort ();
697	}	701	}
		702
		703	//+GPL
698		704
699	/******************************************************************************	705	/******************************************************************************
700	* This is the start of unique map handling code	706	* This is the start of unique map handling code
701	*****************************************************************************/	707	*****************************************************************************/
702		708
…		…
709	int unique = 0;	715	int unique = 0;
710	for (object *op = spaces [i].bot; op; )	716	for (object *op = spaces [i].bot; op; )
711	{	717	{
712	object *above = op->above;	718	object *above = op->above;
713		719
714	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	720	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
715	unique = 1;	721	unique = 1;
716		722
717	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	723	if (op->head_ () == op && (op->flag [FLAG_UNIQUE] \|\| unique))
718	op->destroy ();	724	op->destroy ();
719		725
720	op = above;	726	op = above;
721	}	727	}
722	}	728	}
723	}	729	}
724		730
		731	//-GPL
		732
725	bool	733	bool
726	maptile::_save_header (object_freezer &freezer)	734	maptile::_save_header (object_freezer &freezer)
727	{	735	{
728	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	736	#define MAP_OUT(k) freezer.put (KW(k), k)
729	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	737	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
730		738
731	MAP_OUT2 (arch, "map");	739	MAP_OUT2 (arch, CS(map));
732		740
733	if (name) MAP_OUT (name);	741	if (name) MAP_OUT (name);
734	MAP_OUT (swap_time);	742	MAP_OUT (swap_time);
735	MAP_OUT (reset_time);	743	MAP_OUT (reset_time);
736	MAP_OUT (reset_timeout);	744	MAP_OUT (reset_timeout);
737	MAP_OUT (fixed_resettime);	745	MAP_OUT (fixed_resettime);
738	MAP_OUT (no_reset);	746	MAP_OUT (no_reset);
739	MAP_OUT (no_drop);	747	MAP_OUT (no_drop);
740	MAP_OUT (difficulty);	748	MAP_OUT (difficulty);
741
742	if (default_region) MAP_OUT2 (region, default_region->name);	749	if (default_region) MAP_OUT2 (region, default_region->name);
743		750
744	if (shopitems)	751	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
745	{
746	char shop[MAX_BUF];
747	print_shop_string (this, shop);
748	MAP_OUT2 (shopitems, shop);
749	}
750
751	MAP_OUT (shopgreed);	752	MAP_OUT (shopgreed);
752	MAP_OUT (shopmin);	753	MAP_OUT (shopmin);
753	MAP_OUT (shopmax);	754	MAP_OUT (shopmax);
754	if (shoprace) MAP_OUT (shoprace);	755	if (shoprace) MAP_OUT (shoprace);
755	MAP_OUT (darkness);	756
756	MAP_OUT (width);	757	MAP_OUT (width);
757	MAP_OUT (height);	758	MAP_OUT (height);
758	MAP_OUT (enter_x);	759	MAP_OUT (enter_x);
759	MAP_OUT (enter_y);	760	MAP_OUT (enter_y);
760		761	MAP_OUT (darkness);
761	if (msg) freezer.put (KW_msg , KW_endmsg , msg);
762	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
763
764	MAP_OUT (outdoor);	762	MAP_OUT (outdoor);
765	MAP_OUT (temp);	763
766	MAP_OUT (pressure);	764	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
767	MAP_OUT (humid);	765	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
768	MAP_OUT (windspeed);
769	MAP_OUT (winddir);
770	MAP_OUT (sky);
771		766
772	MAP_OUT (per_player);	767	MAP_OUT (per_player);
773	MAP_OUT (per_party);	768	MAP_OUT (per_party);
774		769
775	if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);	770	if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
776	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	771	if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
777	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	772	if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
778	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	773	if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
		774	if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
		775	if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
779		776
780	freezer.put (this);	777	freezer.put (this);
781	freezer.put (KW_end);	778	freezer.put (KW(end));
782		779
783	return true;	780	return true;
784	}	781	}
785		782
786	bool	783	bool
…		…
791	if (!_save_header (freezer))	788	if (!_save_header (freezer))
792	return false;	789	return false;
793		790
794	return freezer.save (path);	791	return freezer.save (path);
795	}	792	}
		793
		794	//+GPL
796		795
797	/*	796	/*
798	* Remove and free all objects in the given map.	797	* Remove and free all objects in the given map.
799	*/	798	*/
800	void	799	void
…		…
838	msg = 0;	837	msg = 0;
839	maplore = 0;	838	maplore = 0;
840	shoprace = 0;	839	shoprace = 0;
841	delete [] shopitems, shopitems = 0;	840	delete [] shopitems, shopitems = 0;
842		841
843	for (int i = 0; i < 4; i++)	842	for (int i = 0; i < array_length (tile_path); i++)
844	tile_path [i] = 0;	843	tile_path [i] = 0;
845	}	844	}
846		845
847	maptile::~maptile ()	846	maptile::~maptile ()
848	{	847	{
…		…
855	/* We need to look through all the maps and see if any maps	854	/* We need to look through all the maps and see if any maps
856	* are pointing at this one for tiling information. Since	855	* are pointing at this one for tiling information. Since
857	* tiling can be asymetric, we just can not look to see which	856	* tiling can be asymetric, we just can not look to see which
858	* maps this map tiles with and clears those.	857	* maps this map tiles with and clears those.
859	*/	858	*/
860	for (int i = 0; i < 4; i++)	859	for (int i = 0; i < array_length (tile_path); i++)
861	if (tile_map[i] == m)	860	if (tile_map[i] == m)
862	tile_map[i] = 0;	861	tile_map[i] = 0;
863	}	862	}
864		863
865	void	864	void
…		…
869		868
870	clear ();	869	clear ();
871	}	870	}
872		871
873	/* decay and destroy perishable items in a map */	872	/* decay and destroy perishable items in a map */
		873	// TODO: should be done regularly, not on map load?
874	void	874	void
875	maptile::do_decay_objects ()	875	maptile::do_decay_objects ()
876	{	876	{
877	if (!spaces)	877	if (!spaces)
878	return;	878	return;
…		…
880	for (mapspace *ms = spaces + size (); ms-- > spaces; )	880	for (mapspace *ms = spaces + size (); ms-- > spaces; )
881	for (object above, op = ms->bot; op; op = above)	881	for (object above, op = ms->bot; op; op = above)
882	{	882	{
883	above = op->above;	883	above = op->above;
884		884
		885	// do not decay anything above unique floor tiles (yet :)
		886	if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
		887	break;
		888
885	bool destroy = 0;	889	bool destroy = 0;
886		890
887	// do not decay anything above unique floor tiles (yet :)	891	if (op->flag [FLAG_IS_FLOOR]
888	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	892	\|\| op->flag [FLAG_OBJ_ORIGINAL]
889	break;	893	\|\| op->flag [FLAG_UNIQUE]
890		894	\|\| op->flag [FLAG_OVERLAY_FLOOR]
891	if (QUERY_FLAG (op, FLAG_IS_FLOOR)	895	\|\| op->flag [FLAG_UNPAID]
892	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
893	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
894	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
895	\|\| QUERY_FLAG (op, FLAG_UNPAID)
896	\|\| op->is_alive ())	896	\|\| op->is_alive ())
897	; // do not decay	897	; // do not decay
898	else if (op->is_weapon ())	898	else if (op->is_weapon ())
899	{	899	{
900	op->stats.dam--;	900	op->stats.dam--;
…		…
925	\|\| mat & M_LIQUID	925	\|\| mat & M_LIQUID
926	\|\| (mat & M_IRON && rndm (1, 5) == 1)	926	\|\| (mat & M_IRON && rndm (1, 5) == 1)
927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)	927	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)	928	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)	929	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
930	\|\| (mat & M_ICE && temp > 32))	930	//\|\| (mat & M_ICE && temp > 32)
		931	)
931	destroy = 1;	932	destroy = 1;
932	}	933	}
933		934
934	/* adjust overall chance below */	935	/* adjust overall chance below */
935	if (destroy && rndm (0, 1))	936	if (destroy && rndm (0, 1))
…		…
955	sint64 total_exp = 0;	956	sint64 total_exp = 0;
956		957
957	for (mapspace *ms = spaces + size (); ms-- > spaces; )	958	for (mapspace *ms = spaces + size (); ms-- > spaces; )
958	for (object *op = ms->bot; op; op = op->above)	959	for (object *op = ms->bot; op; op = op->above)
959	{	960	{
960	if (QUERY_FLAG (op, FLAG_MONSTER))	961	if (op->flag [FLAG_MONSTER])
961	{	962	{
962	total_exp += op->stats.exp;	963	total_exp += op->stats.exp;
963	monster_cnt++;	964	monster_cnt++;
964	}	965	}
965		966
966	if (QUERY_FLAG (op, FLAG_GENERATOR))	967	if (op->flag [FLAG_GENERATOR])
967	{	968	{
968	total_exp += op->stats.exp;	969	total_exp += op->stats.exp;
969		970
970	if (archetype *at = op->other_arch)	971	if (archetype *at = op->other_arch)
971	{	972	{
…		…
1026	*/	1027	*/
1027	void	1028	void
1028	mapspace::update_ ()	1029	mapspace::update_ ()
1029	{	1030	{
1030	object *last = 0;	1031	object *last = 0;
1031	uint8 flags = P_UPTODATE, anywhere = 0;	1032	uint8 flags = P_UPTODATE;
1032	sint8 light = 0;	1033	sint8 light = 0;
1033	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1034	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1035	uint64_t volume = 0;
		1036	uint32_t items = 0;
		1037	object *anywhere = 0;
		1038	uint8_t middle_visibility = 0;
1034		1039
1035	//object *middle = 0;	1040	//object *middle = 0;
1036	//object *top = 0;	1041	//object *top = 0;
1037	//object *floor = 0;	1042	//object *floor = 0;
1038	// this seems to generate better code than using locals, above	1043	// this seems to generate better code than using locals, above
1039	object *&top = faces_obj[0] = 0;	1044	object *&top = faces_obj[0] = 0;
1040	object *&middle = faces_obj[1] = 0;	1045	object *&middle = faces_obj[1] = 0;
1041	object *&floor = faces_obj[2] = 0;	1046	object *&floor = faces_obj[2] = 0;
		1047
		1048	object::flags_t allflags; // all flags of all objects or'ed together
1042		1049
1043	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1050	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1044	{	1051	{
1045	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1052	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1046	light += tmp->glow_radius;	1053	light += tmp->glow_radius;
…		…
1051	* 3 times each time the player moves, because many of the	1058	* 3 times each time the player moves, because many of the
1052	* functions the move_player calls eventualy call this.	1059	* functions the move_player calls eventualy call this.
1053	*	1060	*
1054	* Always put the player down for drawing.	1061	* Always put the player down for drawing.
1055	*/	1062	*/
1056	if (!tmp->invisible)	1063	if (expect_true (!tmp->invisible))
1057	{	1064	{
1058	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1065	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1059	top = tmp;	1066	top = tmp;
1060	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1067	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1061	{	1068	{
1062	/* If we got a floor, that means middle and top were below it,	1069	/* If we got a floor, that means middle and top were below it,
1063	* so should not be visible, so we clear them.	1070	* so should not be visible, so we clear them.
1064	*/	1071	*/
1065	middle = 0;	1072	middle = 0;
1066	top = 0;	1073	top = 0;
1067	floor = tmp;	1074	floor = tmp;
		1075	volume = 0;
		1076	items = 0;
1068	}	1077	}
1069	/* Flag anywhere have high priority */	1078	else
1070	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1071	{	1079	{
		1080	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1081	{
		1082	++items;
		1083	volume += tmp->volume ();
		1084	}
		1085
		1086	/* Flag anywhere have high priority */
		1087	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1088	anywhere = tmp;
		1089
		1090	/* Find the highest visible face around. If equal
		1091	* visibilities, we still want the one nearer to the
		1092	* top
		1093	*/
		1094	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1095	{
		1096	middle_visibility = ::faces [tmp->face].visibility;
1072	middle = tmp;	1097	middle = tmp;
1073	anywhere = 1;	1098	}
1074	}	1099	}
1075
1076	/* Find the highest visible face around. If equal
1077	* visibilities, we still want the one nearer to the
1078	* top
1079	*/
1080	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1081	middle = tmp;
1082	}
1083
1084	if (tmp == tmp->above)
1085	{
1086	LOG (llevError, "Error in structure of map\n");
1087	exit (-1);
1088	}	1100	}
1089		1101
1090	move_slow \|= tmp->move_slow;	1102	move_slow \|= tmp->move_slow;
1091	move_block \|= tmp->move_block;	1103	move_block \|= tmp->move_block;
1092	move_on \|= tmp->move_on;	1104	move_on \|= tmp->move_on;
1093	move_off \|= tmp->move_off;	1105	move_off \|= tmp->move_off;
1094	move_allow \|= tmp->move_allow;	1106	move_allow \|= tmp->move_allow;
1095		1107
1096	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1108	allflags \|= tmp->flag;
1097	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1109
1098	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1110	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1099	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1111	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1100	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1101	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1102	}	1112	}
		1113
		1114	// FLAG_SEE_ANYWHERE takes precedence
		1115	if (anywhere)
		1116	middle = anywhere;
		1117
		1118	// ORing all flags together and checking them here is much faster
		1119	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1120	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1121	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1122	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1103		1123
1104	this->light = min (light, MAX_LIGHT_RADIUS);	1124	this->light = min (light, MAX_LIGHT_RADIUS);
1105	this->flags_ = flags;	1125	this->flags_ = flags;
1106	this->move_block = move_block & ~move_allow;	1126	this->move_block = move_block & ~move_allow;
1107	this->move_on = move_on;	1127	this->move_on = move_on;
1108	this->move_off = move_off;	1128	this->move_off = move_off;
1109	this->move_slow = move_slow;	1129	this->move_slow = move_slow;
		1130	this->volume_ = (volume + 1023) / 1024;
		1131	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1110		1132
1111	/* At this point, we have a floor face (if there is a floor),	1133	/* At this point, we have a floor face (if there is a floor),
1112	* and the floor is set - we are not going to touch it at	1134	* and the floor is set - we are not going to touch it at
1113	* this point.	1135	* this point.
1114	* middle contains the highest visibility face.	1136	* middle contains the highest visibility face.
…		…
1132	*/	1154	*/
1133		1155
1134	for (object *tmp = last; tmp; tmp = tmp->below)	1156	for (object *tmp = last; tmp; tmp = tmp->below)
1135	{	1157	{
1136	/* Once we get to a floor, stop, since we already have a floor object */	1158	/* Once we get to a floor, stop, since we already have a floor object */
1137	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1159	if (tmp->flag [FLAG_IS_FLOOR])
1138	break;	1160	break;
1139		1161
1140	/* If two top faces are already set, quit processing */	1162	/* If two top faces are already set, quit processing */
1141	if (top && middle)	1163	if (top && middle)
1142	break;	1164	break;
…		…
1173	middle = 0;	1195	middle = 0;
1174		1196
1175	if (top == middle)	1197	if (top == middle)
1176	middle = 0;	1198	middle = 0;
1177		1199
		1200	// set lower map transparent floor flag if applicable
		1201	if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
		1202	{
		1203	floor->set_anim_frame (0);
		1204
		1205	if (maptile *m = floor->map->tile_map [TILE_DOWN])
		1206	{
		1207	mapspace &ms = m->at (floor->x, floor->y);
		1208	ms.update ();
		1209
		1210	if (object *floor2 = ms.faces_obj [2])
		1211	if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
		1212	{
		1213	floor->set_anim_frame (1);
		1214	top = floor;
		1215	middle = ms.faces_obj [0];
		1216	floor = floor2;
		1217	}
		1218
		1219	ms.pflags \|= PF_VIS_UP;
		1220	}
		1221	}
		1222
1178	#if 0	1223	#if 0
1179	faces_obj [0] = top;	1224	faces_obj [0] = top;
1180	faces_obj [1] = middle;	1225	faces_obj [1] = middle;
1181	faces_obj [2] = floor;	1226	faces_obj [2] = floor;
1182	#endif	1227	#endif
1183	}	1228	}
1184		1229
1185	uint64	1230	void
1186	mapspace::volume () const	1231	mapspace::update_up ()
1187	{	1232	{
1188	uint64 vol = 0;	1233	// invalidate up
1189		1234	if (!(pflags & PF_VIS_UP))
1190	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1191	vol += op->volume ();
1192
1193	return vol;	1235	return;
		1236
		1237	pflags &= ~PF_VIS_UP;
		1238
		1239	if (bot)
		1240	if (maptile *m = bot->map->tile_map [TILE_UP])
		1241	m->at (bot->x, bot->y).invalidate ();
1194	}	1242	}
1195		1243
1196	maptile *	1244	maptile *
1197	maptile::tile_available (int dir, bool load)	1245	maptile::tile_available (int dir, bool load)
1198	{	1246	{
		1247	// map is there and we don't need to load it OR it's loaded => return what we have
		1248	if (tile_map [dir] && (!load \|\| tile_map [dir]->linkable ()))
		1249	return tile_map [dir];
		1250
1199	if (tile_path[dir])	1251	if (tile_path [dir])
1200	{	1252	{
1201	if (tile_map[dir] && (!load \|\| tile_map[dir]->in_memory == MAP_ACTIVE))	1253	// well, try to locate it then, if possible - maybe it's there already
		1254	// this is the ONLY place in the server that links maps with each other,
		1255	// so any kind of inter-map stuff has to be initiated here.
		1256	if (maptile *m = find_async (tile_path [dir], this, load))
		1257	{
		1258	bool mismatch = false;
		1259
		1260	if (dir == TILE_NORTH \|\| dir == TILE_SOUTH \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1261	if (width != m->width)
		1262	mismatch = true;
		1263
		1264	if (dir == TILE_EAST \|\| dir == TILE_WEST \|\| dir == TILE_UP \|\| dir == TILE_DOWN)
		1265	if (height != m->height)
		1266	mismatch = true;
		1267
		1268	if (mismatch)
		1269	{
		1270	LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
		1271	dir, &path, &m->path);
		1272	m = 0;
		1273	}
		1274	else if (0)//D
		1275	{
		1276	// as an optimisation, link us against the other map if the other map
		1277	// has us as neighbour, which is very common, but not guaranteed.
		1278	int dir2 = REVERSE_TILE_DIR (dir);
		1279
		1280	if (m->tile_path [dir2] == path)
		1281	m->tile_map [dir2] = this;
		1282	}
		1283
		1284
1202	return tile_map[dir];	1285	return tile_map [dir] = m;
1203		1286	}
1204	if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1205	return tile_map[dir];
1206	}	1287	}
1207		1288
1208	return 0;	1289	return 0;
1209	}	1290	}
1210		1291
…		…
1226	if (!m)	1307	if (!m)
1227	return 0;	1308	return 0;
1228		1309
1229	if (x < 0)	1310	if (x < 0)
1230	{	1311	{
1231	if (!m->tile_available (3))	1312	if (!m->tile_available (TILE_WEST))
1232	return 1;	1313	return 1;
1233		1314
1234	return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);	1315	return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1235	}	1316	}
1236		1317
1237	if (x >= m->width)	1318	if (x >= m->width)
1238	{	1319	{
1239	if (!m->tile_available (1))	1320	if (!m->tile_available (TILE_EAST))
1240	return 1;	1321	return 1;
1241		1322
1242	return out_of_map (m->tile_map[1], x - m->width, y);	1323	return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1243	}	1324	}
1244		1325
1245	if (y < 0)	1326	if (y < 0)
1246	{	1327	{
1247	if (!m->tile_available (0))	1328	if (!m->tile_available (TILE_NORTH))
1248	return 1;	1329	return 1;
1249		1330
1250	return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);	1331	return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1251	}	1332	}
1252		1333
1253	if (y >= m->height)	1334	if (y >= m->height)
1254	{	1335	{
1255	if (!m->tile_available (2))	1336	if (!m->tile_available (TILE_SOUTH))
1256	return 1;	1337	return 1;
1257		1338
1258	return out_of_map (m->tile_map[2], x, y - m->height);	1339	return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1259	}	1340	}
1260		1341
1261	/* Simple case - coordinates are within this local	1342	/* Simple case - coordinates are within this local
1262	* map.	1343	* map.
1263	*/	1344	*/
…		…
1275	maptile *	1356	maptile *
1276	maptile::xy_find (sint16 &x, sint16 &y)	1357	maptile::xy_find (sint16 &x, sint16 &y)
1277	{	1358	{
1278	if (x < 0)	1359	if (x < 0)
1279	{	1360	{
1280	if (!tile_available (3))	1361	if (!tile_available (TILE_WEST))
1281	return 0;	1362	return 0;
1282		1363
1283	x += tile_map[3]->width;	1364	x += tile_map [TILE_WEST]->width;
1284	return tile_map[3]->xy_find (x, y);	1365	return tile_map [TILE_WEST]->xy_find (x, y);
1285	}	1366	}
1286		1367
1287	if (x >= width)	1368	if (x >= width)
1288	{	1369	{
1289	if (!tile_available (1))	1370	if (!tile_available (TILE_EAST))
1290	return 0;	1371	return 0;
1291		1372
1292	x -= width;	1373	x -= width;
1293	return tile_map[1]->xy_find (x, y);	1374	return tile_map [TILE_EAST]->xy_find (x, y);
1294	}	1375	}
1295		1376
1296	if (y < 0)	1377	if (y < 0)
1297	{	1378	{
1298	if (!tile_available (0))	1379	if (!tile_available (TILE_NORTH))
1299	return 0;	1380	return 0;
1300		1381
1301	y += tile_map[0]->height;	1382	y += tile_map [TILE_NORTH]->height;
1302	return tile_map[0]->xy_find (x, y);	1383	return tile_map [TILE_NORTH]->xy_find (x, y);
1303	}	1384	}
1304		1385
1305	if (y >= height)	1386	if (y >= height)
1306	{	1387	{
1307	if (!tile_available (2))	1388	if (!tile_available (TILE_SOUTH))
1308	return 0;	1389	return 0;
1309		1390
1310	y -= height;	1391	y -= height;
1311	return tile_map[2]->xy_find (x, y);	1392	return tile_map [TILE_SOUTH]->xy_find (x, y);
1312	}	1393	}
1313		1394
1314	/* Simple case - coordinates are within this local	1395	/* Simple case - coordinates are within this local
1315	* map.	1396	* map.
1316	*/	1397	*/
…		…
1320	/**	1401	/**
1321	* Return whether map2 is adjacent to map1. If so, store the distance from	1402	* Return whether map2 is adjacent to map1. If so, store the distance from
1322	* map1 to map2 in dx/dy.	1403	* map1 to map2 in dx/dy.
1323	*/	1404	*/
1324	int	1405	int
1325	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1406	adjacent_map (maptile map1, maptile map2, int dx, int dy)
1326	{	1407	{
1327	if (!map1 \|\| !map2)	1408	if (!map1 \|\| !map2)
1328	return 0;	1409	return 0;
1329		1410
1330	//TODO: this doesn't actually check correctly when intermediate maps are not loaded	1411	//TODO: this doesn't actually check correctly when intermediate maps are not loaded
…		…
1332	if (map1 == map2)	1413	if (map1 == map2)
1333	{	1414	{
1334	*dx = 0;	1415	*dx = 0;
1335	*dy = 0;	1416	*dy = 0;
1336	}	1417	}
1337	else if (map1->tile_map[0] == map2)	1418	else if (map1->tile_available (TILE_NORTH, false) == map2)
1338	{ /* up */	1419	{
1339	*dx = 0;	1420	*dx = 0;
1340	*dy = -map2->height;	1421	*dy = -map2->height;
1341	}	1422	}
1342	else if (map1->tile_map[1] == map2)	1423	else if (map1->tile_available (TILE_EAST , false) == map2)
1343	{ /* right */	1424	{
1344	*dx = map1->width;	1425	*dx = map1->width;
1345	*dy = 0;	1426	*dy = 0;
1346	}	1427	}
1347	else if (map1->tile_map[2] == map2)	1428	else if (map1->tile_available (TILE_SOUTH, false) == map2)
1348	{ /* down */	1429	{
1349	*dx = 0;	1430	*dx = 0;
1350	*dy = map1->height;	1431	*dy = map1->height;
1351	}	1432	}
1352	else if (map1->tile_map[3] == map2)	1433	else if (map1->tile_available (TILE_WEST , false) == map2)
1353	{ /* left */	1434	{
1354	*dx = -map2->width;	1435	*dx = -map2->width;
1355	*dy = 0;	1436	*dy = 0;
1356	}	1437	}
1357	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)	1438	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1358	{ /* up right */	1439	{ /* up right */
1359	*dx = map1->tile_map[0]->width;	1440	*dx = +map1->tile_map[TILE_NORTH]->width;
1360	*dy = -map1->tile_map[0]->height;	1441	*dy = -map1->tile_map[TILE_NORTH]->height;
1361	}	1442	}
1362	else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)	1443	else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1363	{ /* up left */	1444	{ /* up left */
1364	*dx = -map2->width;	1445	*dx = -map2->width;
1365	*dy = -map1->tile_map[0]->height;	1446	*dy = -map1->tile_map[TILE_NORTH]->height;
1366	}	1447	}
1367	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)	1448	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1368	{ /* right up */	1449	{ /* right up */
1369	*dx = map1->width;	1450	*dx = +map1->width;
1370	*dy = -map2->height;	1451	*dy = -map2->height;
1371	}	1452	}
1372	else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)	1453	else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1373	{ /* right down */	1454	{ /* right down */
1374	*dx = map1->width;	1455	*dx = +map1->width;
1375	*dy = map1->tile_map[1]->height;	1456	*dy = +map1->tile_map[TILE_EAST]->height;
1376	}	1457	}
1377	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)	1458	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1378	{ /* down right */	1459	{ /* down right */
1379	*dx = map1->tile_map[2]->width;	1460	*dx = +map1->tile_map[TILE_SOUTH]->width;
1380	*dy = map1->height;	1461	*dy = +map1->height;
1381	}	1462	}
1382	else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)	1463	else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1383	{ /* down left */	1464	{ /* down left */
1384	*dx = -map2->width;	1465	*dx = -map2->width;
1385	*dy = map1->height;	1466	*dy = +map1->height;
1386	}	1467	}
1387	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)	1468	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1388	{ /* left up */	1469	{ /* left up */
1389	*dx = -map1->tile_map[3]->width;	1470	*dx = -map1->tile_map[TILE_WEST]->width;
1390	*dy = -map2->height;	1471	*dy = -map2->height;
1391	}	1472	}
1392	else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)	1473	else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1393	{ /* left down */	1474	{ /* left down */
1394	*dx = -map1->tile_map[3]->width;	1475	*dx = -map1->tile_map[TILE_WEST]->width;
1395	*dy = map1->tile_map[3]->height;	1476	*dy = +map1->tile_map[TILE_WEST]->height;
1396	}	1477	}
1397	else	1478	else
1398	return 0;	1479	return 0;
1399		1480
1400	return 1;	1481	return 1;
…		…
1423	* so you just can not look the the map coordinates and get the	1504	* so you just can not look the the map coordinates and get the
1424	* righte value. distance_x/y are distance away, which	1505	* righte value. distance_x/y are distance away, which
1425	* can be negative. direction is the crossfire direction scheme	1506	* can be negative. direction is the crossfire direction scheme
1426	* that the creature should head. part is the part of the	1507	* that the creature should head. part is the part of the
1427	* monster that is closest.	1508	* monster that is closest.
1428	*	1509	*
1429	* get_rangevector looks at op1 and op2, and fills in the	1510	* get_rangevector looks at op1 and op2, and fills in the
1430	* structure for op1 to get to op2.	1511	* structure for op1 to get to op2.
1431	* We already trust that the caller has verified that the	1512	* We already trust that the caller has verified that the
1432	* two objects are at least on adjacent maps. If not,	1513	* two objects are at least on adjacent maps. If not,
1433	* results are not likely to be what is desired.	1514	* results are not likely to be what is desired.
…		…
1436	*	1517	*
1437	* currently, the only flag supported (0x1) is don't translate for	1518	* currently, the only flag supported (0x1) is don't translate for
1438	* closest body part of 'op1'	1519	* closest body part of 'op1'
1439	*/	1520	*/
1440	void	1521	void
1441	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1522	get_rangevector (object op1, object op2, rv_vector *retval, int flags)
1442	{	1523	{
1443	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1524	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1444	{	1525	{
1445	/* be conservative and fill in _some_ data */	1526	/* be conservative and fill in _some_ data */
1446	retval->distance = 10000;	1527	retval->distance = 10000;
1447	retval->distance_x = 10000;	1528	retval->distance_x = 10000;
1448	retval->distance_y = 10000;	1529	retval->distance_y = 10000;
1449	retval->direction = 0;	1530	retval->direction = 0;
1450	retval->part = 0;	1531	retval->part = 0;
1451	}	1532	}
1452	else	1533	else
1453	{	1534	{
1454	object *best;
1455
1456	retval->distance_x += op2->x - op1->x;	1535	retval->distance_x += op2->x - op1->x;
1457	retval->distance_y += op2->y - op1->y;	1536	retval->distance_y += op2->y - op1->y;
1458		1537
1459	best = op1;	1538	object *best = op1;
		1539
1460	/* If this is multipart, find the closest part now */	1540	/* If this is multipart, find the closest part now */
1461	if (!(flags & 0x1) && op1->more)	1541	if (!(flags & 1) && op1->more)
1462	{	1542	{
1463	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1543	int best_distance = idistance (retval->distance_x, retval->distance_y);
1464		1544
1465	/* we just take the offset of the piece to head to figure	1545	/* we just take the offset of the piece to head to figure
1466	* distance instead of doing all that work above again	1546	* distance instead of doing all that work above again
1467	* since the distance fields we set above are positive in the	1547	* since the distance fields we set above are positive in the
1468	* same axis as is used for multipart objects, the simply arithmetic	1548	* same axis as is used for multipart objects, the simply arithmetic
1469	* below works.	1549	* below works.
1470	*/	1550	*/
1471	for (object *tmp = op1->more; tmp; tmp = tmp->more)	1551	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1472	{	1552	{
1473	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1553	int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1474	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1554
1475	if (tmpi < best_distance)	1555	if (tmpi < best_distance)
1476	{	1556	{
1477	best_distance = tmpi;	1557	best_distance = tmpi;
1478	best = tmp;	1558	best = tmp;
1479	}	1559	}
1480	}	1560	}
1481		1561
1482	if (best != op1)	1562	if (best != op1)
1483	{	1563	{
1484	retval->distance_x += op1->x - best->x;	1564	retval->distance_x += op1->x - best->x;
1485	retval->distance_y += op1->y - best->y;	1565	retval->distance_y += op1->y - best->y;
1486	}	1566	}
1487	}	1567	}
1488		1568
1489	retval->part = best;	1569	retval->part = best;
1490	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1570	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1491	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1571	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1492	}	1572	}
1493	}	1573	}
1494		1574
1495	/* this is basically the same as get_rangevector above, but instead of	1575	/* this is basically the same as get_rangevector above, but instead of
1496	* the first parameter being an object, it instead is the map	1576	* the first parameter being an object, it instead is the map
…		…
1501	* be more consistant with the above function and also in case they are needed	1581	* be more consistant with the above function and also in case they are needed
1502	* for something in the future. Also, since no object is pasted, the best	1582	* for something in the future. Also, since no object is pasted, the best
1503	* field of the rv_vector is set to NULL.	1583	* field of the rv_vector is set to NULL.
1504	*/	1584	*/
1505	void	1585	void
1506	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)	1586	get_rangevector_from_mapcoord (maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1507	{	1587	{
1508	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1588	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1509	{	1589	{
1510	/* be conservative and fill in _some_ data */	1590	/* be conservative and fill in _some_ data */
1511	retval->distance = 100000;	1591	retval->distance = 100000;
1512	retval->distance_x = 32767;	1592	retval->distance_x = 32767;
1513	retval->distance_y = 32767;	1593	retval->distance_y = 32767;
1514	retval->direction = 0;	1594	retval->direction = 0;
1515	retval->part = 0;	1595	retval->part = 0;
1516	}	1596	}
1517	else	1597	else
1518	{	1598	{
1519	retval->distance_x += op2->x - x;	1599	retval->distance_x += op2->x - x;
1520	retval->distance_y += op2->y - y;	1600	retval->distance_y += op2->y - y;
1521		1601
1522	retval->part = 0;	1602	retval->part = 0;
1523	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));	1603	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1524	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1604	retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1525	}	1605	}
1526	}	1606	}
1527		1607
1528	/* Returns true of op1 and op2 are effectively on the same map	1608	/* Returns true of op1 and op2 are effectively on the same map
1529	* (as related to map tiling). Note that this looks for a path from	1609	* (as related to map tiling). Note that this looks for a path from
…		…
1539	int dx, dy;	1619	int dx, dy;
1540		1620
1541	return adjacent_map (op1->map, op2->map, &dx, &dy);	1621	return adjacent_map (op1->map, op2->map, &dx, &dy);
1542	}	1622	}
1543		1623
		1624	//-GPL
		1625
1544	object *	1626	object *
1545	maptile::insert (object op, int x, int y, object originator, int flags)	1627	maptile::insert (object op, int x, int y, object originator, int flags)
1546	{	1628	{
1547	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1629	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1548	}	1630	}
…		…
1559	if (default_region)	1641	if (default_region)
1560	return default_region;	1642	return default_region;
1561		1643
1562	return ::region::default_region ();	1644	return ::region::default_region ();
1563	}	1645	}
		1646
		1647	//+GPL
1564		1648
1565	/* picks a random object from a style map.	1649	/* picks a random object from a style map.
1566	*/	1650	*/
1567	object *	1651	object *
1568	maptile::pick_random_object (rand_gen &gen) const	1652	maptile::pick_random_object (rand_gen &gen) const
…		…
1575	*/	1659	*/
1576	for (int i = 1000; --i;)	1660	for (int i = 1000; --i;)
1577	{	1661	{
1578	object *pick = at (gen (width), gen (height)).bot;	1662	object *pick = at (gen (width), gen (height)).bot;
1579		1663
1580	// do not prefer big monsters just because they are big.	1664	// must be head: do not prefer big monsters just because they are big.
1581	if (pick && pick->is_head ())	1665	if (pick && pick->is_head ())
1582	return pick->head_ ();	1666	return pick;
1583	}	1667	}
1584		1668
1585	// instead of crashing in the unlikely(?) case, try to return something	1669	// instead of crashing in the unlikely(?) case, try to return something
1586	return archetype::find ("bug");	1670	return archetype::find (shstr_bug);
1587	}	1671	}
		1672
		1673	//-GPL
1588		1674
1589	void	1675	void
1590	maptile::play_sound (faceidx sound, int x, int y) const	1676	maptile::play_sound (faceidx sound, int x, int y) const
1591	{	1677	{
1592	if (!sound)	1678	if (!sound)
…		…
1619	if (distance <= MAX_SOUND_DISTANCE)	1705	if (distance <= MAX_SOUND_DISTANCE)
1620	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);	1706	ns->send_msg (NDI_GREY \| NDI_DEF, SAY_CHANNEL, msg);
1621	}	1707	}
1622	}	1708	}
1623		1709
		1710	dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
		1711
1624	static void	1712	static void
1625	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)	1713	split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1626	{	1714	{
1627	// clip to map to the left	1715	// clip to map to the left
1628	if (x0 < 0)	1716	if (x0 < 0)
1629	{	1717	{
1630	if (maptile *tile = m->tile_available (TILE_LEFT, 1))	1718	if (maptile *tile = m->tile_available (TILE_WEST, 1))
1631	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);	1719	split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1632		1720
1633	if (x1 < 0) // entirely to the left	1721	if (x1 < 0) // entirely to the left
1634	return;	1722	return;
1635		1723
…		…
1637	}	1725	}
1638		1726
1639	// clip to map to the right	1727	// clip to map to the right
1640	if (x1 > m->width)	1728	if (x1 > m->width)
1641	{	1729	{
1642	if (maptile *tile = m->tile_available (TILE_RIGHT, 1))	1730	if (maptile *tile = m->tile_available (TILE_EAST, 1))
1643	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);	1731	split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1644		1732
1645	if (x0 > m->width) // entirely to the right	1733	if (x0 >= m->width) // entirely to the right
1646	return;	1734	return;
1647		1735
1648	x1 = m->width;	1736	x1 = m->width;
1649	}	1737	}
1650		1738
1651	// clip to map above	1739	// clip to map to the north
1652	if (y0 < 0)	1740	if (y0 < 0)
1653	{	1741	{
1654	if (maptile *tile = m->tile_available (TILE_UP, 1))	1742	if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1655	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);	1743	split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1656		1744
1657	if (y1 < 0) // entirely above	1745	if (y1 < 0) // entirely to the north
1658	return;	1746	return;
1659		1747
1660	y0 = 0;	1748	y0 = 0;
1661	}	1749	}
1662		1750
1663	// clip to map below	1751	// clip to map to the south
1664	if (y1 > m->height)	1752	if (y1 > m->height)
1665	{	1753	{
1666	if (maptile *tile = m->tile_available (TILE_DOWN, 1))	1754	if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1667	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);	1755	split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1668		1756
1669	if (y0 > m->height) // entirely below	1757	if (y0 >= m->height) // entirely to the south
1670	return;	1758	return;
1671		1759
1672	y1 = m->height;	1760	y1 = m->height;
1673	}	1761	}
1674		1762
…		…
1683	r->dx = dx;	1771	r->dx = dx;
1684	r->dy = dy;	1772	r->dy = dy;
1685	}	1773	}
1686		1774
1687	maprect *	1775	maprect *
1688	maptile::split_to_tiles (int x0, int y0, int x1, int y1)	1776	maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1689	{	1777	{
1690	static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1691	buf.clear ();	1778	buf.clear ();
1692		1779
1693	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);	1780	::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694		1781
1695	// add end marker	1782	// add end marker

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.162 by root, Tue Oct 13 18:22:44 2009 UTC vs. Revision 1.218 by root, Mon Oct 29 23:55:52 2012 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.162 by root, Tue Oct 13 18:22:44 2009 UTC vs.
Revision 1.218 by root, Mon Oct 29 23:55:52 2012 UTC