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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.81 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 05:00:17 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,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	* Crossfire TRT 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 <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>
26	#include <funcpoint.h>
27
28	#include <loader.h>
29	#include <unistd.h>	24	#include <unistd.h>
		25
		26	#include "global.h"
		27	#include "funcpoint.h"
		28
		29	#include "loader.h"
30		30
31	#include "path.h"	31	#include "path.h"
32		32
33	/*	33	/*
34	* This makes a path absolute outside the world of Crossfire.	34	* This makes a path absolute outside the world of Crossfire.
67	char *endbuf;	67	char *endbuf;
68	struct stat statbuf;	68	struct stat statbuf;
69	int mode = 0;	69	int mode = 0;
70		70
71	if (prepend_dir)	71	if (prepend_dir)
72	strcpy (buf, create_pathname (name));	72	assign (buf, create_pathname (name));
73	else	73	else
74	strcpy (buf, name);	74	assign (buf, name);
75		75
76	/* old method (strchr(buf, '\0')) seemd very odd to me -	76	/* old method (strchr(buf, '\0')) seemd very odd to me -
77	* this method should be equivalant and is clearer.	77	* this method should be equivalant and is clearer.
78	* Can not use strcat because we need to cycle through	78	* Can not use strcat because we need to cycle through
79	* all the names.	79	* all the names.
…		…
173	* let the player through (inventory checkers for example)	173	* let the player through (inventory checkers for example)
174	*/	174	*/
175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176	return 0;	176	return 0;
177		177
178	if (ob->head != NULL)
179	ob = ob->head;	178	ob = ob->head_ ();
180		179
181	/* We basically go through the stack of objects, and if there is	180	/* We basically go through the stack of objects, and if there is
182	* some other object that has NO_PASS or FLAG_ALIVE set, return	181	* some other object that has NO_PASS or FLAG_ALIVE set, return
183	* true. If we get through the entire stack, that must mean	182	* true. If we get through the entire stack, that must mean
184	* ob is blocking it, so return 0.	183	* ob is blocking it, so return 0.
…		…
214	else	213	else
215	{	214	{
216	/* Broke apart a big nasty if into several here to make	215	/* Broke apart a big nasty if into several here to make
217	* this more readable. first check - if the space blocks	216	* this more readable. first check - if the space blocks
218	* movement, can't move here.	217	* movement, can't move here.
219	* second - if a monster, can't move there, unles it is a	218	* second - if a monster, can't move there, unless it is a
220	* hidden dm	219	* hidden dm
221	*/	220	*/
222	if (OB_MOVE_BLOCK (ob, tmp))	221	if (OB_MOVE_BLOCK (ob, tmp))
223	return 1;	222	return 1;
224	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&	223
225	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))	224	if (tmp->flag [FLAG_ALIVE]
		225	&& tmp->head_ () != ob
		226	&& tmp != ob
		227	&& tmp->type != DOOR
		228	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
226	return 1;	229	return 1;
227	}	230	}
228		231
229	}	232	}
230	return 0;	233	return 0;
…		…
272		275
273	/* don't have object, so don't know what types would block */	276	/* don't have object, so don't know what types would block */
274	return m1->at (sx, sy).move_block;	277	return m1->at (sx, sy).move_block;
275	}	278	}
276		279
277	for (tmp = ob->arch; tmp; tmp = tmp->more)	280	for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
278	{	281	{
279	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);	282	flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
280		283
281	if (flag & P_OUT_OF_MAP)	284	if (flag & P_OUT_OF_MAP)
282	return P_OUT_OF_MAP;	285	return P_OUT_OF_MAP;
283	if (flag & P_IS_ALIVE)	286	if (flag & P_IS_ALIVE)
284	return P_IS_ALIVE;	287	return P_IS_ALIVE;
…		…
343	}	346	}
344		347
345	/* link_multipart_objects go through all the objects on the map looking	348	/* link_multipart_objects go through all the objects on the map looking
346	* for objects whose arch says they are multipart yet according to the	349	* for objects whose arch says they are multipart yet according to the
347	* info we have, they only have the head (as would be expected when	350	* info we have, they only have the head (as would be expected when
348	* they are saved). We do have to look for the old maps that did save	351	* they are saved).
349	* the more sections and not re-add sections for them.
350	*/	352	*/
351	void	353	void
352	maptile::link_multipart_objects ()	354	maptile::link_multipart_objects ()
353	{	355	{
354	if (!spaces)	356	if (!spaces)
355	return;	357	return;
356		358
357	for (mapspace *ms = spaces + size (); ms-- > spaces; )	359	for (mapspace *ms = spaces + size (); ms-- > spaces; )
358	for (object *tmp = ms->bot; tmp; )	360	for (object *op = ms->bot; op; op = op->above)
359	{	361	{
360	object *above = tmp->above;
361
362	/* already multipart - don't do anything more */	362	/* already multipart - don't do anything more */
363	if (!tmp->head && !tmp->more)	363	if (op->head_ () == op && !op->more && op->arch->more)
364	{	364	{
365	/* If there is nothing more to this object, this for loop	365	op->remove ();
366	* won't do anything.	366	op->expand_tail ();
367	*/
368	archetype *at;
369	object last, op;
370	for (at = tmp->arch->more, last = tmp;
371	at;
372	at = at->more, last = op)
373	{
374	op = arch_to_object (at);
375
376	/* update x,y coordinates */
377	op->x += tmp->x;
378	op->y += tmp->y;
379	op->head = tmp;
380	op->map = this;
381	last->more = op;
382	op->name = tmp->name;
383	op->title = tmp->title;
384
385	/* we could link all the parts onto tmp, and then just
386	* call insert_ob_in_map once, but the effect is the same,
387	* as insert_ob_in_map will call itself with each part, and
388	* the coding is simpler to just to it here with each part.
389	*/
390	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	367	insert (op, op->x, op->y, 0, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);
391	}
392	}	368	}
393
394	tmp = above;
395	}	369	}
396	}	370	}
397		371
398	/*	372	/*
399	* Loads (ands parses) the objects into a given map from the specified	373	* Loads (ands parses) the objects into a given map from the specified
400	* file pointer.	374	* file pointer.
401	* mapflags is the same as we get with load_original_map
402	*/	375	*/
403	bool	376	bool
404	maptile::_load_objects (object_thawer &thawer)	377	maptile::_load_objects (object_thawer &f)
405	{	378	{
406	int unique;	379	for (;;)
407	object op, prev = NULL, last_more = NULL, otmp;
408
409	op = object::create ();
410	op->map = this; /* To handle buttons correctly */
411
412	while (int i = load_object (thawer, op, 0))
413	{	380	{
414	/* if the archetype for the object is null, means that we	381	coroapi::cede_to_tick_every (100); // cede once in a while
415	* got an invalid object. Don't do anything with it - the game	382
416	* or editor will not be able to do anything with it either.	383	switch (f.kw)
417	*/
418	if (op->arch == NULL)
419	{	384	{
420	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	385	case KW_arch:
421	continue;	386	if (object *op = object::read (f, this))
422	}
423
424	switch (i)
425	{	387	{
426	case LL_NORMAL:	388	if (op->inv)
		389	sum_weight (op);
		390
427	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);	391	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);
		392	}
428		393
429	if (op->inv)	394	continue;
430	sum_weight (op);
431		395
432	prev = op, last_more = op;
433	break;
434
435	case LL_MORE:	396	case KW_EOF:
436	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ABOVE_FLOOR_ONLY);	397	return true;
437	op->head = prev, last_more->more = op, last_more = op;	398
		399	default:
		400	if (!f.parse_error ("map file"))
		401	return false;
438	break;	402	break;
439	}	403	}
440		404
441	op = object::create ();	405	f.next ();
442	op->map = this;
443	}
444
445	op->destroy ();
446
447	#if 0
448	for (i = 0; i < width; i++)
449	for (j = 0; j < height; j++)
450	{
451	unique = 0;
452	/* check for unique items, or unique squares */
453	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454	{
455	if (QUERY_FLAG (otmp, FLAG_UNIQUE) \|\| QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456	unique = 1;
457
458	if (!(mapflags & (MAP_OVERLAY \| MAP_PLAYER_UNIQUE) \|\| unique))
459	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460	}
461	}	406	}
462	#endif
463		407
464	return true;	408	return true;
465	}	409	}
466		410
467	void	411	void
468	maptile::activate ()	412	maptile::activate ()
469	{	413	{
		414	active = true;
		415
470	if (!spaces)	416	if (spaces)
471	return;
472
473	for (mapspace *ms = spaces + size (); ms-- > spaces; )	417	for (mapspace *ms = spaces + size (); ms-- > spaces; )
474	for (object *op = ms->bot; op; op = op->above)	418	for (object *op = ms->bot; op; op = op->above)
475	op->activate_recursive ();	419	op->activate_recursive ();
476	}	420	}
477		421
478	void	422	void
479	maptile::deactivate ()	423	maptile::deactivate ()
480	{	424	{
		425	active = false;
		426
481	if (!spaces)	427	if (spaces)
482	return;
483
484	for (mapspace *ms = spaces + size (); ms-- > spaces; )	428	for (mapspace *ms = spaces + size (); ms-- > spaces; )
485	for (object *op = ms->bot; op; op = op->above)	429	for (object *op = ms->bot; op; op = op->above)
486	op->deactivate_recursive ();	430	op->deactivate_recursive ();
487	}	431	}
488		432
489	bool	433	bool
490	maptile::_save_objects (object_freezer &freezer, int flags)	434	maptile::_save_objects (object_freezer &f, int flags)
491	{	435	{
492	static int cede_count = 0;	436	coroapi::cede_to_tick ();
493		437
494	if (flags & IO_HEADER)	438	if (flags & IO_HEADER)
495	_save_header (freezer);	439	_save_header (f);
496		440
497	if (!spaces)	441	if (!spaces)
498	return false;	442	return false;
499		443
500	for (int i = 0; i < size (); ++i)	444	for (int i = 0; i < size (); ++i)
501	{	445	{
502	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503	if (cede_count >= 500)
504	{
505	cede_count = 0;
506	coroapi::cede ();
507	}
508	#endif
509
510	int unique = 0;	446	int unique = 0;
511	for (object *op = spaces [i].bot; op; op = op->above)	447	for (object *op = spaces [i].bot; op; op = op->above)
512	{	448	{
513	// count per-object, but cede only when modification-safe
514	cede_count++;
515
516	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	449	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
517	unique = 1;	450	unique = 1;
518		451
519	if (!op->can_map_save ())	452	if (!op->can_map_save ())
520	continue;	453	continue;
521		454
522	if (unique \|\| op->flag [FLAG_UNIQUE])	455	if (unique \|\| op->flag [FLAG_UNIQUE])
523	{	456	{
524	if (flags & IO_UNIQUES)	457	if (flags & IO_UNIQUES)
525	save_object (freezer, op, 1);	458	op->write (f);
526	}	459	}
527	else if (flags & IO_OBJECTS)	460	else if (flags & IO_OBJECTS)
528	save_object (freezer, op, 1);	461	op->write (f);
529	}	462	}
530	}	463	}
		464
		465	coroapi::cede_to_tick ();
531		466
532	return true;	467	return true;
533	}	468	}
534		469
535	bool	470	bool
536	maptile::_load_objects (const char *path, bool skip_header)	471	maptile::_load_objects (const char *path, bool skip_header)
537	{	472	{
538	object_thawer thawer (path);	473	object_thawer f (path);
539		474
540	if (!thawer)	475	if (!f)
541	return false;	476	return false;
		477
		478	f.next ();
542		479
543	if (skip_header)	480	if (skip_header)
544	for (;;)	481	for (;;)
545	{	482	{
546	keyword kw = thawer.get_kv ();	483	keyword kw = f.kw;
547		484	f.skip ();
548	if (kw == KW_end)	485	if (kw == KW_end)
549	break;	486	break;
550
551	thawer.skip_kv (kw);
552	}	487	}
553		488
554	return _load_objects (thawer);	489	return _load_objects (f);
555	}	490	}
556		491
557	bool	492	bool
558	maptile::_save_objects (const char *path, int flags)	493	maptile::_save_objects (const char *path, int flags)
559	{	494	{
…		…
568	maptile::maptile ()	503	maptile::maptile ()
569	{	504	{
570	in_memory = MAP_SWAPPED;	505	in_memory = MAP_SWAPPED;
571		506
572	/* The maps used to pick up default x and y values from the	507	/* The maps used to pick up default x and y values from the
573	* map archetype. Mimic that behaviour.	508	* map archetype. Mimic that behaviour.
574	*/	509	*/
575	width = 16;	510	width = 16;
576	height = 16;	511	height = 16;
577	reset_timeout = 0;
578	timeout = 300;	512	timeout = 300;
579	enter_x = 0;	513	max_nrof = 1000; // 1000 items of anything
580	enter_y = 0;	514	max_volume = 2000000; // 2m³
581	}	515	}
582		516
583	maptile::maptile (int w, int h)	517	maptile::maptile (int w, int h)
584	{	518	{
585	in_memory = MAP_SWAPPED;	519	in_memory = MAP_SWAPPED;
…		…
735	bool	669	bool
736	maptile::_load_header (object_thawer &thawer)	670	maptile::_load_header (object_thawer &thawer)
737	{	671	{
738	for (;;)	672	for (;;)
739	{	673	{
740	keyword kw = thawer.get_kv ();	674	thawer.next ();
741		675
742	switch (kw)	676	switch (thawer.kw)
743	{	677	{
744	case KW_EOF:
745	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746	return false;
747
748	case KW_end:
749	return true;
750
751	default:
752	case KW_ERROR:
753	LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754	break;
755
756	case KW_msg:	678	case KW_msg:
757	thawer.get_ml (KW_endmsg, msg);	679	thawer.get_ml (KW_endmsg, msg);
758	break;	680	break;
759		681
760	case KW_lore: // CF+ extension	682	case KW_lore: // CF+ extension
…		…
791	case KW_winddir: thawer.get (winddir); break;	713	case KW_winddir: thawer.get (winddir); break;
792	case KW_sky: thawer.get (sky); break;	714	case KW_sky: thawer.get (sky); break;
793		715
794	case KW_per_player: thawer.get (per_player); break;	716	case KW_per_player: thawer.get (per_player); break;
795	case KW_per_party: thawer.get (per_party); break;	717	case KW_per_party: thawer.get (per_party); break;
		718	case KW_no_reset: thawer.get (no_reset); break;
796		719
797	case KW_region: default_region = region::find (thawer.get_str ()); break;	720	case KW_region: default_region = region::find (thawer.get_str ()); break;
798	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	721	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799		722
800	// old names new names	723	// old names new names
…		…
810		733
811	case KW_tile_path_1: thawer.get (tile_path [0]); break;	734	case KW_tile_path_1: thawer.get (tile_path [0]); break;
812	case KW_tile_path_2: thawer.get (tile_path [1]); break;	735	case KW_tile_path_2: thawer.get (tile_path [1]); break;
813	case KW_tile_path_3: thawer.get (tile_path [2]); break;	736	case KW_tile_path_3: thawer.get (tile_path [2]); break;
814	case KW_tile_path_4: thawer.get (tile_path [3]); break;	737	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		738
		739	case KW_end:
		740	return true;
		741
		742	default:
		743	if (!thawer.parse_error ("map", 0))
		744	return false;
		745	break;
815	}	746	}
816	}	747	}
817		748
818	abort ();	749	abort ();
819	}	750	}
…		…
845	object *above = op->above;	776	object *above = op->above;
846		777
847	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	778	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
848	unique = 1;	779	unique = 1;
849		780
850	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	781	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
851	{	782	{
852	op->destroy_inv (false);	783	op->destroy_inv (false);
853	op->destroy ();	784	op->destroy ();
854	}	785	}
855		786
…		…
869	if (name) MAP_OUT (name);	800	if (name) MAP_OUT (name);
870	MAP_OUT (swap_time);	801	MAP_OUT (swap_time);
871	MAP_OUT (reset_time);	802	MAP_OUT (reset_time);
872	MAP_OUT (reset_timeout);	803	MAP_OUT (reset_timeout);
873	MAP_OUT (fixed_resettime);	804	MAP_OUT (fixed_resettime);
		805	MAP_OUT (no_reset);
874	MAP_OUT (difficulty);	806	MAP_OUT (difficulty);
875		807
876	if (default_region) MAP_OUT2 (region, default_region->name);	808	if (default_region) MAP_OUT2 (region, default_region->name);
877		809
878	if (shopitems)	810	if (shopitems)
…		…
940	if (spaces)	872	if (spaces)
941	{	873	{
942	for (mapspace *ms = spaces + size (); ms-- > spaces; )	874	for (mapspace *ms = spaces + size (); ms-- > spaces; )
943	while (object *op = ms->bot)	875	while (object *op = ms->bot)
944	{	876	{
945	if (op->head)
946	op = op->head;	877	op = op->head_ ();
947
948	op->destroy_inv (false);	878	op->destroy_inv (false);
949	op->destroy ();	879	op->destroy ();
950	}	880	}
951		881
952	sfree (spaces, size ()), spaces = 0;	882	sfree (spaces, size ()), spaces = 0;
…		…
991	maptile::do_destroy ()	921	maptile::do_destroy ()
992	{	922	{
993	attachable::do_destroy ();	923	attachable::do_destroy ();
994		924
995	clear ();	925	clear ();
		926	}
		927
		928	/* decay and destroy perishable items in a map */
		929	void
		930	maptile::do_decay_objects ()
		931	{
		932	if (!spaces)
		933	return;
		934
		935	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		936	for (object above, op = ms->bot; op; op = above)
		937	{
		938	above = op->above;
		939
		940	bool destroy = 0;
		941
		942	// do not decay anything above unique floor tiles (yet :)
		943	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		944	break;
		945
		946	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		947	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		948	\|\| QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
		949	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
		950	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		951	\|\| QUERY_FLAG (op, FLAG_UNPAID)
		952	\|\| op->is_alive ())
		953	; // do not decay
		954	else if (op->is_weapon ())
		955	{
		956	op->stats.dam--;
		957	if (op->stats.dam < 0)
		958	destroy = 1;
		959	}
		960	else if (op->is_armor ())
		961	{
		962	op->stats.ac--;
		963	if (op->stats.ac < 0)
		964	destroy = 1;
		965	}
		966	else if (op->type == FOOD)
		967	{
		968	op->stats.food -= rndm (5, 20);
		969	if (op->stats.food < 0)
		970	destroy = 1;
		971	}
		972	else
		973	{
		974	int mat = op->materials;
		975
		976	if (mat & M_PAPER
		977	\|\| mat & M_LEATHER
		978	\|\| mat & M_WOOD
		979	\|\| mat & M_ORGANIC
		980	\|\| mat & M_CLOTH
		981	\|\| mat & M_LIQUID
		982	\|\| (mat & M_IRON && rndm (1, 5) == 1)
		983	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
		984	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
		985	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
		986	\|\| (mat & M_ICE && temp > 32))
		987	destroy = 1;
		988	}
		989
		990	/* adjust overall chance below */
		991	if (destroy && rndm (0, 1))
		992	op->destroy ();
		993	}
996	}	994	}
997		995
998	/*	996	/*
999	* Updates every button on the map (by calling update_button() for them).	997	* Updates every button on the map (by calling update_button() for them).
1000	*/	998	*/
…		…
1048	if (QUERY_FLAG (op, FLAG_GENERATOR))	1046	if (QUERY_FLAG (op, FLAG_GENERATOR))
1049	{	1047	{
1050	total_exp += op->stats.exp;	1048	total_exp += op->stats.exp;
1051		1049
1052	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	1050	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1053	total_exp += at->clone.stats.exp * 8;	1051	total_exp += at->stats.exp * 8;
1054		1052
1055	monster_cnt++;	1053	monster_cnt++;
1056	}	1054	}
1057	}	1055	}
1058		1056
…		…
1113	void	1111	void
1114	mapspace::update_ ()	1112	mapspace::update_ ()
1115	{	1113	{
1116	object tmp, last = 0;	1114	object tmp, last = 0;
1117	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1115	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1118	facetile top, floor, *middle;
1119	object top_obj, floor_obj, *middle_obj;
1120	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1116	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1121		1117
1122	middle = blank_face;	1118	//object *middle = 0;
1123	top = blank_face;	1119	//object *top = 0;
1124	floor = blank_face;	1120	//object *floor = 0;
1125		1121	// this seems to generate better code than using locals, above
1126	middle_obj = 0;	1122	object *&top = faces_obj[0] = 0;
1127	top_obj = 0;	1123	object *&middle = faces_obj[1] = 0;
1128	floor_obj = 0;	1124	object *&floor = faces_obj[2] = 0;
1129		1125
1130	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1126	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1131	{	1127	{
1132	/* This could be made additive I guess (two lights better than	1128	/* This could be made additive I guess (two lights better than
1133	* one). But if so, it shouldn't be a simple additive - 2	1129	* one). But if so, it shouldn't be a simple additive - 2
…		…
1146	* Always put the player down for drawing.	1142	* Always put the player down for drawing.
1147	*/	1143	*/
1148	if (!tmp->invisible)	1144	if (!tmp->invisible)
1149	{	1145	{
1150	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1146	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))
1151	{
1152	top = tmp->face;
1153	top_obj = tmp;	1147	top = tmp;
1154	}
1155	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1148	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156	{	1149	{
1157	/* If we got a floor, that means middle and top were below it,	1150	/* If we got a floor, that means middle and top were below it,
1158	* so should not be visible, so we clear them.	1151	* so should not be visible, so we clear them.
1159	*/	1152	*/
1160	middle = blank_face;	1153	middle = 0;
1161	top = blank_face;	1154	top = 0;
1162	floor = tmp->face;
1163	floor_obj = tmp;	1155	floor = tmp;
1164	}	1156	}
1165	/* Flag anywhere have high priority */	1157	/* Flag anywhere have high priority */
1166	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1158	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1167	{	1159	{
1168	middle = tmp->face;
1169
1170	middle_obj = tmp;	1160	middle = tmp;
1171	anywhere = 1;	1161	anywhere = 1;
1172	}	1162	}
1173	/* Find the highest visible face around. If equal	1163	/* Find the highest visible face around. If equal
1174	* visibilities, we still want the one nearer to the	1164	* visibilities, we still want the one nearer to the
1175	* top	1165	* top
1176	*/	1166	*/
1177	else if (middle == blank_face \|\| (tmp->face->visibility > middle->visibility && !anywhere))	1167	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1178	{
1179	middle = tmp->face;
1180	middle_obj = tmp;	1168	middle = tmp;
1181	}
1182	}	1169	}
1183		1170
1184	if (tmp == tmp->above)	1171	if (tmp == tmp->above)
1185	{	1172	{
1186	LOG (llevError, "Error in structure of map\n");	1173	LOG (llevError, "Error in structure of map\n");
…		…
1221	* middle face. This should not happen, as we already have the	1208	* middle face. This should not happen, as we already have the
1222	* else statement above so middle should not get set. OTOH, it	1209	* else statement above so middle should not get set. OTOH, it
1223	* may be possible for the faces to match but be different objects.	1210	* may be possible for the faces to match but be different objects.
1224	*/	1211	*/
1225	if (top == middle)	1212	if (top == middle)
1226	middle = blank_face;	1213	middle = 0;
1227		1214
1228	/* There are three posibilities at this point:	1215	/* There are three posibilities at this point:
1229	* 1) top face is set, need middle to be set.	1216	* 1) top face is set, need middle to be set.
1230	* 2) middle is set, need to set top.	1217	* 2) middle is set, need to set top.
1231	* 3) neither middle or top is set - need to set both.	1218	* 3) neither middle or top is set - need to set both.
…		…
1236	/* Once we get to a floor, stop, since we already have a floor object */	1223	/* Once we get to a floor, stop, since we already have a floor object */
1237	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1224	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1238	break;	1225	break;
1239		1226
1240	/* If two top faces are already set, quit processing */	1227	/* If two top faces are already set, quit processing */
1241	if ((top != blank_face) && (middle != blank_face))	1228	if (top && middle)
1242	break;	1229	break;
1243		1230
1244	/* Only show visible faces */	1231	/* Only show visible faces */
1245	if (!tmp->invisible)	1232	if (!tmp->invisible)
1246	{	1233	{
1247	/* Fill in top if needed */	1234	/* Fill in top if needed */
1248	if (top == blank_face)	1235	if (!top)
1249	{	1236	{
1250	top = tmp->face;
1251	top_obj = tmp;	1237	top = tmp;
1252	if (top == middle)	1238	if (top == middle)
1253	middle = blank_face;	1239	middle = 0;
1254	}	1240	}
1255	else	1241	else
1256	{	1242	{
1257	/* top is already set - we should only get here if	1243	/* top is already set - we should only get here if
1258	* middle is not set	1244	* middle is not set
1259	*	1245	*
1260	* Set the middle face and break out, since there is nothing	1246	* Set the middle face and break out, since there is nothing
1261	* more to fill in. We don't check visiblity here, since	1247	* more to fill in. We don't check visiblity here, since
1262	*	1248	*
1263	*/	1249	*/
1264	if (tmp->face != top)	1250	if (tmp != top)
1265	{	1251	{
1266	middle = tmp->face;
1267	middle_obj = tmp;	1252	middle = tmp;
1268	break;	1253	break;
1269	}	1254	}
1270	}	1255	}
1271	}	1256	}
1272	}	1257	}
1273		1258
1274	if (middle == floor)	1259	if (middle == floor)
1275	middle = blank_face;	1260	middle = 0;
1276		1261
1277	if (top == middle)	1262	if (top == middle)
1278	middle = blank_face;	1263	middle = 0;
1279		1264
1280	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1265	#if 0
1281	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1266	faces_obj [0] = top;
1282	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1267	faces_obj [1] = middle;
		1268	faces_obj [2] = floor;
		1269	#endif
		1270	}
		1271
		1272	uint64
		1273	mapspace::volume () const
		1274	{
		1275	uint64 vol = 0;
		1276
		1277	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
		1278	vol += op->volume ();
		1279
		1280	return vol;
1283	}	1281	}
1284		1282
1285	/* this updates the orig_map->tile_map[tile_num] value after finding	1283	/* this updates the orig_map->tile_map[tile_num] value after finding
1286	* the map. It also takes care of linking back the freshly found	1284	* the map. It also takes care of linking back the freshly found
1287	* maps tile_map values if it tiles back to this one. It returns	1285	* maps tile_map values if it tiles back to this one. It returns
…		…
1452		1450
1453	/**	1451	/**
1454	* Return whether map2 is adjacent to map1. If so, store the distance from	1452	* Return whether map2 is adjacent to map1. If so, store the distance from
1455	* map1 to map2 in dx/dy.	1453	* map1 to map2 in dx/dy.
1456	*/	1454	*/
1457	static int	1455	int
1458	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1456	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)
1459	{	1457	{
1460	if (!map1 \|\| !map2)	1458	if (!map1 \|\| !map2)
1461	return 0;	1459	return 0;
1462		1460
…		…
1574	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1572	get_rangevector (object op1, object op2, rv_vector * retval, int flags)
1575	{	1573	{
1576	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1574	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577	{	1575	{
1578	/* be conservative and fill in _some_ data */	1576	/* be conservative and fill in _some_ data */
1579	retval->distance = 100000;	1577	retval->distance = 10000;
1580	retval->distance_x = 32767;	1578	retval->distance_x = 10000;
1581	retval->distance_y = 32767;	1579	retval->distance_y = 10000;
1582	retval->direction = 0;	1580	retval->direction = 0;
1583	retval->part = 0;	1581	retval->part = 0;
1584	}	1582	}
1585	else	1583	else
1586	{	1584	{
…		…
1591		1589
1592	best = op1;	1590	best = op1;
1593	/* If this is multipart, find the closest part now */	1591	/* If this is multipart, find the closest part now */
1594	if (!(flags & 0x1) && op1->more)	1592	if (!(flags & 0x1) && op1->more)
1595	{	1593	{
1596	object *tmp;
1597	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1594	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598		1595
1599	/* we just take the offset of the piece to head to figure	1596	/* we just take the offset of the piece to head to figure
1600	* distance instead of doing all that work above again	1597	* distance instead of doing all that work above again
1601	* since the distance fields we set above are positive in the	1598	* since the distance fields we set above are positive in the
1602	* same axis as is used for multipart objects, the simply arithmetic	1599	* same axis as is used for multipart objects, the simply arithmetic
1603	* below works.	1600	* below works.
1604	*/	1601	*/
1605	for (tmp = op1->more; tmp != NULL; tmp = tmp->more)	1602	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606	{	1603	{
1607	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1604	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1608	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1605	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609	if (tmpi < best_distance)	1606	if (tmpi < best_distance)
1610	{	1607	{
…		…
1619	retval->distance_y += op1->y - best->y;	1616	retval->distance_y += op1->y - best->y;
1620	}	1617	}
1621	}	1618	}
1622		1619
1623	retval->part = best;	1620	retval->part = best;
1624	retval->distance = idistance (retval->distance_x, retval->distance_y);	1621	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1622	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626	}	1623	}
1627	}	1624	}
1628		1625
1629	/* this is basically the same as get_rangevector above, but instead of	1626	/* this is basically the same as get_rangevector above, but instead of
…		…
1634	* flags has no meaning for this function at this time - I kept it in to	1631	* flags has no meaning for this function at this time - I kept it in to
1635	* be more consistant with the above function and also in case they are needed	1632	* be more consistant with the above function and also in case they are needed
1636	* for something in the future. Also, since no object is pasted, the best	1633	* for something in the future. Also, since no object is pasted, the best
1637	* field of the rv_vector is set to NULL.	1634	* field of the rv_vector is set to NULL.
1638	*/	1635	*/
1639
1640	void	1636	void
1641	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector * retval, int flags)	1637	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1642	{	1638	{
1643	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1639	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1644	{	1640	{
1645	/* be conservative and fill in _some_ data */	1641	/* be conservative and fill in _some_ data */
1646	retval->distance = 100000;	1642	retval->distance = 100000;
…		…
1698	return default_region;	1694	return default_region;
1699		1695
1700	return ::region::default_region ();	1696	return ::region::default_region ();
1701	}	1697	}
1702		1698
		1699	/* picks a random object from a style map.
		1700	* Redone by MSW so it should be faster and not use static
		1701	* variables to generate tables.
		1702	*/
		1703	object *
		1704	maptile::pick_random_object () const
		1705	{
		1706	/* while returning a null object will result in a crash, that
		1707	* is actually preferable to an infinite loop. That is because
		1708	* most servers will automatically restart in case of crash.
		1709	* Change the logic on getting the random space - shouldn't make
		1710	* any difference, but this seems clearer to me.
		1711	*/
		1712	for (int i = 1000; --i;)
		1713	{
		1714	object *pick = at (rndm (width), rndm (height)).bot;
		1715
		1716	// do not prefer big monsters just because they are big.
		1717	if (pick && pick->head_ () == pick)
		1718	return pick->head_ ();
		1719	}
		1720
		1721	// instead of crashing in the unlikely(?) case, try to return something
		1722	return get_archetype ("blocked");
		1723	}
		1724

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.81 by root, Sat Jan 27 23:59:29 2007 UTC vs. Revision 1.110 by root, Sun Jul 1 05:00:17 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.81 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 05:00:17 2007 UTC