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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.79 by root, Sat Jan 20 22:09:51 2007 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.79 by root, Sat Jan 20 22:09:51 2007 UTC vs. Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.79 by root, Sat Jan 20 22:09:51 2007 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC