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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object active_objects; / List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
276		278
277	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
278	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
279	* check?	281	* check?
280	*/	282	*/
281	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
282	return 0;	284	return 0;
283		285
284	switch (ob1->type)	286	switch (ob1->type)
285	{	287	{
286	case SCROLL:	288	case SCROLL:
…		…
355	/*	357	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	359	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
359	*/	361	*/
360
361	char *	362	char *
362	dump_object (object *op)	363	dump_object (object *op)
363	{	364	{
364	if (!op)	365	if (!op)
365	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
366		367
367	object_freezer freezer;	368	object_freezer freezer;
368	save_object (freezer, op, 1);	369	op->write (freezer);
369	return freezer.as_string ();	370	return freezer.as_string ();
370	}	371	}
371		372
372	/*	373	/*
373	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
390	}	391	}
391		392
392	/*	393	/*
393	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
394	*/	395	*/
395
396	object *	396	object *
397	find_object (tag_t i)	397	find_object (tag_t i)
398	{	398	{
399	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
400	if (op->count == i)	400	if (op->count == i)
401	return op;	401	return op;
402		402
403	return 0;	403	return 0;
404	}	404	}
405		405
406	/*	406	/*
407	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
410	*/	410	*/
411
412	object *	411	object *
413	find_object_name (const char *str)	412	find_object_name (const char *str)
414	{	413	{
415	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
416	object *op;	415	object *op;
417		416
418	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
419	if (op->name == str_)	418	if (op->name == str_)
420	break;	419	break;
421		420
422	return op;	421	return op;
423	}	422	}
…		…
455	* refcounts and freeing the links.	454	* refcounts and freeing the links.
456	*/	455	*/
457	static void	456	static void
458	free_key_values (object *op)	457	free_key_values (object *op)
459	{	458	{
460	for (key_value *i = op->key_values; i != 0;)	459	for (key_value *i = op->key_values; i; )
461	{	460	{
462	key_value *next = i->next;	461	key_value *next = i->next;
463	delete i;	462	delete i;
464		463
465	i = next;	464	i = next;
466	}	465	}
467		466
468	op->key_values = 0;	467	op->key_values = 0;
469	}	468	}
470		469
471	/*	470	object &
472	* copy_to first frees everything allocated by the dst object,	471	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	472	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	473	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	474	bool is_removed = flag [FLAG_REMOVED];
484		475
485	(object_copy )dst = *this;	476	(object_copy )this = src;
486		477
487	if (is_freed)	478	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	479	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		480
496	/* Copy over key_values, if any. */	481	/* Copy over key_values, if any. */
497	if (key_values)	482	if (src.key_values)
498	{	483	{
499	key_value *tail = 0;	484	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	485	key_values = 0;
503		486
504	for (i = key_values; i; i = i->next)	487	for (key_value *i = src.key_values; i; i = i->next)
505	{	488	{
506	key_value *new_link = new key_value;	489	key_value *new_link = new key_value;
507		490
508	new_link->next = 0;	491	new_link->next = 0;
509	new_link->key = i->key;	492	new_link->key = i->key;
510	new_link->value = i->value;	493	new_link->value = i->value;
511		494
512	/* Try and be clever here, too. */	495	/* Try and be clever here, too. */
513	if (!dst->key_values)	496	if (!key_values)
514	{	497	{
515	dst->key_values = new_link;	498	key_values = new_link;
516	tail = new_link;	499	tail = new_link;
517	}	500	}
518	else	501	else
519	{	502	{
520	tail->next = new_link;	503	tail->next = new_link;
521	tail = new_link;	504	tail = new_link;
522	}	505	}
523	}	506	}
524	}	507	}
		508	}
		509
		510	/*
		511	* copy_to first frees everything allocated by the dst object,
		512	* and then copies the contents of itself into the second
		513	* object, allocating what needs to be allocated. Basically, any
		514	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		515	* if the first object is freed, the pointers in the new object
		516	* will point at garbage.
		517	*/
		518	void
		519	object::copy_to (object *dst)
		520	{
		521	dst = this;
		522
		523	if (speed < 0)
		524	dst->speed_left = speed_left - rndm ();
525		525
526	dst->set_speed (dst->speed);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	void
		530	object::instantiate ()
		531	{
		532	if (!uuid.seq) // HACK
		533	uuid = gen_uuid ();
		534
		535	speed_left = -0.1f;
		536	/* copy the body_info to the body_used - this is only really
		537	* need for monsters, but doesn't hurt to do it for everything.
		538	* by doing so, when a monster is created, it has good starting
		539	* values for the body_used info, so when items are created
		540	* for it, they can be properly equipped.
		541	*/
		542	memcpy (body_used, body_info, sizeof (body_used));
		543
		544	attachable::instantiate ();
527	}	545	}
528		546
529	object *	547	object *
530	object::clone ()	548	object::clone ()
531	{	549	{
…		…
563	speed = 0;	581	speed = 0;
564	}	582	}
565		583
566	this->speed = speed;	584	this->speed = speed;
567		585
568	if (FABS (speed) > MIN_ACTIVE_SPEED)	586	if (has_active_speed ())
569	{	587	activate ();
570	/* If already on active list, don't do anything */
571	if (active_next \|\| active_prev \|\| this == active_objects)
572	return;
573
574	/* process_events() expects us to insert the object at the beginning
575	* of the list. */
576	active_next = active_objects;
577
578	if (active_next)
579	active_next->active_prev = this;
580
581	active_objects = this;
582	}
583	else	588	else
584	{	589	deactivate ();
585	/* If not on the active list, nothing needs to be done */
586	if (!active_next && !active_prev && this != active_objects)
587	return;
588
589	if (!active_prev)
590	{
591	active_objects = active_next;
592
593	if (active_next)
594	active_next->active_prev = 0;
595	}
596	else
597	{
598	active_prev->active_next = active_next;
599
600	if (active_next)
601	active_next->active_prev = active_prev;
602	}
603
604	active_next = 0;
605	active_prev = 0;
606	}
607	}	590	}
608		591
609	/*	592	/*
610	* update_object() updates the the map.	593	* update_object() updates the the map.
611	* It takes into account invisible objects (and represent squares covered	594	* It takes into account invisible objects (and represent squares covered
…		…
624	* UP_OBJ_FACE: only the objects face has changed.	607	* UP_OBJ_FACE: only the objects face has changed.
625	*/	608	*/
626	void	609	void
627	update_object (object *op, int action)	610	update_object (object *op, int action)
628	{	611	{
629	MoveType move_on, move_off, move_block, move_slow;
630
631	if (op == NULL)	612	if (op == NULL)
632	{	613	{
633	/* this should never happen */	614	/* this should never happen */
634	LOG (llevDebug, "update_object() called for NULL object.\n");	615	LOG (llevDebug, "update_object() called for NULL object.\n");
635	return;	616	return;
…		…
659	return;	640	return;
660	}	641	}
661		642
662	mapspace &m = op->ms ();	643	mapspace &m = op->ms ();
663		644
664	if (m.flags_ & P_NEED_UPDATE)	645	if (!(m.flags_ & P_UPTODATE))
665	/* nop */;	646	/* nop */;
666	else if (action == UP_OBJ_INSERT)	647	else if (action == UP_OBJ_INSERT)
667	{	648	{
668	// this is likely overkill, TODO: revisit (schmorp)	649	// this is likely overkill, TODO: revisit (schmorp)
669	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	650	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
678	/* This isn't perfect, but I don't expect a lot of objects to	659	/* This isn't perfect, but I don't expect a lot of objects to
679	* to have move_allow right now.	660	* to have move_allow right now.
680	*/	661	*/
681	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	662	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
682	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	663	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
683	m.flags_ = P_NEED_UPDATE;	664	m.flags_ = 0;
684	}	665	}
685	/* if the object is being removed, we can't make intelligent	666	/* if the object is being removed, we can't make intelligent
686	* decisions, because remove_ob can't really pass the object	667	* decisions, because remove_ob can't really pass the object
687	* that is being removed.	668	* that is being removed.
688	*/	669	*/
689	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	670	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
690	m.flags_ = P_NEED_UPDATE;	671	m.flags_ = 0;
691	else if (action == UP_OBJ_FACE)	672	else if (action == UP_OBJ_FACE)
692	/* Nothing to do for that case */ ;	673	/* Nothing to do for that case */ ;
693	else	674	else
694	LOG (llevError, "update_object called with invalid action: %d\n", action);	675	LOG (llevError, "update_object called with invalid action: %d\n", action);
695		676
696	if (op->more)	677	if (op->more)
697	update_object (op->more, action);	678	update_object (op->more, action);
698	}	679	}
699		680
700	object::vector object::objects; // not yet used
701	object *object::first;
702
703	object::object ()	681	object::object ()
704	{	682	{
705	SET_FLAG (this, FLAG_REMOVED);	683	SET_FLAG (this, FLAG_REMOVED);
706		684
707	expmul = 1.0;	685	expmul = 1.0;
708	face = blank_face;	686	face = blank_face;
709	}	687	}
710		688
711	object::~object ()	689	object::~object ()
712	{	690	{
		691	unlink ();
		692
713	free_key_values (this);	693	free_key_values (this);
714	}	694	}
715		695
		696	static int object_count;
		697
716	void object::link ()	698	void object::link ()
717	{	699	{
718	count = ++ob_count;	700	assert (!index);//D
719	uuid = gen_uuid ();	701	uuid = gen_uuid ();
		702	count = ++object_count;
720		703
721	prev = 0;	704	refcnt_inc ();
722	next = object::first;	705	objects.insert (this);
723
724	if (object::first)
725	object::first->prev = this;
726
727	object::first = this;
728	}	706	}
729		707
730	void object::unlink ()	708	void object::unlink ()
731	{	709	{
732	if (this == object::first)	710	if (!index)
733	object::first = next;	711	return;
734		712
735	/* Remove this object from the list of used objects */	713	objects.erase (this);
736	if (prev) prev->next = next;	714	refcnt_dec ();
737	if (next) next->prev = prev;
738
739	prev = 0;
740	next = 0;
741	}	715	}
742		716
743	void	717	void
		718	object::activate ()
		719	{
		720	/* If already on active list, don't do anything */
		721	if (active)
		722	return;
		723
		724	if (has_active_speed ())
		725	actives.insert (this);
		726	}
		727
		728	void
744	object::activate (bool recursive)	729	object::activate_recursive ()
745	{	730	{
746	// uh, hack	731	activate ();
747	set_speed (speed);
748		732
749	if (recursive)
750	for (object *op = inv; op; op = op->above)	733	for (object *op = inv; op; op = op->below)
751	op->activate (1);	734	op->activate_recursive ();
752	}	735	}
753		736
754	/* This function removes object 'op' from the list of active	737	/* This function removes object 'op' from the list of active
755	* objects.	738	* objects.
756	* This should only be used for style maps or other such	739	* This should only be used for style maps or other such
…		…
758	* in play chewing up cpu time getting processed.	741	* in play chewing up cpu time getting processed.
759	* The reverse of this is to call update_ob_speed, which	742	* The reverse of this is to call update_ob_speed, which
760	* will do the right thing based on the speed of the object.	743	* will do the right thing based on the speed of the object.
761	*/	744	*/
762	void	745	void
763	object::deactivate (bool recursive)	746	object::deactivate ()
764	{	747	{
765	/* If not on the active list, nothing needs to be done */	748	/* If not on the active list, nothing needs to be done */
766	if (!active_next && !active_prev && this != active_objects)	749	if (!active)
767	return;	750	return;
768		751
769	if (active_prev == 0)	752	actives.erase (this);
770	{	753	}
771	active_objects = active_next;
772	if (active_next)
773	active_next->active_prev = 0;
774	}
775	else
776	{
777	active_prev->active_next = active_next;
778	if (active_next)
779	active_next->active_prev = active_prev;
780	}
781		754
782	active_next = 0;	755	void
783	active_prev = 0;	756	object::deactivate_recursive ()
784		757	{
785	if (recursive)
786	for (object *op = inv; op; op = op->above)	758	for (object *op = inv; op; op = op->below)
		759	op->deactivate_recursive ();
		760
787	op->deactivate (1);	761	deactivate ();
		762	}
		763
		764	void
		765	object::set_flag_inv (int flag, int value)
		766	{
		767	for (object *op = inv; op; op = op->below)
		768	{
		769	op->flag [flag] = value;
		770	op->set_flag_inv (flag, value);
		771	}
788	}	772	}
789		773
790	/*	774	/*
791	* Remove and free all objects in the inventory of the given object.	775	* Remove and free all objects in the inventory of the given object.
792	* object.c ?	776	* object.c ?
…		…
807	* drop on that space.	791	* drop on that space.
808	*/	792	*/
809	if (!drop_to_ground	793	if (!drop_to_ground
810	\|\| !map	794	\|\| !map
811	\|\| map->in_memory != MAP_IN_MEMORY	795	\|\| map->in_memory != MAP_IN_MEMORY
		796	\|\| map->nodrop
812	\|\| ms ().move_block == MOVE_ALL)	797	\|\| ms ().move_block == MOVE_ALL)
813	{	798	{
814	while (inv)	799	while (inv)
815	{	800	{
816	inv->destroy_inv (drop_to_ground);	801	inv->destroy_inv (drop_to_ground);
…		…
825		810
826	if (op->flag [FLAG_STARTEQUIP]	811	if (op->flag [FLAG_STARTEQUIP]
827	\|\| op->flag [FLAG_NO_DROP]	812	\|\| op->flag [FLAG_NO_DROP]
828	\|\| op->type == RUNE	813	\|\| op->type == RUNE
829	\|\| op->type == TRAP	814	\|\| op->type == TRAP
830	\|\| op->flag [FLAG_IS_A_TEMPLATE])	815	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		816	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
831	op->destroy ();	817	op->destroy ();
832	else	818	else
833	map->insert (op, x, y);	819	map->insert (op, x, y);
834	}	820	}
835	}	821	}
…		…
843	}	829	}
844		830
845	void	831	void
846	object::do_destroy ()	832	object::do_destroy ()
847	{	833	{
		834	attachable::do_destroy ();
		835
848	if (flag [FLAG_IS_LINKED])	836	if (flag [FLAG_IS_LINKED])
849	remove_button_link (this);	837	remove_button_link (this);
850		838
851	if (flag [FLAG_FRIENDLY])	839	if (flag [FLAG_FRIENDLY])
852	remove_friendly_object (this);	840	remove_friendly_object (this);
853		841
854	if (!flag [FLAG_REMOVED])	842	if (!flag [FLAG_REMOVED])
855	remove ();	843	remove ();
856		844
857	if (flag [FLAG_FREED])	845	destroy_inv (true);
858	return;
859		846
860	set_speed (0);	847	deactivate ();
		848	unlink ();
861		849
862	flag [FLAG_FREED] = 1;	850	flag [FLAG_FREED] = 1;
863
864	attachable::do_destroy ();
865
866	destroy_inv (true);
867	unlink ();
868		851
869	// hack to ensure that freed objects still have a valid map	852	// hack to ensure that freed objects still have a valid map
870	{	853	{
871	static maptile *freed_map; // freed objects are moved here to avoid crashes	854	static maptile *freed_map; // freed objects are moved here to avoid crashes
872		855
…		…
877	freed_map->name = "/internal/freed_objects_map";	860	freed_map->name = "/internal/freed_objects_map";
878	freed_map->width = 3;	861	freed_map->width = 3;
879	freed_map->height = 3;	862	freed_map->height = 3;
880		863
881	freed_map->alloc ();	864	freed_map->alloc ();
		865	freed_map->in_memory = MAP_IN_MEMORY;
882	}	866	}
883		867
884	map = freed_map;	868	map = freed_map;
885	x = 1;	869	x = 1;
886	y = 1;	870	y = 1;
…		…
896		880
897	// clear those pointers that likely might have circular references to us	881	// clear those pointers that likely might have circular references to us
898	owner = 0;	882	owner = 0;
899	enemy = 0;	883	enemy = 0;
900	attacked_by = 0;	884	attacked_by = 0;
901
902	// only relevant for players(?), but make sure of it anyways
903	contr = 0;
904	}	885	}
905		886
906	void	887	void
907	object::destroy (bool destroy_inventory)	888	object::destroy (bool destroy_inventory)
908	{	889	{
…		…
936	* This function removes the object op from the linked list of objects	917	* This function removes the object op from the linked list of objects
937	* which it is currently tied to. When this function is done, the	918	* which it is currently tied to. When this function is done, the
938	* object will have no environment. If the object previously had an	919	* object will have no environment. If the object previously had an
939	* environment, the x and y coordinates will be updated to	920	* environment, the x and y coordinates will be updated to
940	* the previous environment.	921	* the previous environment.
941	* Beware: This function is called from the editor as well!
942	*/	922	*/
943	void	923	void
944	object::remove ()	924	object::do_remove ()
945	{	925	{
946	object tmp, last = 0;	926	object tmp, last = 0;
947	object *otmp;	927	object *otmp;
948		928
949	if (QUERY_FLAG (this, FLAG_REMOVED))	929	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
992	}	972	}
993	else if (map)	973	else if (map)
994	{	974	{
995	if (type == PLAYER)	975	if (type == PLAYER)
996	{	976	{
		977	// leaving a spot always closes any open container on the ground
		978	if (container && !container->env)
		979	// this causes spurious floorbox updates, but it ensures
		980	// that the CLOSE event is being sent.
		981	close_container ();
		982
997	--map->players;	983	--map->players;
998	map->last_access = runtime;	984	map->touch ();
999	}	985	}
1000		986
		987	map->dirty = true;
		988	mapspace &ms = this->ms ();
1001		989
1002	/* link the object above us */	990	/* link the object above us */
1003	if (above)	991	if (above)
1004	above->below = below;	992	above->below = below;
1005	else	993	else
1006	map->at (x, y).top = below; /* we were top, set new top */	994	ms.top = below; /* we were top, set new top */
1007		995
1008	/* Relink the object below us, if there is one */	996	/* Relink the object below us, if there is one */
1009	if (below)	997	if (below)
1010	below->above = above;	998	below->above = above;
1011	else	999	else
…		…
1013	/* Nothing below, which means we need to relink map object for this space	1001	/* Nothing below, which means we need to relink map object for this space
1014	* use translated coordinates in case some oddness with map tiling is	1002	* use translated coordinates in case some oddness with map tiling is
1015	* evident	1003	* evident
1016	*/	1004	*/
1017	if (GET_MAP_OB (map, x, y) != this)	1005	if (GET_MAP_OB (map, x, y) != this)
1018	{
1019	char *dump = dump_object (this);
1020	LOG (llevError,
1021	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1006	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1022	free (dump);
1023	dump = dump_object (GET_MAP_OB (map, x, y));
1024	LOG (llevError, "%s\n", dump);
1025	free (dump);
1026	}
1027		1007
1028	map->at (x, y).bot = above; /* goes on above it. */	1008	ms.bot = above; /* goes on above it. */
1029	}	1009	}
1030		1010
1031	above = 0;	1011	above = 0;
1032	below = 0;	1012	below = 0;
1033		1013
1034	if (map->in_memory == MAP_SAVING)	1014	if (map->in_memory == MAP_SAVING)
1035	return;	1015	return;
1036		1016
1037	int check_walk_off = !flag [FLAG_NO_APPLY];	1017	int check_walk_off = !flag [FLAG_NO_APPLY];
1038		1018
1039	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1019	for (tmp = ms.bot; tmp; tmp = tmp->above)
1040	{	1020	{
1041	/* No point updating the players look faces if he is the object	1021	/* No point updating the players look faces if he is the object
1042	* being removed.	1022	* being removed.
1043	*/	1023	*/
1044		1024
…		…
1078	}	1058	}
1079		1059
1080	/* last == NULL if there are no objects on this space */	1060	/* last == NULL if there are no objects on this space */
1081	//TODO: this makes little sense, why only update the topmost object?	1061	//TODO: this makes little sense, why only update the topmost object?
1082	if (!last)	1062	if (!last)
1083	map->at (x, y).flags_ = P_NEED_UPDATE;	1063	map->at (x, y).flags_ = 0;
1084	else	1064	else
1085	update_object (last, UP_OBJ_REMOVE);	1065	update_object (last, UP_OBJ_REMOVE);
1086		1066
1087	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1067	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1088	update_all_los (map, x, y);	1068	update_all_los (map, x, y);
…		…
1124	}	1104	}
1125		1105
1126	return 0;	1106	return 0;
1127	}	1107	}
1128		1108
		1109	void
		1110	object::expand_tail ()
		1111	{
		1112	if (more)
		1113	return;
		1114
		1115	object *prev = this;
		1116
		1117	for (archetype *at = arch->more; at; at = at->more)
		1118	{
		1119	object *op = arch_to_object (at);
		1120
		1121	op->name = name;
		1122	op->name_pl = name_pl;
		1123	op->title = title;
		1124
		1125	op->head = this;
		1126	prev->more = op;
		1127
		1128	prev = op;
		1129	}
		1130	}
		1131
1129	/*	1132	/*
1130	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1133	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1131	* job preparing multi-part monsters	1134	* job preparing multi-part monsters.
1132	*/	1135	*/
1133	object *	1136	object *
1134	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1137	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1135	{	1138	{
1136	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1139	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1163	* just 'op' otherwise	1166	* just 'op' otherwise
1164	*/	1167	*/
1165	object *	1168	object *
1166	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1169	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1167	{	1170	{
		1171	assert (!op->flag [FLAG_FREED]);
		1172
1168	object tmp, top, *floor = NULL;	1173	object tmp, top, *floor = NULL;
1169	sint16 x, y;
1170		1174
1171	if (QUERY_FLAG (op, FLAG_FREED))	1175	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176		1176
1177	if (!m)	1177	#if 0
1178	{	1178	if (!m->active != !op->active)
1179	char *dump = dump_object (op);	1179	if (m->active)
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1180	op->activate_recursive ();
1181	free (dump);	1181	else
1182	return op;	1182	op->deactivate_recursive ();
1183	}	1183	#endif
1184		1184
1185	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1186	{	1186	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1187	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES	1188	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object	1189	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting	1190	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.	1191	* improperly inserted.
1193	*/	1192	*/
1194	abort ();	1193	abort ();
1195	#endif	1194	#endif
1196	free (dump);
1197	return op;	1195	return op;
1198	}	1196	}
1199		1197
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;	1198	if (object *more = op->more)
1213		1199	{
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1200	if (!insert_ob_in_map (more, m, originator, flag))
1230	{	1201	{
1231	if (!op->head)	1202	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1203	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1204
1234	return 0;	1205	return 0;
…		…
1239		1210
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1211	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1212	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1213	* need extra work
1243	*/	1214	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1215	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1216	return 0;
1246	y = op->y;	1217
		1218	op->map = m;
		1219	mapspace &ms = op->ms ();
1247		1220
1248	/* this has to be done after we translate the coordinates.	1221	/* this has to be done after we translate the coordinates.
1249	*/	1222	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1223	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1224	for (tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1225	if (object::can_merge (op, tmp))
1253	{	1226	{
1254	op->nrof += tmp->nrof;	1227	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1228	tmp->destroy ();
1256	}	1229	}
…		…
1273	op->below = originator->below;	1246	op->below = originator->below;
1274		1247
1275	if (op->below)	1248	if (op->below)
1276	op->below->above = op;	1249	op->below->above = op;
1277	else	1250	else
1278	op->ms ().bot = op;	1251	ms.bot = op;
1279		1252
1280	/* since below originator, no need to update top */	1253	/* since below originator, no need to update top */
1281	originator->below = op;	1254	originator->below = op;
1282	}	1255	}
1283	else	1256	else
1284	{	1257	{
		1258	top = ms.bot;
		1259
1285	/* If there are other objects, then */	1260	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1261	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1262	{
1288	object *last = 0;	1263	object *last = 0;
1289		1264
1290	/*	1265	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1266	* If there are multiple objects on this space, we do some trickier handling.
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1272	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1273	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1274	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1275	* that flying non pickable objects are spell objects.
1301	*/	1276	*/
1302	while (top)	1277	for (top = ms.bot; top; top = top->above)
1303	{	1278	{
1304	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1279	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1305	floor = top;	1280	floor = top;
1306		1281
1307	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1282	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1310	top = top->below;	1285	top = top->below;
1311	break;	1286	break;
1312	}	1287	}
1313		1288
1314	last = top;	1289	last = top;
1315	top = top->above;
1316	}	1290	}
1317		1291
1318	/* Don't want top to be NULL, so set it to the last valid object */	1292	/* Don't want top to be NULL, so set it to the last valid object */
1319	top = last;	1293	top = last;
1320		1294
…		…
1322	* looks like instead of lots of conditions here.	1296	* looks like instead of lots of conditions here.
1323	* makes things faster, and effectively the same result.	1297	* makes things faster, and effectively the same result.
1324	*/	1298	*/
1325		1299
1326	/* Have object 'fall below' other objects that block view.	1300	/* Have object 'fall below' other objects that block view.
1327	* Unless those objects are exits, type 66	1301	* Unless those objects are exits.
1328	* If INS_ON_TOP is used, don't do this processing	1302	* If INS_ON_TOP is used, don't do this processing
1329	* Need to find the object that in fact blocks view, otherwise	1303	* Need to find the object that in fact blocks view, otherwise
1330	* stacking is a bit odd.	1304	* stacking is a bit odd.
1331	*/	1305	*/
1332	if (!(flag & INS_ON_TOP) &&	1306	if (!(flag & INS_ON_TOP)
1333	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1307	&& ms.flags () & P_BLOCKSVIEW
		1308	&& (op->face && !faces [op->face].visibility))
1334	{	1309	{
1335	for (last = top; last != floor; last = last->below)	1310	for (last = top; last != floor; last = last->below)
1336	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1311	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1337	break;	1312	break;
		1313
1338	/* Check to see if we found the object that blocks view,	1314	/* Check to see if we found the object that blocks view,
1339	* and make sure we have a below pointer for it so that	1315	* and make sure we have a below pointer for it so that
1340	* we can get inserted below this one, which requires we	1316	* we can get inserted below this one, which requires we
1341	* set top to the object below us.	1317	* set top to the object below us.
1342	*/	1318	*/
…		…
1344	top = last->below;	1320	top = last->below;
1345	}	1321	}
1346	} /* If objects on this space */	1322	} /* If objects on this space */
1347		1323
1348	if (flag & INS_MAP_LOAD)	1324	if (flag & INS_MAP_LOAD)
1349	top = GET_MAP_TOP (op->map, op->x, op->y);	1325	top = ms.top;
1350		1326
1351	if (flag & INS_ABOVE_FLOOR_ONLY)	1327	if (flag & INS_ABOVE_FLOOR_ONLY)
1352	top = floor;	1328	top = floor;
1353		1329
1354	/* Top is the object that our object (op) is going to get inserted above.	1330	/* Top is the object that our object (op) is going to get inserted above.
1355	*/	1331	*/
1356		1332
1357	/* First object on this space */	1333	/* First object on this space */
1358	if (!top)	1334	if (!top)
1359	{	1335	{
1360	op->above = GET_MAP_OB (op->map, op->x, op->y);	1336	op->above = ms.bot;
1361		1337
1362	if (op->above)	1338	if (op->above)
1363	op->above->below = op;	1339	op->above->below = op;
1364		1340
1365	op->below = 0;	1341	op->below = 0;
1366	op->ms ().bot = op;	1342	ms.bot = op;
1367	}	1343	}
1368	else	1344	else
1369	{ /* get inserted into the stack above top */	1345	{ /* get inserted into the stack above top */
1370	op->above = top->above;	1346	op->above = top->above;
1371		1347
…		…
1375	op->below = top;	1351	op->below = top;
1376	top->above = op;	1352	top->above = op;
1377	}	1353	}
1378		1354
1379	if (!op->above)	1355	if (!op->above)
1380	op->ms ().top = op;	1356	ms.top = op;
1381	} /* else not INS_BELOW_ORIGINATOR */	1357	} /* else not INS_BELOW_ORIGINATOR */
1382		1358
1383	if (op->type == PLAYER)	1359	if (op->type == PLAYER)
1384	{	1360	{
1385	op->contr->do_los = 1;	1361	op->contr->do_los = 1;
1386	++op->map->players;	1362	++op->map->players;
1387	op->map->last_access = runtime;	1363	op->map->touch ();
1388	}	1364	}
		1365
		1366	op->map->dirty = true;
1389		1367
1390	/* If we have a floor, we know the player, if any, will be above	1368	/* If we have a floor, we know the player, if any, will be above
1391	* it, so save a few ticks and start from there.	1369	* it, so save a few ticks and start from there.
1392	*/	1370	*/
1393	if (!(flag & INS_MAP_LOAD))	1371	if (!(flag & INS_MAP_LOAD))
1394	if (object *pl = op->ms ().player ())	1372	if (object *pl = ms.player ())
1395	if (pl->contr->ns)	1373	if (pl->contr->ns)
1396	pl->contr->ns->floorbox_update ();	1374	pl->contr->ns->floorbox_update ();
1397		1375
1398	/* If this object glows, it may affect lighting conditions that are	1376	/* If this object glows, it may affect lighting conditions that are
1399	* visible to others on this map. But update_all_los is really	1377	* visible to others on this map. But update_all_los is really
1400	* an inefficient way to do this, as it means los for all players	1378	* an inefficient way to do this, as it means los for all players
1401	* on the map will get recalculated. The players could very well	1379	* on the map will get recalculated. The players could very well
1402	* be far away from this change and not affected in any way -	1380	* be far away from this change and not affected in any way -
1403	* this should get redone to only look for players within range,	1381	* this should get redone to only look for players within range,
1404	* or just updating the P_NEED_UPDATE for spaces within this area	1382	* or just updating the P_UPTODATE for spaces within this area
1405	* of effect may be sufficient.	1383	* of effect may be sufficient.
1406	*/	1384	*/
1407	if (op->map->darkness && (op->glow_radius != 0))	1385	if (op->map->darkness && (op->glow_radius != 0))
1408	update_all_los (op->map, op->x, op->y);	1386	update_all_los (op->map, op->x, op->y);
1409		1387
…		…
1447	{	1425	{
1448	object tmp, tmp1;	1426	object tmp, tmp1;
1449		1427
1450	/* first search for itself and remove any old instances */	1428	/* first search for itself and remove any old instances */
1451		1429
1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1430	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454	tmp->destroy ();	1432	tmp->destroy ();
1455		1433
1456	tmp1 = arch_to_object (archetype::find (arch_string));	1434	tmp1 = arch_to_object (archetype::find (arch_string));
1457		1435
…		…
1461	}	1439	}
1462		1440
1463	object *	1441	object *
1464	object::insert_at (object where, object originator, int flags)	1442	object::insert_at (object where, object originator, int flags)
1465	{	1443	{
1466	where->map->insert (this, where->x, where->y, originator, flags);	1444	return where->map->insert (this, where->x, where->y, originator, flags);
1467	}	1445	}
1468		1446
1469	/*	1447	/*
1470	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1471	* is returned contains nr objects, and the remaining parts contains	1449	* is returned contains nr objects, and the remaining parts contains
…		…
1511	* the amount of an object. If the amount reaches 0, the object	1489	* the amount of an object. If the amount reaches 0, the object
1512	* is subsequently removed and freed.	1490	* is subsequently removed and freed.
1513	*	1491	*
1514	* Return value: 'op' if something is left, NULL if the amount reached 0	1492	* Return value: 'op' if something is left, NULL if the amount reached 0
1515	*/	1493	*/
1516
1517	object *	1494	object *
1518	decrease_ob_nr (object *op, uint32 i)	1495	decrease_ob_nr (object *op, uint32 i)
1519	{	1496	{
1520	object *tmp;	1497	object *tmp;
1521		1498
…		…
1596		1573
1597	/*	1574	/*
1598	* add_weight(object, weight) adds the specified weight to an object,	1575	* add_weight(object, weight) adds the specified weight to an object,
1599	* and also updates how much the environment(s) is/are carrying.	1576	* and also updates how much the environment(s) is/are carrying.
1600	*/	1577	*/
1601
1602	void	1578	void
1603	add_weight (object *op, signed long weight)	1579	add_weight (object *op, signed long weight)
1604	{	1580	{
1605	while (op != NULL)	1581	while (op != NULL)
1606	{	1582	{
…		…
1638	* inside the object environment.	1614	* inside the object environment.
1639	*	1615	*
1640	* The function returns now pointer to inserted item, and return value can	1616	* The function returns now pointer to inserted item, and return value can
1641	* be != op, if items are merged. -Tero	1617	* be != op, if items are merged. -Tero
1642	*/	1618	*/
1643
1644	object *	1619	object *
1645	object::insert (object *op)	1620	object::insert (object *op)
1646	{	1621	{
1647	object tmp, otmp;	1622	object tmp, otmp;
1648		1623
…		…
1780		1755
1781	/* The objects have to be checked from top to bottom.	1756	/* The objects have to be checked from top to bottom.
1782	* Hence, we first go to the top:	1757	* Hence, we first go to the top:
1783	*/	1758	*/
1784		1759
1785	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1786	{	1761	{
1787	/* Trim the search when we find the first other spell effect	1762	/* Trim the search when we find the first other spell effect
1788	* this helps performance so that if a space has 50 spell objects,	1763	* this helps performance so that if a space has 50 spell objects,
1789	* we don't need to check all of them.	1764	* we don't need to check all of them.
1790	*/	1765	*/
…		…
1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1809	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1810	{	1785	{
1811		1786
1812	float	1787	float
1813	diff = tmp->move_slow_penalty * FABS (op->speed);	1788	diff = tmp->move_slow_penalty * fabs (op->speed);
1814		1789
1815	if (op->type == PLAYER)	1790	if (op->type == PLAYER)
1816	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1817	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1818	diff /= 4.0;	1793	diff /= 4.0;
…		…
1848	* The first matching object is returned, or NULL if none.	1823	* The first matching object is returned, or NULL if none.
1849	*/	1824	*/
1850	object *	1825	object *
1851	present_arch (const archetype at, maptile m, int x, int y)	1826	present_arch (const archetype at, maptile m, int x, int y)
1852	{	1827	{
1853	if (m == NULL \|\| out_of_map (m, x, y))	1828	if (!m \|\| out_of_map (m, x, y))
1854	{	1829	{
1855	LOG (llevError, "Present_arch called outside map.\n");	1830	LOG (llevError, "Present_arch called outside map.\n");
1856	return NULL;	1831	return NULL;
1857	}	1832	}
1858		1833
1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1860	if (tmp->arch == at)	1835	if (tmp->arch == at)
1861	return tmp;	1836	return tmp;
1862		1837
1863	return NULL;	1838	return NULL;
1864	}	1839	}
…		…
1875	{	1850	{
1876	LOG (llevError, "Present called outside map.\n");	1851	LOG (llevError, "Present called outside map.\n");
1877	return NULL;	1852	return NULL;
1878	}	1853	}
1879		1854
1880	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1855	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1881	if (tmp->type == type)	1856	if (tmp->type == type)
1882	return tmp;	1857	return tmp;
1883		1858
1884	return NULL;	1859	return NULL;
1885	}	1860	}
…		…
2025	}	2000	}
2026		2001
2027	if (!index)	2002	if (!index)
2028	return -1;	2003	return -1;
2029		2004
2030	return altern[RANDOM () % index];	2005	return altern [rndm (index)];
2031	}	2006	}
2032		2007
2033	/*	2008	/*
2034	* find_first_free_spot(archetype, maptile, x, y) works like	2009	* find_first_free_spot(archetype, maptile, x, y) works like
2035	* find_free_spot(), but it will search max number of squares.	2010	* find_free_spot(), but it will search max number of squares.
…		…
2056	{	2031	{
2057	arr += begin;	2032	arr += begin;
2058	end -= begin;	2033	end -= begin;
2059		2034
2060	while (--end)	2035	while (--end)
2061	swap (arr [end], arr [RANDOM () % (end + 1)]);	2036	swap (arr [end], arr [rndm (end + 1)]);
2062	}	2037	}
2063		2038
2064	/* new function to make monster searching more efficient, and effective!	2039	/* new function to make monster searching more efficient, and effective!
2065	* This basically returns a randomized array (in the passed pointer) of	2040	* This basically returns a randomized array (in the passed pointer) of
2066	* the spaces to find monsters. In this way, it won't always look for	2041	* the spaces to find monsters. In this way, it won't always look for
…		…
2200		2175
2201	return 3;	2176	return 3;
2202	}	2177	}
2203		2178
2204	/*	2179	/*
2205	* absdir(int): Returns a number between 1 and 8, which represent
2206	* the "absolute" direction of a number (it actually takes care of
2207	* "overflow" in previous calculations of a direction).
2208	*/
2209
2210	int
2211	absdir (int d)
2212	{
2213	while (d < 1)
2214	d += 8;
2215
2216	while (d > 8)
2217	d -= 8;
2218
2219	return d;
2220	}
2221
2222	/*
2223	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2180	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2224	* between two directions (which are expected to be absolute (see absdir())	2181	* between two directions (which are expected to be absolute (see absdir())
2225	*/	2182	*/
2226
2227	int	2183	int
2228	dirdiff (int dir1, int dir2)	2184	dirdiff (int dir1, int dir2)
2229	{	2185	{
2230	int d;	2186	int d;
2231		2187
…		…
2397	insert_ob_in_ob (object_create_clone (item), dst);	2353	insert_ob_in_ob (object_create_clone (item), dst);
2398		2354
2399	return dst;	2355	return dst;
2400	}	2356	}
2401		2357
2402	/* GROS - Creates an object using a string representing its content. */
2403	/* Basically, we save the content of the string to a temp file, then call */
2404	/* load_object on it. I admit it is a highly inefficient way to make things, */
2405	/* but it was simple to make and allows reusing the load_object function. */
2406	/* Remember not to use load_object_str in a time-critical situation. */
2407	/* Also remember that multiparts objects are not supported for now. */
2408	object *
2409	load_object_str (const char *obstr)
2410	{
2411	object *op;
2412	char filename[MAX_BUF];
2413
2414	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2415
2416	FILE *tempfile = fopen (filename, "w");
2417
2418	if (tempfile == NULL)
2419	{
2420	LOG (llevError, "Error - Unable to access load object temp file\n");
2421	return NULL;
2422	}
2423
2424	fprintf (tempfile, obstr);
2425	fclose (tempfile);
2426
2427	op = object::create ();
2428
2429	object_thawer thawer (filename);
2430
2431	if (thawer)
2432	load_object (thawer, op, 0);
2433
2434	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2435	CLEAR_FLAG (op, FLAG_REMOVED);
2436
2437	return op;
2438	}
2439
2440	/* This returns the first object in who's inventory that	2358	/* This returns the first object in who's inventory that
2441	* has the same type and subtype match.	2359	* has the same type and subtype match.
2442	* returns NULL if no match.	2360	* returns NULL if no match.
2443	*/	2361	*/
2444	object *	2362	object *
…		…
2497	if (link->key == canonical_key)	2415	if (link->key == canonical_key)
2498	return link->value;	2416	return link->value;
2499		2417
2500	return 0;	2418	return 0;
2501	}	2419	}
2502
2503		2420
2504	/*	2421	/*
2505	* Updates the canonical_key in op to value.	2422	* Updates the canonical_key in op to value.
2506	*	2423	*
2507	* canonical_key is a shared string (value doesn't have to be).	2424	* canonical_key is a shared string (value doesn't have to be).
…		…
2610	}	2527	}
2611	else	2528	else
2612	item = item->env;	2529	item = item->env;
2613	}	2530	}
2614		2531
		2532
		2533	const char *
		2534	object::flag_desc (char *desc, int len) const
		2535	{
		2536	char *p = desc;
		2537	bool first = true;
		2538
		2539	*p = 0;
		2540
		2541	for (int i = 0; i < NUM_FLAGS; i++)
		2542	{
		2543	if (len <= 10) // magic constant!
		2544	{
		2545	snprintf (p, len, ",...");
		2546	break;
		2547	}
		2548
		2549	if (flag [i])
		2550	{
		2551	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2552	len -= cnt;
		2553	p += cnt;
		2554	first = false;
		2555	}
		2556	}
		2557
		2558	return desc;
		2559	}
		2560
2615	// return a suitable string describing an objetc in enough detail to find it	2561	// return a suitable string describing an object in enough detail to find it
2616	const char *	2562	const char *
2617	object::debug_desc (char *info) const	2563	object::debug_desc (char *info) const
2618	{	2564	{
		2565	char flagdesc[512];
2619	char info2[256 * 3];	2566	char info2[256 * 4];
2620	char *p = info;	2567	char *p = info;
2621		2568
2622	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2569	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2623	count,	2570	count, uuid.seq,
2624	&name,	2571	&name,
2625	title ? " " : "",	2572	title ? "\",title:\"" : "",
2626	title ? (const char *)title : "");	2573	title ? (const char *)title : "",
		2574	flag_desc (flagdesc, 512), type);
2627		2575
2628	if (env)	2576	if (env)
2629	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2577	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2630		2578
2631	if (map)	2579	if (map)
…		…
2635	}	2583	}
2636		2584
2637	const char *	2585	const char *
2638	object::debug_desc () const	2586	object::debug_desc () const
2639	{	2587	{
2640	static char info[256 * 3];	2588	static char info[256 * 4];
2641	return debug_desc (info);	2589	return debug_desc (info);
2642	}	2590	}
2643		2591
		2592	const char *
		2593	object::debug_desc2 () const
		2594	{
		2595	static char info[256 * 4];
		2596	return debug_desc (info);
		2597	}
		2598
		2599	struct region *
		2600	object::region () const
		2601	{
		2602	return map ? map->region (x, y)
		2603	: region::default_region ();
		2604	}
		2605
		2606	const materialtype_t *
		2607	object::dominant_material () const
		2608	{
		2609	if (materialtype_t *mat = name_to_material (materialname))
		2610	return mat;
		2611
		2612	// omfg this is slow, this has to be temporary :)
		2613	shstr unknown ("unknown");
		2614
		2615	return name_to_material (unknown);
		2616	}
		2617
		2618	void
		2619	object::open_container (object *new_container)
		2620	{
		2621	if (container == new_container)
		2622	return;
		2623
		2624	if (object *old_container = container)
		2625	{
		2626	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2627	return;
		2628
		2629	#if 0
		2630	// remove the "Close old_container" object.
		2631	if (object *closer = old_container->inv)
		2632	if (closer->type == CLOSE_CON)
		2633	closer->destroy ();
		2634	#endif
		2635
		2636	old_container->flag [FLAG_APPLIED] = 0;
		2637	container = 0;
		2638
		2639	esrv_update_item (UPD_FLAGS, this, old_container);
		2640	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2641	}
		2642
		2643	if (new_container)
		2644	{
		2645	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2646	return;
		2647
		2648	// TODO: this does not seem to serve any purpose anymore?
		2649	#if 0
		2650	// insert the "Close Container" object.
		2651	if (archetype *closer = new_container->other_arch)
		2652	{
		2653	object *closer = arch_to_object (new_container->other_arch);
		2654	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2655	new_container->insert (closer);
		2656	}
		2657	#endif
		2658
		2659	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2660
		2661	new_container->flag [FLAG_APPLIED] = 1;
		2662	container = new_container;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, new_container);
		2665	esrv_send_inventory (this, new_container);
		2666	}
		2667	}
		2668
		2669

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs. Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC