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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	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
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28	#include <global.h>	28	#include <global.h>
29	#include <stdio.h>	29	#include <stdio.h>
30	#include <sys/types.h>	30	#include <sys/types.h>
31	#include <sys/uio.h>	31	#include <sys/uio.h>
32	#include <object.h>	32	#include <object.h>
33	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
34	#include <loader.h>	35	#include <loader.h>
35		36
36	#include <bitset>	37	#include <bitset>
37		38
38	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
39	static UUID uuid;	40	static UUID uuid;
40	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
41		42
42	object active_objects; / List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
43		45
44	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,	46	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	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	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	};	48	};
47	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,	49	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,
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	359	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	361	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
360	*/	363	*/
361
362	char *	364	char *
363	dump_object (object *op)	365	dump_object (object *op)
364	{	366	{
365	if (!op)	367	if (!op)
366	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
367		369
368	object_freezer freezer;	370	object_freezer freezer;
369	save_object (freezer, op, 1);	371	op->write (freezer);
370	return freezer.as_string ();	372	return freezer.as_string ();
371	}	373	}
372		374
373	/*	375	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	393	}
392		394
393	/*	395	/*
394	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
395	*/	397	*/
396
397	object *	398	object *
398	find_object (tag_t i)	399	find_object (tag_t i)
399	{	400	{
400	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
401	if (op->count == i)	402	if (op->count == i)
402	return op;	403	return op;
403		404
404	return 0;	405	return 0;
405	}	406	}
406		407
407	/*	408	/*
408	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
411	*/	412	*/
412
413	object *	413	object *
414	find_object_name (const char *str)	414	find_object_name (const char *str)
415	{	415	{
416	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
417	object *op;	417	object *op;
418		418
419	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
420	if (op->name == str_)	420	if (op->name == str_)
421	break;	421	break;
422		422
423	return op;	423	return op;
424	}	424	}
…		…
450	owner = owner->owner;	450	owner = owner->owner;
451		451
452	this->owner = owner;	452	this->owner = owner;
453	}	453	}
454		454
		455	bool
		456	object::change_weapon (object *ob)
		457	{
		458	if (current_weapon == ob)
		459	return true;
		460
		461	if (chosen_skill)
		462	chosen_skill->flag [FLAG_APPLIED] = false;
		463
		464	current_weapon = ob;
		465	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		466
		467	if (chosen_skill)
		468	chosen_skill->flag [FLAG_APPLIED] = true;
		469
		470	update_stats ();
		471
		472	if (ob)
		473	{
		474	// now check wether any body locations became invalid, in which case
		475	// we cannot apply the weapon at the moment.
		476	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		477	if (slot[i].used < 0)
		478	{
		479	current_weapon = chosen_skill = 0;
		480	update_stats ();
		481
		482	new_draw_info_format (NDI_UNIQUE, 0, this,
		483	"You try to balance your applied items all at once, but the %s is too much. "
		484	"You need to unapply some items first.", &ob->name);
		485	return false;
		486	}
		487
		488	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		489	}
		490	else
		491	new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		492
		493	return true;
		494	}
		495
455	/* Zero the key_values on op, decrementing the shared-string	496	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	497	* refcounts and freeing the links.
457	*/	498	*/
458	static void	499	static void
459	free_key_values (object *op)	500	free_key_values (object *op)
460	{	501	{
461	for (key_value *i = op->key_values; i != 0;)	502	for (key_value *i = op->key_values; i; )
462	{	503	{
463	key_value *next = i->next;	504	key_value *next = i->next;
464	delete i;	505	delete i;
465		506
466	i = next;	507	i = next;
467	}	508	}
468		509
469	op->key_values = 0;	510	op->key_values = 0;
470	}	511	}
471		512
472	/*	513	object &
473	* copy_to first frees everything allocated by the dst object,	514	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	515	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	516	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	517	bool is_removed = flag [FLAG_REMOVED];
485		518
486	(object_copy )dst = *this;	519	(object_copy )this = src;
487		520
488	if (is_freed)	521	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	522	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		523
497	/* Copy over key_values, if any. */	524	/* Copy over key_values, if any. */
498	if (key_values)	525	if (src.key_values)
499	{	526	{
500	key_value *tail = 0;	527	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	528	key_values = 0;
504		529
505	for (i = key_values; i; i = i->next)	530	for (key_value *i = src.key_values; i; i = i->next)
506	{	531	{
507	key_value *new_link = new key_value;	532	key_value *new_link = new key_value;
508		533
509	new_link->next = 0;	534	new_link->next = 0;
510	new_link->key = i->key;	535	new_link->key = i->key;
511	new_link->value = i->value;	536	new_link->value = i->value;
512		537
513	/* Try and be clever here, too. */	538	/* Try and be clever here, too. */
514	if (!dst->key_values)	539	if (!key_values)
515	{	540	{
516	dst->key_values = new_link;	541	key_values = new_link;
517	tail = new_link;	542	tail = new_link;
518	}	543	}
519	else	544	else
520	{	545	{
521	tail->next = new_link;	546	tail->next = new_link;
522	tail = new_link;	547	tail = new_link;
523	}	548	}
524	}	549	}
525	}	550	}
		551	}
		552
		553	/*
		554	* copy_to first frees everything allocated by the dst object,
		555	* and then copies the contents of itself into the second
		556	* object, allocating what needs to be allocated. Basically, any
		557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		558	* if the first object is freed, the pointers in the new object
		559	* will point at garbage.
		560	*/
		561	void
		562	object::copy_to (object *dst)
		563	{
		564	dst = this;
		565
		566	if (speed < 0)
		567	dst->speed_left = speed_left - rndm ();
526		568
527	dst->set_speed (dst->speed);	569	dst->set_speed (dst->speed);
		570	}
		571
		572	void
		573	object::instantiate ()
		574	{
		575	if (!uuid.seq) // HACK
		576	uuid = gen_uuid ();
		577
		578	speed_left = -0.1f;
		579	/* copy the body_info to the body_used - this is only really
		580	* need for monsters, but doesn't hurt to do it for everything.
		581	* by doing so, when a monster is created, it has good starting
		582	* values for the body_used info, so when items are created
		583	* for it, they can be properly equipped.
		584	*/
		585	for (int i = NUM_BODY_LOCATIONS; i--; )
		586	slot[i].used = slot[i].info;
		587
		588	attachable::instantiate ();
528	}	589	}
529		590
530	object *	591	object *
531	object::clone ()	592	object::clone ()
532	{	593	{
…		…
590	* UP_OBJ_FACE: only the objects face has changed.	651	* UP_OBJ_FACE: only the objects face has changed.
591	*/	652	*/
592	void	653	void
593	update_object (object *op, int action)	654	update_object (object *op, int action)
594	{	655	{
595	MoveType move_on, move_off, move_block, move_slow;
596
597	if (op == NULL)	656	if (op == NULL)
598	{	657	{
599	/* this should never happen */	658	/* this should never happen */
600	LOG (llevDebug, "update_object() called for NULL object.\n");	659	LOG (llevDebug, "update_object() called for NULL object.\n");
601	return;	660	return;
…		…
661		720
662	if (op->more)	721	if (op->more)
663	update_object (op->more, action);	722	update_object (op->more, action);
664	}	723	}
665		724
666	object *object::first;
667
668	object::object ()	725	object::object ()
669	{	726	{
670	SET_FLAG (this, FLAG_REMOVED);	727	SET_FLAG (this, FLAG_REMOVED);
671		728
672	expmul = 1.0;	729	expmul = 1.0;
673	face = blank_face;	730	face = blank_face;
674	}	731	}
675		732
676	object::~object ()	733	object::~object ()
677	{	734	{
		735	unlink ();
		736
678	free_key_values (this);	737	free_key_values (this);
679	}	738	}
680		739
		740	static int object_count;
		741
681	void object::link ()	742	void object::link ()
682	{	743	{
683	count = ++ob_count;	744	assert (!index);//D
684	uuid = gen_uuid ();	745	uuid = gen_uuid ();
		746	count = ++object_count;
685		747
686	prev = 0;	748	refcnt_inc ();
687	next = object::first;	749	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	750	}
694		751
695	void object::unlink ()	752	void object::unlink ()
696	{	753	{
697	if (this == object::first)	754	if (!index)
698	object::first = next;	755	return;
699		756
700	/* Remove this object from the list of used objects */	757	objects.erase (this);
701	if (prev) prev->next = next;	758	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}
707
708	bool
709	object::active () const
710	{
711	return active_next \|\| active_prev \|\| this == active_objects;
712	}	759	}
713		760
714	void	761	void
715	object::activate ()	762	object::activate ()
716	{	763	{
717	/* If already on active list, don't do anything */	764	/* If already on active list, don't do anything */
718	if (active ())	765	if (active)
719	return;	766	return;
720		767
721	if (has_active_speed ())	768	if (has_active_speed ())
722	{	769	actives.insert (this);
723	/* process_events() expects us to insert the object at the beginning
724	* of the list. */
725	active_next = active_objects;
726
727	if (active_next)
728	active_next->active_prev = this;
729
730	active_objects = this;
731	}
732	}	770	}
733		771
734	void	772	void
735	object::activate_recursive ()	773	object::activate_recursive ()
736	{	774	{
…		…
750	*/	788	*/
751	void	789	void
752	object::deactivate ()	790	object::deactivate ()
753	{	791	{
754	/* If not on the active list, nothing needs to be done */	792	/* If not on the active list, nothing needs to be done */
755	if (!active ())	793	if (!active)
756	return;	794	return;
757		795
758	if (active_prev == 0)	796	actives.erase (this);
759	{
760	active_objects = active_next;
761	if (active_next)
762	active_next->active_prev = 0;
763	}
764	else
765	{
766	active_prev->active_next = active_next;
767	if (active_next)
768	active_next->active_prev = active_prev;
769	}
770
771	active_next = 0;
772	active_prev = 0;
773	}	797	}
774		798
775	void	799	void
776	object::deactivate_recursive ()	800	object::deactivate_recursive ()
777	{	801	{
…		…
811	* drop on that space.	835	* drop on that space.
812	*/	836	*/
813	if (!drop_to_ground	837	if (!drop_to_ground
814	\|\| !map	838	\|\| !map
815	\|\| map->in_memory != MAP_IN_MEMORY	839	\|\| map->in_memory != MAP_IN_MEMORY
		840	\|\| map->nodrop
816	\|\| ms ().move_block == MOVE_ALL)	841	\|\| ms ().move_block == MOVE_ALL)
817	{	842	{
818	while (inv)	843	while (inv)
819	{	844	{
820	inv->destroy_inv (drop_to_ground);	845	inv->destroy_inv (drop_to_ground);
…		…
829		854
830	if (op->flag [FLAG_STARTEQUIP]	855	if (op->flag [FLAG_STARTEQUIP]
831	\|\| op->flag [FLAG_NO_DROP]	856	\|\| op->flag [FLAG_NO_DROP]
832	\|\| op->type == RUNE	857	\|\| op->type == RUNE
833	\|\| op->type == TRAP	858	\|\| op->type == TRAP
834	\|\| op->flag [FLAG_IS_A_TEMPLATE])	859	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		860	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
835	op->destroy ();	861	op->destroy ();
836	else	862	else
837	map->insert (op, x, y);	863	map->insert (op, x, y);
838	}	864	}
839	}	865	}
…		…
847	}	873	}
848		874
849	void	875	void
850	object::do_destroy ()	876	object::do_destroy ()
851	{	877	{
		878	attachable::do_destroy ();
		879
852	if (flag [FLAG_IS_LINKED])	880	if (flag [FLAG_IS_LINKED])
853	remove_button_link (this);	881	remove_button_link (this);
854		882
855	if (flag [FLAG_FRIENDLY])	883	if (flag [FLAG_FRIENDLY])
856	remove_friendly_object (this);	884	remove_friendly_object (this);
857		885
858	if (!flag [FLAG_REMOVED])	886	if (!flag [FLAG_REMOVED])
859	remove ();	887	remove ();
860		888
861	if (flag [FLAG_FREED])	889	destroy_inv (true);
862	return;
863		890
864	set_speed (0);	891	deactivate ();
		892	unlink ();
865		893
866	flag [FLAG_FREED] = 1;	894	flag [FLAG_FREED] = 1;
867
868	attachable::do_destroy ();
869
870	destroy_inv (true);
871	unlink ();
872		895
873	// hack to ensure that freed objects still have a valid map	896	// hack to ensure that freed objects still have a valid map
874	{	897	{
875	static maptile *freed_map; // freed objects are moved here to avoid crashes	898	static maptile *freed_map; // freed objects are moved here to avoid crashes
876		899
…		…
901		924
902	// clear those pointers that likely might have circular references to us	925	// clear those pointers that likely might have circular references to us
903	owner = 0;	926	owner = 0;
904	enemy = 0;	927	enemy = 0;
905	attacked_by = 0;	928	attacked_by = 0;
906
907	// only relevant for players(?), but make sure of it anyways
908	contr = 0;
909	}	929	}
910		930
911	void	931	void
912	object::destroy (bool destroy_inventory)	932	object::destroy (bool destroy_inventory)
913	{	933	{
…		…
941	* This function removes the object op from the linked list of objects	961	* This function removes the object op from the linked list of objects
942	* which it is currently tied to. When this function is done, the	962	* which it is currently tied to. When this function is done, the
943	* object will have no environment. If the object previously had an	963	* object will have no environment. If the object previously had an
944	* environment, the x and y coordinates will be updated to	964	* environment, the x and y coordinates will be updated to
945	* the previous environment.	965	* the previous environment.
946	* Beware: This function is called from the editor as well!
947	*/	966	*/
948	void	967	void
949	object::remove ()	968	object::do_remove ()
950	{	969	{
951	object tmp, last = 0;	970	object tmp, last = 0;
952	object *otmp;	971	object *otmp;
953		972
954	if (QUERY_FLAG (this, FLAG_REMOVED))	973	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
997	}	1016	}
998	else if (map)	1017	else if (map)
999	{	1018	{
1000	if (type == PLAYER)	1019	if (type == PLAYER)
1001	{	1020	{
		1021	// leaving a spot always closes any open container on the ground
		1022	if (container && !container->env)
		1023	// this causes spurious floorbox updates, but it ensures
		1024	// that the CLOSE event is being sent.
		1025	close_container ();
		1026
1002	--map->players;	1027	--map->players;
1003	map->touch ();	1028	map->touch ();
1004	}	1029	}
1005		1030
1006	map->dirty = true;	1031	map->dirty = true;
		1032	mapspace &ms = this->ms ();
1007		1033
1008	/* link the object above us */	1034	/* link the object above us */
1009	if (above)	1035	if (above)
1010	above->below = below;	1036	above->below = below;
1011	else	1037	else
1012	map->at (x, y).top = below; /* we were top, set new top */	1038	ms.top = below; /* we were top, set new top */
1013		1039
1014	/* Relink the object below us, if there is one */	1040	/* Relink the object below us, if there is one */
1015	if (below)	1041	if (below)
1016	below->above = above;	1042	below->above = above;
1017	else	1043	else
…		…
1019	/* Nothing below, which means we need to relink map object for this space	1045	/* Nothing below, which means we need to relink map object for this space
1020	* use translated coordinates in case some oddness with map tiling is	1046	* use translated coordinates in case some oddness with map tiling is
1021	* evident	1047	* evident
1022	*/	1048	*/
1023	if (GET_MAP_OB (map, x, y) != this)	1049	if (GET_MAP_OB (map, x, y) != this)
1024	{
1025	char *dump = dump_object (this);
1026	LOG (llevError,
1027	"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);	1050	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 ());
1028	free (dump);
1029	dump = dump_object (GET_MAP_OB (map, x, y));
1030	LOG (llevError, "%s\n", dump);
1031	free (dump);
1032	}
1033		1051
1034	map->at (x, y).bot = above; /* goes on above it. */	1052	ms.bot = above; /* goes on above it. */
1035	}	1053	}
1036		1054
1037	above = 0;	1055	above = 0;
1038	below = 0;	1056	below = 0;
1039		1057
1040	if (map->in_memory == MAP_SAVING)	1058	if (map->in_memory == MAP_SAVING)
1041	return;	1059	return;
1042		1060
1043	int check_walk_off = !flag [FLAG_NO_APPLY];	1061	int check_walk_off = !flag [FLAG_NO_APPLY];
1044		1062
1045	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1063	for (tmp = ms.bot; tmp; tmp = tmp->above)
1046	{	1064	{
1047	/* No point updating the players look faces if he is the object	1065	/* No point updating the players look faces if he is the object
1048	* being removed.	1066	* being removed.
1049	*/	1067	*/
1050		1068
…		…
1130	}	1148	}
1131		1149
1132	return 0;	1150	return 0;
1133	}	1151	}
1134		1152
		1153	void
		1154	object::expand_tail ()
		1155	{
		1156	if (more)
		1157	return;
		1158
		1159	object *prev = this;
		1160
		1161	for (archetype *at = arch->more; at; at = at->more)
		1162	{
		1163	object *op = arch_to_object (at);
		1164
		1165	op->name = name;
		1166	op->name_pl = name_pl;
		1167	op->title = title;
		1168
		1169	op->head = this;
		1170	prev->more = op;
		1171
		1172	prev = op;
		1173	}
		1174	}
		1175
1135	/*	1176	/*
1136	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1177	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1137	* job preparing multi-part monsters	1178	* job preparing multi-part monsters.
1138	*/	1179	*/
1139	object *	1180	object *
1140	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1181	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1141	{	1182	{
1142	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1183	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1169	* just 'op' otherwise	1210	* just 'op' otherwise
1170	*/	1211	*/
1171	object *	1212	object *
1172	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1213	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1173	{	1214	{
		1215	assert (!op->flag [FLAG_FREED]);
		1216
1174	object tmp, top, *floor = NULL;	1217	object tmp, top, *floor = NULL;
1175	sint16 x, y;
1176		1218
1177	if (QUERY_FLAG (op, FLAG_FREED))	1219	op->remove ();
1178	{
1179	LOG (llevError, "Trying to insert freed object!\n");
1180	return NULL;
1181	}
1182		1220
1183	if (!m)	1221	#if 0
1184	{	1222	if (!m->active != !op->active)
1185	char *dump = dump_object (op);	1223	if (m->active)
1186	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1224	op->activate_recursive ();
1187	free (dump);	1225	else
1188	return op;	1226	op->deactivate_recursive ();
1189	}	1227	#endif
1190		1228
1191	if (out_of_map (m, op->x, op->y))	1229	if (out_of_map (m, op->x, op->y))
1192	{	1230	{
1193	char *dump = dump_object (op);
1194	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1195	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1196	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1197	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1198	* improperly inserted.	1235	* improperly inserted.
1199	*/	1236	*/
1200	abort ();	1237	abort ();
1201	#endif	1238	#endif
1202	free (dump);
1203	return op;	1239	return op;
1204	}	1240	}
1205		1241
1206	if (!QUERY_FLAG (op, FLAG_REMOVED))
1207	{
1208	char *dump = dump_object (op);
1209	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1210	free (dump);
1211	return op;
1212	}
1213
1214	if (op->more)
1215	{
1216	/* The part may be on a different map. */
1217
1218	object *more = op->more;	1242	if (object *more = op->more)
1219		1243	{
1220	/* We really need the caller to normalise coordinates - if
1221	* we set the map, that doesn't work if the location is within
1222	* a map and this is straddling an edge. So only if coordinate
1223	* is clear wrong do we normalise it.
1224	*/
1225	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1226	more->map = get_map_from_coord (m, &more->x, &more->y);
1227	else if (!more->map)
1228	{
1229	/* For backwards compatibility - when not dealing with tiled maps,
1230	* more->map should always point to the parent.
1231	*/
1232	more->map = m;
1233	}
1234
1235	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1244	if (!insert_ob_in_map (more, m, originator, flag))
1236	{	1245	{
1237	if (!op->head)	1246	if (!op->head)
1238	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1247	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1239		1248
1240	return 0;	1249	return 0;
…		…
1245		1254
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1247	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1257	* need extra work
1249	*/	1258	*/
1250	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1251	x = op->x;	1260	return 0;
1252	y = op->y;	1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1253		1264
1254	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1255	*/	1266	*/
1256	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1257	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1268	for (tmp = ms.bot; tmp; tmp = tmp->above)
1258	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1259	{	1270	{
1260	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1261	tmp->destroy ();	1272	tmp->destroy ();
1262	}	1273	}
…		…
1279	op->below = originator->below;	1290	op->below = originator->below;
1280		1291
1281	if (op->below)	1292	if (op->below)
1282	op->below->above = op;	1293	op->below->above = op;
1283	else	1294	else
1284	op->ms ().bot = op;	1295	ms.bot = op;
1285		1296
1286	/* since below originator, no need to update top */	1297	/* since below originator, no need to update top */
1287	originator->below = op;	1298	originator->below = op;
1288	}	1299	}
1289	else	1300	else
1290	{	1301	{
		1302	top = ms.bot;
		1303
1291	/* If there are other objects, then */	1304	/* If there are other objects, then */
1292	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if ((!(flag & INS_MAP_LOAD)) && top)
1293	{	1306	{
1294	object *last = 0;	1307	object *last = 0;
1295		1308
1296	/*	1309	/*
1297	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
…		…
1303	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1304	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1305	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1306	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1307	*/	1320	*/
1308	while (top)	1321	for (top = ms.bot; top; top = top->above)
1309	{	1322	{
1310	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1311	floor = top;	1324	floor = top;
1312		1325
1313	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1316	top = top->below;	1329	top = top->below;
1317	break;	1330	break;
1318	}	1331	}
1319		1332
1320	last = top;	1333	last = top;
1321	top = top->above;
1322	}	1334	}
1323		1335
1324	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1325	top = last;	1337	top = last;
1326		1338
…		…
1328	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1329	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1330	*/	1342	*/
1331		1343
1332	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1333	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1334	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1335	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1336	* stacking is a bit odd.	1348	* stacking is a bit odd.
1337	*/	1349	*/
1338	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1339	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1340	{	1353	{
1341	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1342	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1343	break;	1356	break;
		1357
1344	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1345	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1346	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1347	* set top to the object below us.	1361	* set top to the object below us.
1348	*/	1362	*/
…		…
1350	top = last->below;	1364	top = last->below;
1351	}	1365	}
1352	} /* If objects on this space */	1366	} /* If objects on this space */
1353		1367
1354	if (flag & INS_MAP_LOAD)	1368	if (flag & INS_MAP_LOAD)
1355	top = GET_MAP_TOP (op->map, op->x, op->y);	1369	top = ms.top;
1356		1370
1357	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1358	top = floor;	1372	top = floor;
1359		1373
1360	/* Top is the object that our object (op) is going to get inserted above.	1374	/* Top is the object that our object (op) is going to get inserted above.
1361	*/	1375	*/
1362		1376
1363	/* First object on this space */	1377	/* First object on this space */
1364	if (!top)	1378	if (!top)
1365	{	1379	{
1366	op->above = GET_MAP_OB (op->map, op->x, op->y);	1380	op->above = ms.bot;
1367		1381
1368	if (op->above)	1382	if (op->above)
1369	op->above->below = op;	1383	op->above->below = op;
1370		1384
1371	op->below = 0;	1385	op->below = 0;
1372	op->ms ().bot = op;	1386	ms.bot = op;
1373	}	1387	}
1374	else	1388	else
1375	{ /* get inserted into the stack above top */	1389	{ /* get inserted into the stack above top */
1376	op->above = top->above;	1390	op->above = top->above;
1377		1391
…		…
1381	op->below = top;	1395	op->below = top;
1382	top->above = op;	1396	top->above = op;
1383	}	1397	}
1384		1398
1385	if (!op->above)	1399	if (!op->above)
1386	op->ms ().top = op;	1400	ms.top = op;
1387	} /* else not INS_BELOW_ORIGINATOR */	1401	} /* else not INS_BELOW_ORIGINATOR */
1388		1402
1389	if (op->type == PLAYER)	1403	if (op->type == PLAYER)
1390	{	1404	{
1391	op->contr->do_los = 1;	1405	op->contr->do_los = 1;
…		…
1397		1411
1398	/* If we have a floor, we know the player, if any, will be above	1412	/* If we have a floor, we know the player, if any, will be above
1399	* it, so save a few ticks and start from there.	1413	* it, so save a few ticks and start from there.
1400	*/	1414	*/
1401	if (!(flag & INS_MAP_LOAD))	1415	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = op->ms ().player ())	1416	if (object *pl = ms.player ())
1403	if (pl->contr->ns)	1417	if (pl->contr->ns)
1404	pl->contr->ns->floorbox_update ();	1418	pl->contr->ns->floorbox_update ();
1405		1419
1406	/* If this object glows, it may affect lighting conditions that are	1420	/* If this object glows, it may affect lighting conditions that are
1407	* visible to others on this map. But update_all_los is really	1421	* visible to others on this map. But update_all_los is really
…		…
1469	}	1483	}
1470		1484
1471	object *	1485	object *
1472	object::insert_at (object where, object originator, int flags)	1486	object::insert_at (object where, object originator, int flags)
1473	{	1487	{
1474	where->map->insert (this, where->x, where->y, originator, flags);	1488	return where->map->insert (this, where->x, where->y, originator, flags);
1475	}	1489	}
1476		1490
1477	/*	1491	/*
1478	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1492	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1479	* is returned contains nr objects, and the remaining parts contains	1493	* is returned contains nr objects, and the remaining parts contains
…		…
1519	* the amount of an object. If the amount reaches 0, the object	1533	* the amount of an object. If the amount reaches 0, the object
1520	* is subsequently removed and freed.	1534	* is subsequently removed and freed.
1521	*	1535	*
1522	* Return value: 'op' if something is left, NULL if the amount reached 0	1536	* Return value: 'op' if something is left, NULL if the amount reached 0
1523	*/	1537	*/
1524
1525	object *	1538	object *
1526	decrease_ob_nr (object *op, uint32 i)	1539	decrease_ob_nr (object *op, uint32 i)
1527	{	1540	{
1528	object *tmp;	1541	object *tmp;
1529		1542
…		…
1604		1617
1605	/*	1618	/*
1606	* add_weight(object, weight) adds the specified weight to an object,	1619	* add_weight(object, weight) adds the specified weight to an object,
1607	* and also updates how much the environment(s) is/are carrying.	1620	* and also updates how much the environment(s) is/are carrying.
1608	*/	1621	*/
1609
1610	void	1622	void
1611	add_weight (object *op, signed long weight)	1623	add_weight (object *op, signed long weight)
1612	{	1624	{
1613	while (op != NULL)	1625	while (op != NULL)
1614	{	1626	{
…		…
1646	* inside the object environment.	1658	* inside the object environment.
1647	*	1659	*
1648	* The function returns now pointer to inserted item, and return value can	1660	* The function returns now pointer to inserted item, and return value can
1649	* be != op, if items are merged. -Tero	1661	* be != op, if items are merged. -Tero
1650	*/	1662	*/
1651
1652	object *	1663	object *
1653	object::insert (object *op)	1664	object::insert (object *op)
1654	{	1665	{
1655	object tmp, otmp;	1666	object tmp, otmp;
1656		1667
…		…
1816	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1827	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1817	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1828	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1818	{	1829	{
1819		1830
1820	float	1831	float
1821	diff = tmp->move_slow_penalty * FABS (op->speed);	1832	diff = tmp->move_slow_penalty * fabs (op->speed);
1822		1833
1823	if (op->type == PLAYER)	1834	if (op->type == PLAYER)
1824	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1835	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1825	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1836	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1826	diff /= 4.0;	1837	diff /= 4.0;
…		…
2033	}	2044	}
2034		2045
2035	if (!index)	2046	if (!index)
2036	return -1;	2047	return -1;
2037		2048
2038	return altern[RANDOM () % index];	2049	return altern [rndm (index)];
2039	}	2050	}
2040		2051
2041	/*	2052	/*
2042	* find_first_free_spot(archetype, maptile, x, y) works like	2053	* find_first_free_spot(archetype, maptile, x, y) works like
2043	* find_free_spot(), but it will search max number of squares.	2054	* find_free_spot(), but it will search max number of squares.
…		…
2064	{	2075	{
2065	arr += begin;	2076	arr += begin;
2066	end -= begin;	2077	end -= begin;
2067		2078
2068	while (--end)	2079	while (--end)
2069	swap (arr [end], arr [RANDOM () % (end + 1)]);	2080	swap (arr [end], arr [rndm (end + 1)]);
2070	}	2081	}
2071		2082
2072	/* new function to make monster searching more efficient, and effective!	2083	/* new function to make monster searching more efficient, and effective!
2073	* This basically returns a randomized array (in the passed pointer) of	2084	* This basically returns a randomized array (in the passed pointer) of
2074	* the spaces to find monsters. In this way, it won't always look for	2085	* the spaces to find monsters. In this way, it won't always look for
…		…
2208		2219
2209	return 3;	2220	return 3;
2210	}	2221	}
2211		2222
2212	/*	2223	/*
2213	* absdir(int): Returns a number between 1 and 8, which represent
2214	* the "absolute" direction of a number (it actually takes care of
2215	* "overflow" in previous calculations of a direction).
2216	*/
2217
2218	int
2219	absdir (int d)
2220	{
2221	while (d < 1)
2222	d += 8;
2223
2224	while (d > 8)
2225	d -= 8;
2226
2227	return d;
2228	}
2229
2230	/*
2231	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2224	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2232	* between two directions (which are expected to be absolute (see absdir())	2225	* between two directions (which are expected to be absolute (see absdir())
2233	*/	2226	*/
2234
2235	int	2227	int
2236	dirdiff (int dir1, int dir2)	2228	dirdiff (int dir1, int dir2)
2237	{	2229	{
2238	int d;	2230	int d;
2239		2231
…		…
2405	insert_ob_in_ob (object_create_clone (item), dst);	2397	insert_ob_in_ob (object_create_clone (item), dst);
2406		2398
2407	return dst;	2399	return dst;
2408	}	2400	}
2409		2401
2410	/* GROS - Creates an object using a string representing its content. */
2411	/* Basically, we save the content of the string to a temp file, then call */
2412	/* load_object on it. I admit it is a highly inefficient way to make things, */
2413	/* but it was simple to make and allows reusing the load_object function. */
2414	/* Remember not to use load_object_str in a time-critical situation. */
2415	/* Also remember that multiparts objects are not supported for now. */
2416	object *
2417	load_object_str (const char *obstr)
2418	{
2419	object *op;
2420	char filename[MAX_BUF];
2421
2422	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2423
2424	FILE *tempfile = fopen (filename, "w");
2425
2426	if (tempfile == NULL)
2427	{
2428	LOG (llevError, "Error - Unable to access load object temp file\n");
2429	return NULL;
2430	}
2431
2432	fprintf (tempfile, obstr);
2433	fclose (tempfile);
2434
2435	op = object::create ();
2436
2437	object_thawer thawer (filename);
2438
2439	if (thawer)
2440	load_object (thawer, op, 0);
2441
2442	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2443	CLEAR_FLAG (op, FLAG_REMOVED);
2444
2445	return op;
2446	}
2447
2448	/* This returns the first object in who's inventory that	2402	/* This returns the first object in who's inventory that
2449	* has the same type and subtype match.	2403	* has the same type and subtype match.
2450	* returns NULL if no match.	2404	* returns NULL if no match.
2451	*/	2405	*/
2452	object *	2406	object *
…		…
2505	if (link->key == canonical_key)	2459	if (link->key == canonical_key)
2506	return link->value;	2460	return link->value;
2507		2461
2508	return 0;	2462	return 0;
2509	}	2463	}
2510
2511		2464
2512	/*	2465	/*
2513	* Updates the canonical_key in op to value.	2466	* Updates the canonical_key in op to value.
2514	*	2467	*
2515	* canonical_key is a shared string (value doesn't have to be).	2468	* canonical_key is a shared string (value doesn't have to be).
…		…
2655	{	2608	{
2656	char flagdesc[512];	2609	char flagdesc[512];
2657	char info2[256 * 4];	2610	char info2[256 * 4];
2658	char *p = info;	2611	char *p = info;
2659		2612
2660	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2661	count, uuid.seq,	2614	count, uuid.seq,
2662	&name,	2615	&name,
2663	title ? "\",title:" : "",	2616	title ? "\",title:\"" : "",
2664	title ? (const char *)title : "",	2617	title ? (const char *)title : "",
2665	flag_desc (flagdesc, 512), type);	2618	flag_desc (flagdesc, 512), type);
2666		2619
2667	if (env)	2620	if (env)
2668	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2674	}	2627	}
2675		2628
2676	const char *	2629	const char *
2677	object::debug_desc () const	2630	object::debug_desc () const
2678	{	2631	{
2679	static char info[256 * 4];	2632	static char info[3][256 * 4];
		2633	static int info_idx;
		2634
2680	return debug_desc (info);	2635	return debug_desc (info [++info_idx % 3]);
2681	}	2636	}
2682		2637
		2638	struct region *
		2639	object::region () const
		2640	{
		2641	return map ? map->region (x, y)
		2642	: region::default_region ();
		2643	}
		2644
		2645	const materialtype_t *
		2646	object::dominant_material () const
		2647	{
		2648	if (materialtype_t *mat = name_to_material (materialname))
		2649	return mat;
		2650
		2651	// omfg this is slow, this has to be temporary :)
		2652	shstr unknown ("unknown");
		2653
		2654	return name_to_material (unknown);
		2655	}
		2656
		2657	void
		2658	object::open_container (object *new_container)
		2659	{
		2660	if (container == new_container)
		2661	return;
		2662
		2663	if (object *old_container = container)
		2664	{
		2665	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2666	return;
		2667
		2668	#if 0
		2669	// remove the "Close old_container" object.
		2670	if (object *closer = old_container->inv)
		2671	if (closer->type == CLOSE_CON)
		2672	closer->destroy ();
		2673	#endif
		2674
		2675	old_container->flag [FLAG_APPLIED] = 0;
		2676	container = 0;
		2677
		2678	esrv_update_item (UPD_FLAGS, this, old_container);
		2679	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2680	}
		2681
		2682	if (new_container)
		2683	{
		2684	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2685	return;
		2686
		2687	// TODO: this does not seem to serve any purpose anymore?
		2688	#if 0
		2689	// insert the "Close Container" object.
		2690	if (archetype *closer = new_container->other_arch)
		2691	{
		2692	object *closer = arch_to_object (new_container->other_arch);
		2693	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2694	new_container->insert (closer);
		2695	}
		2696	#endif
		2697
		2698	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2699
		2700	new_container->flag [FLAG_APPLIED] = 1;
		2701	container = new_container;
		2702
		2703	esrv_update_item (UPD_FLAGS, this, new_container);
		2704	esrv_send_inventory (this, new_container);
		2705	}
		2706	}
		2707
		2708

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs. Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC