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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.101 by root, Mon Jan 1 17:30:33 2007 UTC vs.
Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
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,
…		…
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	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	607	* UP_OBJ_FACE: only the objects face has changed.
590	*/	608	*/
591	void	609	void
592	update_object (object *op, int action)	610	update_object (object *op, int action)
593	{	611	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	612	if (op == NULL)
597	{	613	{
598	/* this should never happen */	614	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	615	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	616	return;
…		…
660		676
661	if (op->more)	677	if (op->more)
662	update_object (op->more, action);	678	update_object (op->more, action);
663	}	679	}
664		680
665	object *object::first;
666
667	object::object ()	681	object::object ()
668	{	682	{
669	SET_FLAG (this, FLAG_REMOVED);	683	SET_FLAG (this, FLAG_REMOVED);
670		684
671	expmul = 1.0;	685	expmul = 1.0;
672	face = blank_face;	686	face = blank_face;
673	}	687	}
674		688
675	object::~object ()	689	object::~object ()
676	{	690	{
		691	unlink ();
		692
677	free_key_values (this);	693	free_key_values (this);
678	}	694	}
679		695
		696	static int object_count;
		697
680	void object::link ()	698	void object::link ()
681	{	699	{
682	count = ++ob_count;	700	assert (!index);//D
683	uuid = gen_uuid ();	701	uuid = gen_uuid ();
		702	count = ++object_count;
684		703
685	prev = 0;	704	refcnt_inc ();
686	next = object::first;	705	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	706	}
693		707
694	void object::unlink ()	708	void object::unlink ()
695	{	709	{
696	if (this == object::first)	710	if (!index)
697	object::first = next;	711	return;
698		712
699	/* Remove this object from the list of used objects */	713	objects.erase (this);
700	if (prev) prev->next = next;	714	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next \|\| active_prev \|\| this == active_objects;
711	}	715	}
712		716
713	void	717	void
714	object::activate ()	718	object::activate ()
715	{	719	{
716	/* If already on active list, don't do anything */	720	/* If already on active list, don't do anything */
717	if (active ())	721	if (active)
718	return;	722	return;
719		723
720	if (has_active_speed ())	724	if (has_active_speed ())
721	{	725	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	726	}
732		727
733	void	728	void
734	object::activate_recursive ()	729	object::activate_recursive ()
735	{	730	{
736	activate ();	731	activate ();
737		732
738	for (object *op = inv; op; op = op->above)	733	for (object *op = inv; op; op = op->below)
739	op->activate_recursive ();	734	op->activate_recursive ();
740	}	735	}
741		736
742	/* This function removes object 'op' from the list of active	737	/* This function removes object 'op' from the list of active
743	* objects.	738	* objects.
…		…
749	*/	744	*/
750	void	745	void
751	object::deactivate ()	746	object::deactivate ()
752	{	747	{
753	/* If not on the active list, nothing needs to be done */	748	/* If not on the active list, nothing needs to be done */
754	if (!active ())	749	if (!active)
755	return;	750	return;
756		751
757	if (active_prev == 0)	752	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	753	}
773		754
774	void	755	void
775	object::deactivate_recursive ()	756	object::deactivate_recursive ()
776	{	757	{
777	for (object *op = inv; op; op = op->above)	758	for (object *op = inv; op; op = op->below)
778	op->deactivate_recursive ();	759	op->deactivate_recursive ();
779		760
780	deactivate ();	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	}
781	}	772	}
782		773
783	/*	774	/*
784	* 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.
785	* object.c ?	776	* object.c ?
…		…
800	* drop on that space.	791	* drop on that space.
801	*/	792	*/
802	if (!drop_to_ground	793	if (!drop_to_ground
803	\|\| !map	794	\|\| !map
804	\|\| map->in_memory != MAP_IN_MEMORY	795	\|\| map->in_memory != MAP_IN_MEMORY
		796	\|\| map->nodrop
805	\|\| ms ().move_block == MOVE_ALL)	797	\|\| ms ().move_block == MOVE_ALL)
806	{	798	{
807	while (inv)	799	while (inv)
808	{	800	{
809	inv->destroy_inv (drop_to_ground);	801	inv->destroy_inv (drop_to_ground);
…		…
818		810
819	if (op->flag [FLAG_STARTEQUIP]	811	if (op->flag [FLAG_STARTEQUIP]
820	\|\| op->flag [FLAG_NO_DROP]	812	\|\| op->flag [FLAG_NO_DROP]
821	\|\| op->type == RUNE	813	\|\| op->type == RUNE
822	\|\| op->type == TRAP	814	\|\| op->type == TRAP
823	\|\| op->flag [FLAG_IS_A_TEMPLATE])	815	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		816	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	817	op->destroy ();
825	else	818	else
826	map->insert (op, x, y);	819	map->insert (op, x, y);
827	}	820	}
828	}	821	}
…		…
836	}	829	}
837		830
838	void	831	void
839	object::do_destroy ()	832	object::do_destroy ()
840	{	833	{
		834	attachable::do_destroy ();
		835
841	if (flag [FLAG_IS_LINKED])	836	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	837	remove_button_link (this);
843		838
844	if (flag [FLAG_FRIENDLY])	839	if (flag [FLAG_FRIENDLY])
		840	{
845	remove_friendly_object (this);	841	remove_friendly_object (this);
		842
		843	if (type == GOLEM
		844	&& owner
		845	&& owner->type == PLAYER
		846	&& owner->contr->ranges[range_golem] == this)
		847	owner->contr->ranges[range_golem] = 0;
		848	}
846		849
847	if (!flag [FLAG_REMOVED])	850	if (!flag [FLAG_REMOVED])
848	remove ();	851	remove ();
849		852
850	if (flag [FLAG_FREED])	853	destroy_inv (true);
851	return;
852		854
853	set_speed (0);	855	deactivate ();
		856	unlink ();
854		857
855	flag [FLAG_FREED] = 1;	858	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		859
862	// hack to ensure that freed objects still have a valid map	860	// hack to ensure that freed objects still have a valid map
863	{	861	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	862	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		863
…		…
870	freed_map->name = "/internal/freed_objects_map";	868	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;	869	freed_map->width = 3;
872	freed_map->height = 3;	870	freed_map->height = 3;
873		871
874	freed_map->alloc ();	872	freed_map->alloc ();
		873	freed_map->in_memory = MAP_IN_MEMORY;
875	}	874	}
876		875
877	map = freed_map;	876	map = freed_map;
878	x = 1;	877	x = 1;
879	y = 1;	878	y = 1;
…		…
889		888
890	// clear those pointers that likely might have circular references to us	889	// clear those pointers that likely might have circular references to us
891	owner = 0;	890	owner = 0;
892	enemy = 0;	891	enemy = 0;
893	attacked_by = 0;	892	attacked_by = 0;
894
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	893	}
898		894
899	void	895	void
900	object::destroy (bool destroy_inventory)	896	object::destroy (bool destroy_inventory)
901	{	897	{
…		…
929	* This function removes the object op from the linked list of objects	925	* This function removes the object op from the linked list of objects
930	* which it is currently tied to. When this function is done, the	926	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	927	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	928	* environment, the x and y coordinates will be updated to
933	* the previous environment.	929	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	930	*/
936	void	931	void
937	object::remove ()	932	object::do_remove ()
938	{	933	{
939	object tmp, last = 0;	934	object tmp, last = 0;
940	object *otmp;	935	object *otmp;
941		936
942	if (QUERY_FLAG (this, FLAG_REMOVED))	937	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
985	}	980	}
986	else if (map)	981	else if (map)
987	{	982	{
988	if (type == PLAYER)	983	if (type == PLAYER)
989	{	984	{
		985	// leaving a spot always closes any open container on the ground
		986	if (container && !container->env)
		987	// this causes spurious floorbox updates, but it ensures
		988	// that the CLOSE event is being sent.
		989	close_container ();
		990
990	--map->players;	991	--map->players;
991	map->touch ();	992	map->touch ();
992	}	993	}
993		994
994	map->dirty = true;	995	map->dirty = true;
		996	mapspace &ms = this->ms ();
995		997
996	/* link the object above us */	998	/* link the object above us */
997	if (above)	999	if (above)
998	above->below = below;	1000	above->below = below;
999	else	1001	else
1000	map->at (x, y).top = below; /* we were top, set new top */	1002	ms.top = below; /* we were top, set new top */
1001		1003
1002	/* Relink the object below us, if there is one */	1004	/* Relink the object below us, if there is one */
1003	if (below)	1005	if (below)
1004	below->above = above;	1006	below->above = above;
1005	else	1007	else
…		…
1007	/* Nothing below, which means we need to relink map object for this space	1009	/* Nothing below, which means we need to relink map object for this space
1008	* use translated coordinates in case some oddness with map tiling is	1010	* use translated coordinates in case some oddness with map tiling is
1009	* evident	1011	* evident
1010	*/	1012	*/
1011	if (GET_MAP_OB (map, x, y) != this)	1013	if (GET_MAP_OB (map, x, y) != this)
1012	{
1013	char *dump = dump_object (this);
1014	LOG (llevError,
1015	"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);	1014	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 ());
1016	free (dump);
1017	dump = dump_object (GET_MAP_OB (map, x, y));
1018	LOG (llevError, "%s\n", dump);
1019	free (dump);
1020	}
1021		1015
1022	map->at (x, y).bot = above; /* goes on above it. */	1016	ms.bot = above; /* goes on above it. */
1023	}	1017	}
1024		1018
1025	above = 0;	1019	above = 0;
1026	below = 0;	1020	below = 0;
1027		1021
1028	if (map->in_memory == MAP_SAVING)	1022	if (map->in_memory == MAP_SAVING)
1029	return;	1023	return;
1030		1024
1031	int check_walk_off = !flag [FLAG_NO_APPLY];	1025	int check_walk_off = !flag [FLAG_NO_APPLY];
1032		1026
1033	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1027	for (tmp = ms.bot; tmp; tmp = tmp->above)
1034	{	1028	{
1035	/* No point updating the players look faces if he is the object	1029	/* No point updating the players look faces if he is the object
1036	* being removed.	1030	* being removed.
1037	*/	1031	*/
1038		1032
…		…
1119		1113
1120	return 0;	1114	return 0;
1121	}	1115	}
1122		1116
1123	/*	1117	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1118	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1119	* job preparing multi-part monsters.
1126	*/	1120	*/
1127	object *	1121	object *
1128	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1122	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1129	{	1123	{
1130	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1124	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1158	*/	1152	*/
1159	object *	1153	object *
1160	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1154	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1161	{	1155	{
1162	object tmp, top, *floor = NULL;	1156	object tmp, top, *floor = NULL;
1163	sint16 x, y;
1164		1157
1165	if (QUERY_FLAG (op, FLAG_FREED))	1158	if (QUERY_FLAG (op, FLAG_FREED))
1166	{	1159	{
1167	LOG (llevError, "Trying to insert freed object!\n");	1160	LOG (llevError, "Trying to insert freed object!\n");
1168	return NULL;	1161	return NULL;
1169	}	1162	}
		1163
		1164	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1165	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1166
		1167	op->remove ();
1170		1168
1171	if (!m)	1169	if (!m)
1172	{	1170	{
1173	char *dump = dump_object (op);	1171	char *dump = dump_object (op);
1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1172	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1189	#endif	1187	#endif
1190	free (dump);	1188	free (dump);
1191	return op;	1189	return op;
1192	}	1190	}
1193		1191
1194	if (!QUERY_FLAG (op, FLAG_REMOVED))
1195	{
1196	char *dump = dump_object (op);
1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198	free (dump);
1199	return op;
1200	}
1201
1202	if (op->more)
1203	{
1204	/* The part may be on a different map. */
1205
1206	object *more = op->more;	1192	if (object *more = op->more)
1207		1193	{
1208	/* We really need the caller to normalize coordinates - if
1209	* we set the map, that doesn't work if the location is within
1210	* a map and this is straddling an edge. So only if coordinate
1211	* is clear wrong do we normalize it.
1212	*/
1213	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214	more->map = get_map_from_coord (m, &more->x, &more->y);
1215	else if (!more->map)
1216	{
1217	/* For backwards compatibility - when not dealing with tiled maps,
1218	* more->map should always point to the parent.
1219	*/
1220	more->map = m;
1221	}
1222
1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1194	if (!insert_ob_in_map (more, m, originator, flag))
1224	{	1195	{
1225	if (!op->head)	1196	if (!op->head)
1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1197	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227		1198
1228	return 0;	1199	return 0;
…		…
1233		1204
1234	/* Ideally, the caller figures this out. However, it complicates a lot	1205	/* Ideally, the caller figures this out. However, it complicates a lot
1235	* of areas of callers (eg, anything that uses find_free_spot would now	1206	* of areas of callers (eg, anything that uses find_free_spot would now
1236	* need extra work	1207	* need extra work
1237	*/	1208	*/
1238	op->map = get_map_from_coord (m, &op->x, &op->y);	1209	if (!xy_normalise (m, op->x, op->y))
1239	x = op->x;	1210	return 0;
1240	y = op->y;	1211
		1212	op->map = m;
		1213	mapspace &ms = op->ms ();
1241		1214
1242	/* this has to be done after we translate the coordinates.	1215	/* this has to be done after we translate the coordinates.
1243	*/	1216	*/
1244	if (op->nrof && !(flag & INS_NO_MERGE))	1217	if (op->nrof && !(flag & INS_NO_MERGE))
1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1218	for (tmp = ms.bot; tmp; tmp = tmp->above)
1246	if (object::can_merge (op, tmp))	1219	if (object::can_merge (op, tmp))
1247	{	1220	{
1248	op->nrof += tmp->nrof;	1221	op->nrof += tmp->nrof;
1249	tmp->destroy ();	1222	tmp->destroy ();
1250	}	1223	}
…		…
1267	op->below = originator->below;	1240	op->below = originator->below;
1268		1241
1269	if (op->below)	1242	if (op->below)
1270	op->below->above = op;	1243	op->below->above = op;
1271	else	1244	else
1272	op->ms ().bot = op;	1245	ms.bot = op;
1273		1246
1274	/* since below originator, no need to update top */	1247	/* since below originator, no need to update top */
1275	originator->below = op;	1248	originator->below = op;
1276	}	1249	}
1277	else	1250	else
1278	{	1251	{
		1252	top = ms.bot;
		1253
1279	/* If there are other objects, then */	1254	/* If there are other objects, then */
1280	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1255	if ((!(flag & INS_MAP_LOAD)) && top)
1281	{	1256	{
1282	object *last = 0;	1257	object *last = 0;
1283		1258
1284	/*	1259	/*
1285	* If there are multiple objects on this space, we do some trickier handling.	1260	* If there are multiple objects on this space, we do some trickier handling.
…		…
1291	* once we get to them. This reduces the need to traverse over all of	1266	* once we get to them. This reduces the need to traverse over all of
1292	* them when adding another one - this saves quite a bit of cpu time	1267	* them when adding another one - this saves quite a bit of cpu time
1293	* when lots of spells are cast in one area. Currently, it is presumed	1268	* when lots of spells are cast in one area. Currently, it is presumed
1294	* that flying non pickable objects are spell objects.	1269	* that flying non pickable objects are spell objects.
1295	*/	1270	*/
1296	while (top)	1271	for (top = ms.bot; top; top = top->above)
1297	{	1272	{
1298	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1273	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1299	floor = top;	1274	floor = top;
1300		1275
1301	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1276	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1304	top = top->below;	1279	top = top->below;
1305	break;	1280	break;
1306	}	1281	}
1307		1282
1308	last = top;	1283	last = top;
1309	top = top->above;
1310	}	1284	}
1311		1285
1312	/* Don't want top to be NULL, so set it to the last valid object */	1286	/* Don't want top to be NULL, so set it to the last valid object */
1313	top = last;	1287	top = last;
1314		1288
…		…
1316	* looks like instead of lots of conditions here.	1290	* looks like instead of lots of conditions here.
1317	* makes things faster, and effectively the same result.	1291	* makes things faster, and effectively the same result.
1318	*/	1292	*/
1319		1293
1320	/* Have object 'fall below' other objects that block view.	1294	/* Have object 'fall below' other objects that block view.
1321	* Unless those objects are exits, type 66	1295	* Unless those objects are exits.
1322	* If INS_ON_TOP is used, don't do this processing	1296	* If INS_ON_TOP is used, don't do this processing
1323	* Need to find the object that in fact blocks view, otherwise	1297	* Need to find the object that in fact blocks view, otherwise
1324	* stacking is a bit odd.	1298	* stacking is a bit odd.
1325	*/	1299	*/
1326	if (!(flag & INS_ON_TOP) &&	1300	if (!(flag & INS_ON_TOP)
1327	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1301	&& ms.flags () & P_BLOCKSVIEW
		1302	&& (op->face && !faces [op->face].visibility))
1328	{	1303	{
1329	for (last = top; last != floor; last = last->below)	1304	for (last = top; last != floor; last = last->below)
1330	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1305	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331	break;	1306	break;
		1307
1332	/* Check to see if we found the object that blocks view,	1308	/* Check to see if we found the object that blocks view,
1333	* and make sure we have a below pointer for it so that	1309	* and make sure we have a below pointer for it so that
1334	* we can get inserted below this one, which requires we	1310	* we can get inserted below this one, which requires we
1335	* set top to the object below us.	1311	* set top to the object below us.
1336	*/	1312	*/
…		…
1338	top = last->below;	1314	top = last->below;
1339	}	1315	}
1340	} /* If objects on this space */	1316	} /* If objects on this space */
1341		1317
1342	if (flag & INS_MAP_LOAD)	1318	if (flag & INS_MAP_LOAD)
1343	top = GET_MAP_TOP (op->map, op->x, op->y);	1319	top = ms.top;
1344		1320
1345	if (flag & INS_ABOVE_FLOOR_ONLY)	1321	if (flag & INS_ABOVE_FLOOR_ONLY)
1346	top = floor;	1322	top = floor;
1347		1323
1348	/* Top is the object that our object (op) is going to get inserted above.	1324	/* Top is the object that our object (op) is going to get inserted above.
1349	*/	1325	*/
1350		1326
1351	/* First object on this space */	1327	/* First object on this space */
1352	if (!top)	1328	if (!top)
1353	{	1329	{
1354	op->above = GET_MAP_OB (op->map, op->x, op->y);	1330	op->above = ms.bot;
1355		1331
1356	if (op->above)	1332	if (op->above)
1357	op->above->below = op;	1333	op->above->below = op;
1358		1334
1359	op->below = 0;	1335	op->below = 0;
1360	op->ms ().bot = op;	1336	ms.bot = op;
1361	}	1337	}
1362	else	1338	else
1363	{ /* get inserted into the stack above top */	1339	{ /* get inserted into the stack above top */
1364	op->above = top->above;	1340	op->above = top->above;
1365		1341
…		…
1369	op->below = top;	1345	op->below = top;
1370	top->above = op;	1346	top->above = op;
1371	}	1347	}
1372		1348
1373	if (!op->above)	1349	if (!op->above)
1374	op->ms ().top = op;	1350	ms.top = op;
1375	} /* else not INS_BELOW_ORIGINATOR */	1351	} /* else not INS_BELOW_ORIGINATOR */
1376		1352
1377	if (op->type == PLAYER)	1353	if (op->type == PLAYER)
1378	{	1354	{
1379	op->contr->do_los = 1;	1355	op->contr->do_los = 1;
…		…
1385		1361
1386	/* If we have a floor, we know the player, if any, will be above	1362	/* If we have a floor, we know the player, if any, will be above
1387	* it, so save a few ticks and start from there.	1363	* it, so save a few ticks and start from there.
1388	*/	1364	*/
1389	if (!(flag & INS_MAP_LOAD))	1365	if (!(flag & INS_MAP_LOAD))
1390	if (object *pl = op->ms ().player ())	1366	if (object *pl = ms.player ())
1391	if (pl->contr->ns)	1367	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1368	pl->contr->ns->floorbox_update ();
1393		1369
1394	/* If this object glows, it may affect lighting conditions that are	1370	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1371	* visible to others on this map. But update_all_los is really
…		…
1443	{	1419	{
1444	object tmp, tmp1;	1420	object tmp, tmp1;
1445		1421
1446	/* first search for itself and remove any old instances */	1422	/* first search for itself and remove any old instances */
1447		1423
1448	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1424	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1425	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1450	tmp->destroy ();	1426	tmp->destroy ();
1451		1427
1452	tmp1 = arch_to_object (archetype::find (arch_string));	1428	tmp1 = arch_to_object (archetype::find (arch_string));
1453		1429
1454	tmp1->x = op->x;	1430	tmp1->x = op->x;
1455	tmp1->y = op->y;	1431	tmp1->y = op->y;
1456	insert_ob_in_map (tmp1, op->map, op, 0);	1432	insert_ob_in_map (tmp1, op->map, op, 0);
1457	}	1433	}
1458		1434
		1435	// XXX: function not returning object*
1459	object *	1436	object *
1460	object::insert_at (object where, object originator, int flags)	1437	object::insert_at (object where, object originator, int flags)
1461	{	1438	{
1462	where->map->insert (this, where->x, where->y, originator, flags);	1439	where->map->insert (this, where->x, where->y, originator, flags);
1463	}	1440	}
…		…
1776		1753
1777	/* The objects have to be checked from top to bottom.	1754	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1755	* Hence, we first go to the top:
1779	*/	1756	*/
1780		1757
1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1758	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782	{	1759	{
1783	/* Trim the search when we find the first other spell effect	1760	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1761	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1762	* we don't need to check all of them.
1786	*/	1763	*/
…		…
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1781	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1805	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1782	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1783	{
1807		1784
1808	float	1785	float
1809	diff = tmp->move_slow_penalty * FABS (op->speed);	1786	diff = tmp->move_slow_penalty * fabs (op->speed);
1810		1787
1811	if (op->type == PLAYER)	1788	if (op->type == PLAYER)
1812	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1789	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1813	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1790	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814	diff /= 4.0;	1791	diff /= 4.0;
…		…
1844	* The first matching object is returned, or NULL if none.	1821	* The first matching object is returned, or NULL if none.
1845	*/	1822	*/
1846	object *	1823	object *
1847	present_arch (const archetype at, maptile m, int x, int y)	1824	present_arch (const archetype at, maptile m, int x, int y)
1848	{	1825	{
1849	if (m == NULL \|\| out_of_map (m, x, y))	1826	if (!m \|\| out_of_map (m, x, y))
1850	{	1827	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1828	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1829	return NULL;
1853	}	1830	}
1854		1831
1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1832	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856	if (tmp->arch == at)	1833	if (tmp->arch == at)
1857	return tmp;	1834	return tmp;
1858		1835
1859	return NULL;	1836	return NULL;
1860	}	1837	}
…		…
1871	{	1848	{
1872	LOG (llevError, "Present called outside map.\n");	1849	LOG (llevError, "Present called outside map.\n");
1873	return NULL;	1850	return NULL;
1874	}	1851	}
1875		1852
1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1853	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1854	if (tmp->type == type)
1878	return tmp;	1855	return tmp;
1879		1856
1880	return NULL;	1857	return NULL;
1881	}	1858	}
…		…
2021	}	1998	}
2022		1999
2023	if (!index)	2000	if (!index)
2024	return -1;	2001	return -1;
2025		2002
2026	return altern[RANDOM () % index];	2003	return altern [rndm (index)];
2027	}	2004	}
2028		2005
2029	/*	2006	/*
2030	* find_first_free_spot(archetype, maptile, x, y) works like	2007	* find_first_free_spot(archetype, maptile, x, y) works like
2031	* find_free_spot(), but it will search max number of squares.	2008	* find_free_spot(), but it will search max number of squares.
…		…
2052	{	2029	{
2053	arr += begin;	2030	arr += begin;
2054	end -= begin;	2031	end -= begin;
2055		2032
2056	while (--end)	2033	while (--end)
2057	swap (arr [end], arr [RANDOM () % (end + 1)]);	2034	swap (arr [end], arr [rndm (end + 1)]);
2058	}	2035	}
2059		2036
2060	/* new function to make monster searching more efficient, and effective!	2037	/* new function to make monster searching more efficient, and effective!
2061	* This basically returns a randomized array (in the passed pointer) of	2038	* This basically returns a randomized array (in the passed pointer) of
2062	* the spaces to find monsters. In this way, it won't always look for	2039	* the spaces to find monsters. In this way, it won't always look for
…		…
2196		2173
2197	return 3;	2174	return 3;
2198	}	2175	}
2199		2176
2200	/*	2177	/*
2201	* absdir(int): Returns a number between 1 and 8, which represent
2202	* the "absolute" direction of a number (it actually takes care of
2203	* "overflow" in previous calculations of a direction).
2204	*/
2205
2206	int
2207	absdir (int d)
2208	{
2209	while (d < 1)
2210	d += 8;
2211
2212	while (d > 8)
2213	d -= 8;
2214
2215	return d;
2216	}
2217
2218	/*
2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2178	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220	* between two directions (which are expected to be absolute (see absdir())	2179	* between two directions (which are expected to be absolute (see absdir())
2221	*/	2180	*/
2222
2223	int	2181	int
2224	dirdiff (int dir1, int dir2)	2182	dirdiff (int dir1, int dir2)
2225	{	2183	{
2226	int d;	2184	int d;
2227		2185
…		…
2393	insert_ob_in_ob (object_create_clone (item), dst);	2351	insert_ob_in_ob (object_create_clone (item), dst);
2394		2352
2395	return dst;	2353	return dst;
2396	}	2354	}
2397		2355
2398	/* GROS - Creates an object using a string representing its content. */
2399	/* Basically, we save the content of the string to a temp file, then call */
2400	/* load_object on it. I admit it is a highly inefficient way to make things, */
2401	/* but it was simple to make and allows reusing the load_object function. */
2402	/* Remember not to use load_object_str in a time-critical situation. */
2403	/* Also remember that multiparts objects are not supported for now. */
2404	object *
2405	load_object_str (const char *obstr)
2406	{
2407	object *op;
2408	char filename[MAX_BUF];
2409
2410	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412	FILE *tempfile = fopen (filename, "w");
2413
2414	if (tempfile == NULL)
2415	{
2416	LOG (llevError, "Error - Unable to access load object temp file\n");
2417	return NULL;
2418	}
2419
2420	fprintf (tempfile, obstr);
2421	fclose (tempfile);
2422
2423	op = object::create ();
2424
2425	object_thawer thawer (filename);
2426
2427	if (thawer)
2428	load_object (thawer, op, 0);
2429
2430	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431	CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433	return op;
2434	}
2435
2436	/* This returns the first object in who's inventory that	2356	/* This returns the first object in who's inventory that
2437	* has the same type and subtype match.	2357	* has the same type and subtype match.
2438	* returns NULL if no match.	2358	* returns NULL if no match.
2439	*/	2359	*/
2440	object *	2360	object *
…		…
2493	if (link->key == canonical_key)	2413	if (link->key == canonical_key)
2494	return link->value;	2414	return link->value;
2495		2415
2496	return 0;	2416	return 0;
2497	}	2417	}
2498
2499		2418
2500	/*	2419	/*
2501	* Updates the canonical_key in op to value.	2420	* Updates the canonical_key in op to value.
2502	*	2421	*
2503	* canonical_key is a shared string (value doesn't have to be).	2422	* canonical_key is a shared string (value doesn't have to be).
…		…
2643	{	2562	{
2644	char flagdesc[512];	2563	char flagdesc[512];
2645	char info2[256 * 4];	2564	char info2[256 * 4];
2646	char *p = info;	2565	char *p = info;
2647		2566
2648	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2567	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2649	count, uuid.seq,	2568	count, uuid.seq,
2650	&name,	2569	&name,
2651	title ? "\",title:" : "",	2570	title ? "\",title:\"" : "",
2652	title ? (const char *)title : "",	2571	title ? (const char *)title : "",
2653	flag_desc (flagdesc, 512), type);	2572	flag_desc (flagdesc, 512), type);
2654		2573
2655	if (env)	2574	if (env)
2656	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2662	}	2581	}
2663		2582
2664	const char *	2583	const char *
2665	object::debug_desc () const	2584	object::debug_desc () const
2666	{	2585	{
2667	static char info[256 * 3];	2586	static char info[256 * 4];
2668	return debug_desc (info);	2587	return debug_desc (info);
2669	}	2588	}
2670		2589
		2590	const char *
		2591	object::debug_desc2 () const
		2592	{
		2593	static char info[256 * 4];
		2594	return debug_desc (info);
		2595	}
		2596
		2597	struct region *
		2598	object::region () const
		2599	{
		2600	return map ? map->region (x, y)
		2601	: region::default_region ();
		2602	}
		2603
		2604	const materialtype_t *
		2605	object::dominant_material () const
		2606	{
		2607	if (materialtype_t *mat = name_to_material (materialname))
		2608	return mat;
		2609
		2610	// omfg this is slow, this has to be temporary :)
		2611	shstr unknown ("unknown");
		2612
		2613	return name_to_material (unknown);
		2614	}
		2615
		2616	void
		2617	object::open_container (object *new_container)
		2618	{
		2619	if (container == new_container)
		2620	return;
		2621
		2622	if (object *old_container = container)
		2623	{
		2624	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2625	return;
		2626
		2627	#if 0
		2628	// remove the "Close old_container" object.
		2629	if (object *closer = old_container->inv)
		2630	if (closer->type == CLOSE_CON)
		2631	closer->destroy ();
		2632	#endif
		2633
		2634	old_container->flag [FLAG_APPLIED] = 0;
		2635	container = 0;
		2636
		2637	esrv_update_item (UPD_FLAGS, this, old_container);
		2638	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2639	}
		2640
		2641	if (new_container)
		2642	{
		2643	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2644	return;
		2645
		2646	// TODO: this does not seem to serve any purpose anymore?
		2647	#if 0
		2648	// insert the "Close Container" object.
		2649	if (archetype *closer = new_container->other_arch)
		2650	{
		2651	object *closer = arch_to_object (new_container->other_arch);
		2652	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2653	new_container->insert (closer);
		2654	}
		2655	#endif
		2656
		2657	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2658
		2659	new_container->flag [FLAG_APPLIED] = 1;
		2660	container = new_container;
		2661
		2662	esrv_update_item (UPD_FLAGS, this, new_container);
		2663	esrv_send_inventory (this, new_container);
		2664	}
		2665	}
		2666
		2667

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.101 by root, Mon Jan 1 17:30:33 2007 UTC vs. Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.101 by root, Mon Jan 1 17:30:33 2007 UTC vs.
Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC