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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.149 by root, Mon May 14 19:56:45 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>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object active_objects; / List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
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,	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,
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	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
45	};	48	};
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,	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,
322	sum_weight (object *op)	325	sum_weight (object *op)
323	{	326	{
324	long sum;	327	long sum;
325	object *inv;	328	object *inv;
326		329
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
328	{	331	{
329	if (inv->inv)	332	if (inv->inv)
330	sum_weight (inv);	333	sum_weight (inv);
		334
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332	}	336	}
333		337
334	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	/*	359	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	361	* Some error messages.
358	* 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.
359	*/	363	*/
360
361	char *	364	char *
362	dump_object (object *op)	365	dump_object (object *op)
363	{	366	{
364	if (!op)	367	if (!op)
365	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
366		369
367	object_freezer freezer;	370	object_freezer freezer;
368	save_object (freezer, op, 1);	371	op->write (freezer);
369	return freezer.as_string ();	372	return freezer.as_string ();
370	}	373	}
371		374
372	/*	375	/*
373	* 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
…		…
390	}	393	}
391		394
392	/*	395	/*
393	* 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.
394	*/	397	*/
395
396	object *	398	object *
397	find_object (tag_t i)	399	find_object (tag_t i)
398	{	400	{
399	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
400	if (op->count == i)	402	if (op->count == i)
401	return op;	403	return op;
402		404
403	return 0;	405	return 0;
404	}	406	}
405		407
406	/*	408	/*
407	* 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.
408	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
410	*/	412	*/
411
412	object *	413	object *
413	find_object_name (const char *str)	414	find_object_name (const char *str)
414	{	415	{
415	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
416	object *op;	417	object *op;
417		418
418	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
419	if (op->name == str_)	420	if (op->name == str_)
420	break;	421	break;
421		422
422	return op;	423	return op;
423	}	424	}
…		…
449	owner = owner->owner;	450	owner = owner->owner;
450		451
451	this->owner = owner;	452	this->owner = owner;
452	}	453	}
453		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	current_weapon = ob;
		479	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		480
		481	update_stats ();
		482
		483	if (ob)
		484	{
		485	// now check wether any body locations became invalid, in which case
		486	// we cannot apply the weapon at the moment.
		487	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		488	if (slot[i].used < 0)
		489	{
		490	current_weapon = chosen_skill = 0;
		491	update_stats ();
		492
		493	new_draw_info_format (NDI_UNIQUE, 0, this,
		494	"You try to balance your applied items all at once, but the %s is too much. "
		495	"You need to unapply some items first.", &ob->name);
		496	return false;
		497	}
		498
		499	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		500	}
		501	else
		502	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		503
		504	return true;
		505	}
		506
454	/* Zero the key_values on op, decrementing the shared-string	507	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	508	* refcounts and freeing the links.
456	*/	509	*/
457	static void	510	static void
458	free_key_values (object *op)	511	free_key_values (object *op)
459	{	512	{
460	for (key_value *i = op->key_values; i != 0;)	513	for (key_value *i = op->key_values; i; )
461	{	514	{
462	key_value *next = i->next;	515	key_value *next = i->next;
463	delete i;	516	delete i;
464		517
465	i = next;	518	i = next;
466	}	519	}
467		520
468	op->key_values = 0;	521	op->key_values = 0;
469	}	522	}
470		523
471	/*	524	object &
472	* copy_to first frees everything allocated by the dst object,	525	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	{	526	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	527	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	528	bool is_removed = flag [FLAG_REMOVED];
484		529
485	(object_copy )dst = *this;	530	(object_copy )this = src;
486		531
487	if (is_freed)	532	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	533	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		534
496	/* Copy over key_values, if any. */	535	/* Copy over key_values, if any. */
497	if (key_values)	536	if (src.key_values)
498	{	537	{
499	key_value *tail = 0;	538	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	539	key_values = 0;
503		540
504	for (i = key_values; i; i = i->next)	541	for (key_value *i = src.key_values; i; i = i->next)
505	{	542	{
506	key_value *new_link = new key_value;	543	key_value *new_link = new key_value;
507		544
508	new_link->next = 0;	545	new_link->next = 0;
509	new_link->key = i->key;	546	new_link->key = i->key;
510	new_link->value = i->value;	547	new_link->value = i->value;
511		548
512	/* Try and be clever here, too. */	549	/* Try and be clever here, too. */
513	if (!dst->key_values)	550	if (!key_values)
514	{	551	{
515	dst->key_values = new_link;	552	key_values = new_link;
516	tail = new_link;	553	tail = new_link;
517	}	554	}
518	else	555	else
519	{	556	{
520	tail->next = new_link;	557	tail->next = new_link;
521	tail = new_link;	558	tail = new_link;
522	}	559	}
523	}	560	}
524	}	561	}
		562	}
		563
		564	/*
		565	* copy_to first frees everything allocated by the dst object,
		566	* and then copies the contents of itself into the second
		567	* object, allocating what needs to be allocated. Basically, any
		568	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		569	* if the first object is freed, the pointers in the new object
		570	* will point at garbage.
		571	*/
		572	void
		573	object::copy_to (object *dst)
		574	{
		575	dst = this;
		576
		577	if (speed < 0)
		578	dst->speed_left = speed_left - rndm ();
525		579
526	dst->set_speed (dst->speed);	580	dst->set_speed (dst->speed);
		581	}
		582
		583	void
		584	object::instantiate ()
		585	{
		586	if (!uuid.seq) // HACK
		587	uuid = gen_uuid ();
		588
		589	speed_left = -0.1f;
		590	/* copy the body_info to the body_used - this is only really
		591	* need for monsters, but doesn't hurt to do it for everything.
		592	* by doing so, when a monster is created, it has good starting
		593	* values for the body_used info, so when items are created
		594	* for it, they can be properly equipped.
		595	*/
		596	for (int i = NUM_BODY_LOCATIONS; i--; )
		597	slot[i].used = slot[i].info;
		598
		599	attachable::instantiate ();
527	}	600	}
528		601
529	object *	602	object *
530	object::clone ()	603	object::clone ()
531	{	604	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	662	* UP_OBJ_FACE: only the objects face has changed.
590	*/	663	*/
591	void	664	void
592	update_object (object *op, int action)	665	update_object (object *op, int action)
593	{	666	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	667	if (op == NULL)
597	{	668	{
598	/* this should never happen */	669	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	670	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	671	return;
…		…
660		731
661	if (op->more)	732	if (op->more)
662	update_object (op->more, action);	733	update_object (op->more, action);
663	}	734	}
664		735
665	object *object::first;
666
667	object::object ()	736	object::object ()
668	{	737	{
669	SET_FLAG (this, FLAG_REMOVED);	738	SET_FLAG (this, FLAG_REMOVED);
670		739
671	expmul = 1.0;	740	expmul = 1.0;
672	face = blank_face;	741	face = blank_face;
673	}	742	}
674		743
675	object::~object ()	744	object::~object ()
676	{	745	{
		746	unlink ();
		747
677	free_key_values (this);	748	free_key_values (this);
678	}	749	}
679		750
		751	static int object_count;
		752
680	void object::link ()	753	void object::link ()
681	{	754	{
682	count = ++ob_count;	755	assert (!index);//D
683	uuid = gen_uuid ();	756	uuid = gen_uuid ();
		757	count = ++object_count;
684		758
685	prev = 0;	759	refcnt_inc ();
686	next = object::first;	760	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	761	}
693		762
694	void object::unlink ()	763	void object::unlink ()
695	{	764	{
696	if (this == object::first)	765	if (!index)
697	object::first = next;	766	return;
698		767
699	/* Remove this object from the list of used objects */	768	objects.erase (this);
700	if (prev) prev->next = next;	769	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	}	770	}
712		771
713	void	772	void
714	object::activate ()	773	object::activate ()
715	{	774	{
716	/* If already on active list, don't do anything */	775	/* If already on active list, don't do anything */
717	if (active ())	776	if (active)
718	return;	777	return;
719		778
720	if (has_active_speed ())	779	if (has_active_speed ())
721	{	780	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	}	781	}
732		782
733	void	783	void
734	object::activate_recursive ()	784	object::activate_recursive ()
735	{	785	{
…		…
749	*/	799	*/
750	void	800	void
751	object::deactivate ()	801	object::deactivate ()
752	{	802	{
753	/* If not on the active list, nothing needs to be done */	803	/* If not on the active list, nothing needs to be done */
754	if (!active ())	804	if (!active)
755	return;	805	return;
756		806
757	if (active_prev == 0)	807	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	}	808	}
773		809
774	void	810	void
775	object::deactivate_recursive ()	811	object::deactivate_recursive ()
776	{	812	{
…		…
810	* drop on that space.	846	* drop on that space.
811	*/	847	*/
812	if (!drop_to_ground	848	if (!drop_to_ground
813	\|\| !map	849	\|\| !map
814	\|\| map->in_memory != MAP_IN_MEMORY	850	\|\| map->in_memory != MAP_IN_MEMORY
		851	\|\| map->nodrop
815	\|\| ms ().move_block == MOVE_ALL)	852	\|\| ms ().move_block == MOVE_ALL)
816	{	853	{
817	while (inv)	854	while (inv)
818	{	855	{
819	inv->destroy_inv (drop_to_ground);	856	inv->destroy_inv (drop_to_ground);
…		…
828		865
829	if (op->flag [FLAG_STARTEQUIP]	866	if (op->flag [FLAG_STARTEQUIP]
830	\|\| op->flag [FLAG_NO_DROP]	867	\|\| op->flag [FLAG_NO_DROP]
831	\|\| op->type == RUNE	868	\|\| op->type == RUNE
832	\|\| op->type == TRAP	869	\|\| op->type == TRAP
833	\|\| op->flag [FLAG_IS_A_TEMPLATE])	870	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		871	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
834	op->destroy ();	872	op->destroy ();
835	else	873	else
836	map->insert (op, x, y);	874	map->insert (op, x, y);
837	}	875	}
838	}	876	}
…		…
846	}	884	}
847		885
848	void	886	void
849	object::do_destroy ()	887	object::do_destroy ()
850	{	888	{
		889	attachable::do_destroy ();
		890
851	if (flag [FLAG_IS_LINKED])	891	if (flag [FLAG_IS_LINKED])
852	remove_button_link (this);	892	remove_button_link (this);
853		893
854	if (flag [FLAG_FRIENDLY])	894	if (flag [FLAG_FRIENDLY])
855	remove_friendly_object (this);	895	remove_friendly_object (this);
856		896
857	if (!flag [FLAG_REMOVED])	897	if (!flag [FLAG_REMOVED])
858	remove ();	898	remove ();
859		899
860	if (flag [FLAG_FREED])	900	destroy_inv (true);
861	return;
862		901
863	set_speed (0);	902	deactivate ();
		903	unlink ();
864		904
865	flag [FLAG_FREED] = 1;	905	flag [FLAG_FREED] = 1;
866
867	attachable::do_destroy ();
868
869	destroy_inv (true);
870	unlink ();
871		906
872	// hack to ensure that freed objects still have a valid map	907	// hack to ensure that freed objects still have a valid map
873	{	908	{
874	static maptile *freed_map; // freed objects are moved here to avoid crashes	909	static maptile *freed_map; // freed objects are moved here to avoid crashes
875		910
…		…
900		935
901	// clear those pointers that likely might have circular references to us	936	// clear those pointers that likely might have circular references to us
902	owner = 0;	937	owner = 0;
903	enemy = 0;	938	enemy = 0;
904	attacked_by = 0;	939	attacked_by = 0;
905
906	// only relevant for players(?), but make sure of it anyways
907	contr = 0;
908	}	940	}
909		941
910	void	942	void
911	object::destroy (bool destroy_inventory)	943	object::destroy (bool destroy_inventory)
912	{	944	{
…		…
940	* This function removes the object op from the linked list of objects	972	* This function removes the object op from the linked list of objects
941	* which it is currently tied to. When this function is done, the	973	* which it is currently tied to. When this function is done, the
942	* object will have no environment. If the object previously had an	974	* object will have no environment. If the object previously had an
943	* environment, the x and y coordinates will be updated to	975	* environment, the x and y coordinates will be updated to
944	* the previous environment.	976	* the previous environment.
945	* Beware: This function is called from the editor as well!
946	*/	977	*/
947	void	978	void
948	object::remove ()	979	object::do_remove ()
949	{	980	{
950	object tmp, last = 0;	981	object tmp, last = 0;
951	object *otmp;	982	object *otmp;
952		983
953	if (QUERY_FLAG (this, FLAG_REMOVED))	984	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
996	}	1027	}
997	else if (map)	1028	else if (map)
998	{	1029	{
999	if (type == PLAYER)	1030	if (type == PLAYER)
1000	{	1031	{
		1032	// leaving a spot always closes any open container on the ground
		1033	if (container && !container->env)
		1034	// this causes spurious floorbox updates, but it ensures
		1035	// that the CLOSE event is being sent.
		1036	close_container ();
		1037
1001	--map->players;	1038	--map->players;
1002	map->touch ();	1039	map->touch ();
1003	}	1040	}
1004		1041
1005	map->dirty = true;	1042	map->dirty = true;
		1043	mapspace &ms = this->ms ();
1006		1044
1007	/* link the object above us */	1045	/* link the object above us */
1008	if (above)	1046	if (above)
1009	above->below = below;	1047	above->below = below;
1010	else	1048	else
1011	map->at (x, y).top = below; /* we were top, set new top */	1049	ms.top = below; /* we were top, set new top */
1012		1050
1013	/* Relink the object below us, if there is one */	1051	/* Relink the object below us, if there is one */
1014	if (below)	1052	if (below)
1015	below->above = above;	1053	below->above = above;
1016	else	1054	else
…		…
1018	/* Nothing below, which means we need to relink map object for this space	1056	/* Nothing below, which means we need to relink map object for this space
1019	* use translated coordinates in case some oddness with map tiling is	1057	* use translated coordinates in case some oddness with map tiling is
1020	* evident	1058	* evident
1021	*/	1059	*/
1022	if (GET_MAP_OB (map, x, y) != this)	1060	if (GET_MAP_OB (map, x, y) != this)
1023	{
1024	char *dump = dump_object (this);
1025	LOG (llevError,
1026	"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);	1061	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 ());
1027	free (dump);
1028	dump = dump_object (GET_MAP_OB (map, x, y));
1029	LOG (llevError, "%s\n", dump);
1030	free (dump);
1031	}
1032		1062
1033	map->at (x, y).bot = above; /* goes on above it. */	1063	ms.bot = above; /* goes on above it. */
1034	}	1064	}
1035		1065
1036	above = 0;	1066	above = 0;
1037	below = 0;	1067	below = 0;
1038		1068
1039	if (map->in_memory == MAP_SAVING)	1069	if (map->in_memory == MAP_SAVING)
1040	return;	1070	return;
1041		1071
1042	int check_walk_off = !flag [FLAG_NO_APPLY];	1072	int check_walk_off = !flag [FLAG_NO_APPLY];
1043		1073
1044	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1074	for (tmp = ms.bot; tmp; tmp = tmp->above)
1045	{	1075	{
1046	/* No point updating the players look faces if he is the object	1076	/* No point updating the players look faces if he is the object
1047	* being removed.	1077	* being removed.
1048	*/	1078	*/
1049		1079
…		…
1129	}	1159	}
1130		1160
1131	return 0;	1161	return 0;
1132	}	1162	}
1133		1163
		1164	void
		1165	object::expand_tail ()
		1166	{
		1167	if (more)
		1168	return;
		1169
		1170	object *prev = this;
		1171
		1172	for (archetype *at = arch->more; at; at = at->more)
		1173	{
		1174	object *op = arch_to_object (at);
		1175
		1176	op->name = name;
		1177	op->name_pl = name_pl;
		1178	op->title = title;
		1179
		1180	op->head = this;
		1181	prev->more = op;
		1182
		1183	prev = op;
		1184	}
		1185	}
		1186
1134	/*	1187	/*
1135	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1188	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1136	* job preparing multi-part monsters	1189	* job preparing multi-part monsters.
1137	*/	1190	*/
1138	object *	1191	object *
1139	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1192	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1140	{	1193	{
1141	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1194	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1168	* just 'op' otherwise	1221	* just 'op' otherwise
1169	*/	1222	*/
1170	object *	1223	object *
1171	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1224	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1172	{	1225	{
		1226	assert (!op->flag [FLAG_FREED]);
		1227
1173	object tmp, top, *floor = NULL;	1228	object tmp, top, *floor = NULL;
1174	sint16 x, y;
1175		1229
1176	if (QUERY_FLAG (op, FLAG_FREED))	1230	op->remove ();
1177	{
1178	LOG (llevError, "Trying to insert freed object!\n");
1179	return NULL;
1180	}
1181		1231
1182	if (!m)	1232	#if 0
1183	{	1233	if (!m->active != !op->active)
1184	char *dump = dump_object (op);	1234	if (m->active)
1185	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1235	op->activate_recursive ();
1186	free (dump);	1236	else
1187	return op;	1237	op->deactivate_recursive ();
1188	}	1238	#endif
1189		1239
1190	if (out_of_map (m, op->x, op->y))	1240	if (out_of_map (m, op->x, op->y))
1191	{	1241	{
1192	char *dump = dump_object (op);
1193	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1242	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1194	#ifdef MANY_CORES	1243	#ifdef MANY_CORES
1195	/* Better to catch this here, as otherwise the next use of this object	1244	/* Better to catch this here, as otherwise the next use of this object
1196	* is likely to cause a crash. Better to find out where it is getting	1245	* is likely to cause a crash. Better to find out where it is getting
1197	* improperly inserted.	1246	* improperly inserted.
1198	*/	1247	*/
1199	abort ();	1248	abort ();
1200	#endif	1249	#endif
1201	free (dump);
1202	return op;	1250	return op;
1203	}	1251	}
1204		1252
1205	if (!QUERY_FLAG (op, FLAG_REMOVED))
1206	{
1207	char *dump = dump_object (op);
1208	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1209	free (dump);
1210	return op;
1211	}
1212
1213	if (op->more)
1214	{
1215	/* The part may be on a different map. */
1216
1217	object *more = op->more;	1253	if (object *more = op->more)
1218		1254	{
1219	/* We really need the caller to normalise coordinates - if
1220	* we set the map, that doesn't work if the location is within
1221	* a map and this is straddling an edge. So only if coordinate
1222	* is clear wrong do we normalise it.
1223	*/
1224	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1225	more->map = get_map_from_coord (m, &more->x, &more->y);
1226	else if (!more->map)
1227	{
1228	/* For backwards compatibility - when not dealing with tiled maps,
1229	* more->map should always point to the parent.
1230	*/
1231	more->map = m;
1232	}
1233
1234	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1255	if (!insert_ob_in_map (more, m, originator, flag))
1235	{	1256	{
1236	if (!op->head)	1257	if (!op->head)
1237	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1258	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1238		1259
1239	return 0;	1260	return 0;
…		…
1244		1265
1245	/* Ideally, the caller figures this out. However, it complicates a lot	1266	/* Ideally, the caller figures this out. However, it complicates a lot
1246	* of areas of callers (eg, anything that uses find_free_spot would now	1267	* of areas of callers (eg, anything that uses find_free_spot would now
1247	* need extra work	1268	* need extra work
1248	*/	1269	*/
1249	op->map = get_map_from_coord (m, &op->x, &op->y);	1270	if (!xy_normalise (m, op->x, op->y))
1250	x = op->x;	1271	return 0;
1251	y = op->y;	1272
		1273	op->map = m;
		1274	mapspace &ms = op->ms ();
1252		1275
1253	/* this has to be done after we translate the coordinates.	1276	/* this has to be done after we translate the coordinates.
1254	*/	1277	*/
1255	if (op->nrof && !(flag & INS_NO_MERGE))	1278	if (op->nrof && !(flag & INS_NO_MERGE))
1256	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1279	for (tmp = ms.bot; tmp; tmp = tmp->above)
1257	if (object::can_merge (op, tmp))	1280	if (object::can_merge (op, tmp))
1258	{	1281	{
1259	op->nrof += tmp->nrof;	1282	op->nrof += tmp->nrof;
1260	tmp->destroy ();	1283	tmp->destroy ();
1261	}	1284	}
…		…
1278	op->below = originator->below;	1301	op->below = originator->below;
1279		1302
1280	if (op->below)	1303	if (op->below)
1281	op->below->above = op;	1304	op->below->above = op;
1282	else	1305	else
1283	op->ms ().bot = op;	1306	ms.bot = op;
1284		1307
1285	/* since below originator, no need to update top */	1308	/* since below originator, no need to update top */
1286	originator->below = op;	1309	originator->below = op;
1287	}	1310	}
1288	else	1311	else
1289	{	1312	{
		1313	top = ms.bot;
		1314
1290	/* If there are other objects, then */	1315	/* If there are other objects, then */
1291	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1316	if ((!(flag & INS_MAP_LOAD)) && top)
1292	{	1317	{
1293	object *last = 0;	1318	object *last = 0;
1294		1319
1295	/*	1320	/*
1296	* If there are multiple objects on this space, we do some trickier handling.	1321	* If there are multiple objects on this space, we do some trickier handling.
…		…
1302	* once we get to them. This reduces the need to traverse over all of	1327	* once we get to them. This reduces the need to traverse over all of
1303	* them when adding another one - this saves quite a bit of cpu time	1328	* them when adding another one - this saves quite a bit of cpu time
1304	* when lots of spells are cast in one area. Currently, it is presumed	1329	* when lots of spells are cast in one area. Currently, it is presumed
1305	* that flying non pickable objects are spell objects.	1330	* that flying non pickable objects are spell objects.
1306	*/	1331	*/
1307	while (top)	1332	for (top = ms.bot; top; top = top->above)
1308	{	1333	{
1309	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1334	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1310	floor = top;	1335	floor = top;
1311		1336
1312	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1337	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1315	top = top->below;	1340	top = top->below;
1316	break;	1341	break;
1317	}	1342	}
1318		1343
1319	last = top;	1344	last = top;
1320	top = top->above;
1321	}	1345	}
1322		1346
1323	/* Don't want top to be NULL, so set it to the last valid object */	1347	/* Don't want top to be NULL, so set it to the last valid object */
1324	top = last;	1348	top = last;
1325		1349
…		…
1327	* looks like instead of lots of conditions here.	1351	* looks like instead of lots of conditions here.
1328	* makes things faster, and effectively the same result.	1352	* makes things faster, and effectively the same result.
1329	*/	1353	*/
1330		1354
1331	/* Have object 'fall below' other objects that block view.	1355	/* Have object 'fall below' other objects that block view.
1332	* Unless those objects are exits, type 66	1356	* Unless those objects are exits.
1333	* If INS_ON_TOP is used, don't do this processing	1357	* If INS_ON_TOP is used, don't do this processing
1334	* Need to find the object that in fact blocks view, otherwise	1358	* Need to find the object that in fact blocks view, otherwise
1335	* stacking is a bit odd.	1359	* stacking is a bit odd.
1336	*/	1360	*/
1337	if (!(flag & INS_ON_TOP) &&	1361	if (!(flag & INS_ON_TOP)
1338	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1362	&& ms.flags () & P_BLOCKSVIEW
		1363	&& (op->face && !faces [op->face].visibility))
1339	{	1364	{
1340	for (last = top; last != floor; last = last->below)	1365	for (last = top; last != floor; last = last->below)
1341	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1366	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1342	break;	1367	break;
		1368
1343	/* Check to see if we found the object that blocks view,	1369	/* Check to see if we found the object that blocks view,
1344	* and make sure we have a below pointer for it so that	1370	* and make sure we have a below pointer for it so that
1345	* we can get inserted below this one, which requires we	1371	* we can get inserted below this one, which requires we
1346	* set top to the object below us.	1372	* set top to the object below us.
1347	*/	1373	*/
…		…
1349	top = last->below;	1375	top = last->below;
1350	}	1376	}
1351	} /* If objects on this space */	1377	} /* If objects on this space */
1352		1378
1353	if (flag & INS_MAP_LOAD)	1379	if (flag & INS_MAP_LOAD)
1354	top = GET_MAP_TOP (op->map, op->x, op->y);	1380	top = ms.top;
1355		1381
1356	if (flag & INS_ABOVE_FLOOR_ONLY)	1382	if (flag & INS_ABOVE_FLOOR_ONLY)
1357	top = floor;	1383	top = floor;
1358		1384
1359	/* Top is the object that our object (op) is going to get inserted above.	1385	/* Top is the object that our object (op) is going to get inserted above.
1360	*/	1386	*/
1361		1387
1362	/* First object on this space */	1388	/* First object on this space */
1363	if (!top)	1389	if (!top)
1364	{	1390	{
1365	op->above = GET_MAP_OB (op->map, op->x, op->y);	1391	op->above = ms.bot;
1366		1392
1367	if (op->above)	1393	if (op->above)
1368	op->above->below = op;	1394	op->above->below = op;
1369		1395
1370	op->below = 0;	1396	op->below = 0;
1371	op->ms ().bot = op;	1397	ms.bot = op;
1372	}	1398	}
1373	else	1399	else
1374	{ /* get inserted into the stack above top */	1400	{ /* get inserted into the stack above top */
1375	op->above = top->above;	1401	op->above = top->above;
1376		1402
…		…
1380	op->below = top;	1406	op->below = top;
1381	top->above = op;	1407	top->above = op;
1382	}	1408	}
1383		1409
1384	if (!op->above)	1410	if (!op->above)
1385	op->ms ().top = op;	1411	ms.top = op;
1386	} /* else not INS_BELOW_ORIGINATOR */	1412	} /* else not INS_BELOW_ORIGINATOR */
1387		1413
1388	if (op->type == PLAYER)	1414	if (op->type == PLAYER)
1389	{	1415	{
1390	op->contr->do_los = 1;	1416	op->contr->do_los = 1;
…		…
1396		1422
1397	/* If we have a floor, we know the player, if any, will be above	1423	/* If we have a floor, we know the player, if any, will be above
1398	* it, so save a few ticks and start from there.	1424	* it, so save a few ticks and start from there.
1399	*/	1425	*/
1400	if (!(flag & INS_MAP_LOAD))	1426	if (!(flag & INS_MAP_LOAD))
1401	if (object *pl = op->ms ().player ())	1427	if (object *pl = ms.player ())
1402	if (pl->contr->ns)	1428	if (pl->contr->ns)
1403	pl->contr->ns->floorbox_update ();	1429	pl->contr->ns->floorbox_update ();
1404		1430
1405	/* If this object glows, it may affect lighting conditions that are	1431	/* If this object glows, it may affect lighting conditions that are
1406	* visible to others on this map. But update_all_los is really	1432	* visible to others on this map. But update_all_los is really
…		…
1468	}	1494	}
1469		1495
1470	object *	1496	object *
1471	object::insert_at (object where, object originator, int flags)	1497	object::insert_at (object where, object originator, int flags)
1472	{	1498	{
1473	where->map->insert (this, where->x, where->y, originator, flags);	1499	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1500	}
1475		1501
1476	/*	1502	/*
1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1503	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1478	* is returned contains nr objects, and the remaining parts contains	1504	* is returned contains nr objects, and the remaining parts contains
…		…
1518	* the amount of an object. If the amount reaches 0, the object	1544	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1545	* is subsequently removed and freed.
1520	*	1546	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1547	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1548	*/
1523
1524	object *	1549	object *
1525	decrease_ob_nr (object *op, uint32 i)	1550	decrease_ob_nr (object *op, uint32 i)
1526	{	1551	{
1527	object *tmp;	1552	object *tmp;
1528		1553
…		…
1603		1628
1604	/*	1629	/*
1605	* add_weight(object, weight) adds the specified weight to an object,	1630	* add_weight(object, weight) adds the specified weight to an object,
1606	* and also updates how much the environment(s) is/are carrying.	1631	* and also updates how much the environment(s) is/are carrying.
1607	*/	1632	*/
1608
1609	void	1633	void
1610	add_weight (object *op, signed long weight)	1634	add_weight (object *op, signed long weight)
1611	{	1635	{
1612	while (op != NULL)	1636	while (op != NULL)
1613	{	1637	{
…		…
1645	* inside the object environment.	1669	* inside the object environment.
1646	*	1670	*
1647	* The function returns now pointer to inserted item, and return value can	1671	* The function returns now pointer to inserted item, and return value can
1648	* be != op, if items are merged. -Tero	1672	* be != op, if items are merged. -Tero
1649	*/	1673	*/
1650
1651	object *	1674	object *
1652	object::insert (object *op)	1675	object::insert (object *op)
1653	{	1676	{
1654	object tmp, otmp;	1677	object tmp, otmp;
1655		1678
…		…
1815	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1838	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1816	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1839	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1817	{	1840	{
1818		1841
1819	float	1842	float
1820	diff = tmp->move_slow_penalty * FABS (op->speed);	1843	diff = tmp->move_slow_penalty * fabs (op->speed);
1821		1844
1822	if (op->type == PLAYER)	1845	if (op->type == PLAYER)
1823	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1846	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1824	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1847	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1825	diff /= 4.0;	1848	diff /= 4.0;
…		…
2032	}	2055	}
2033		2056
2034	if (!index)	2057	if (!index)
2035	return -1;	2058	return -1;
2036		2059
2037	return altern[RANDOM () % index];	2060	return altern [rndm (index)];
2038	}	2061	}
2039		2062
2040	/*	2063	/*
2041	* find_first_free_spot(archetype, maptile, x, y) works like	2064	* find_first_free_spot(archetype, maptile, x, y) works like
2042	* find_free_spot(), but it will search max number of squares.	2065	* find_free_spot(), but it will search max number of squares.
…		…
2063	{	2086	{
2064	arr += begin;	2087	arr += begin;
2065	end -= begin;	2088	end -= begin;
2066		2089
2067	while (--end)	2090	while (--end)
2068	swap (arr [end], arr [RANDOM () % (end + 1)]);	2091	swap (arr [end], arr [rndm (end + 1)]);
2069	}	2092	}
2070		2093
2071	/* new function to make monster searching more efficient, and effective!	2094	/* new function to make monster searching more efficient, and effective!
2072	* This basically returns a randomized array (in the passed pointer) of	2095	* This basically returns a randomized array (in the passed pointer) of
2073	* the spaces to find monsters. In this way, it won't always look for	2096	* the spaces to find monsters. In this way, it won't always look for
…		…
2207		2230
2208	return 3;	2231	return 3;
2209	}	2232	}
2210		2233
2211	/*	2234	/*
2212	* absdir(int): Returns a number between 1 and 8, which represent
2213	* the "absolute" direction of a number (it actually takes care of
2214	* "overflow" in previous calculations of a direction).
2215	*/
2216
2217	int
2218	absdir (int d)
2219	{
2220	while (d < 1)
2221	d += 8;
2222
2223	while (d > 8)
2224	d -= 8;
2225
2226	return d;
2227	}
2228
2229	/*
2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2235	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231	* between two directions (which are expected to be absolute (see absdir())	2236	* between two directions (which are expected to be absolute (see absdir())
2232	*/	2237	*/
2233
2234	int	2238	int
2235	dirdiff (int dir1, int dir2)	2239	dirdiff (int dir1, int dir2)
2236	{	2240	{
2237	int d;	2241	int d;
2238		2242
…		…
2404	insert_ob_in_ob (object_create_clone (item), dst);	2408	insert_ob_in_ob (object_create_clone (item), dst);
2405		2409
2406	return dst;	2410	return dst;
2407	}	2411	}
2408		2412
2409	/* GROS - Creates an object using a string representing its content. */
2410	/* Basically, we save the content of the string to a temp file, then call */
2411	/* load_object on it. I admit it is a highly inefficient way to make things, */
2412	/* but it was simple to make and allows reusing the load_object function. */
2413	/* Remember not to use load_object_str in a time-critical situation. */
2414	/* Also remember that multiparts objects are not supported for now. */
2415	object *
2416	load_object_str (const char *obstr)
2417	{
2418	object *op;
2419	char filename[MAX_BUF];
2420
2421	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2422
2423	FILE *tempfile = fopen (filename, "w");
2424
2425	if (tempfile == NULL)
2426	{
2427	LOG (llevError, "Error - Unable to access load object temp file\n");
2428	return NULL;
2429	}
2430
2431	fprintf (tempfile, obstr);
2432	fclose (tempfile);
2433
2434	op = object::create ();
2435
2436	object_thawer thawer (filename);
2437
2438	if (thawer)
2439	load_object (thawer, op, 0);
2440
2441	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2442	CLEAR_FLAG (op, FLAG_REMOVED);
2443
2444	return op;
2445	}
2446
2447	/* This returns the first object in who's inventory that	2413	/* This returns the first object in who's inventory that
2448	* has the same type and subtype match.	2414	* has the same type and subtype match.
2449	* returns NULL if no match.	2415	* returns NULL if no match.
2450	*/	2416	*/
2451	object *	2417	object *
…		…
2504	if (link->key == canonical_key)	2470	if (link->key == canonical_key)
2505	return link->value;	2471	return link->value;
2506		2472
2507	return 0;	2473	return 0;
2508	}	2474	}
2509
2510		2475
2511	/*	2476	/*
2512	* Updates the canonical_key in op to value.	2477	* Updates the canonical_key in op to value.
2513	*	2478	*
2514	* canonical_key is a shared string (value doesn't have to be).	2479	* canonical_key is a shared string (value doesn't have to be).
…		…
2654	{	2619	{
2655	char flagdesc[512];	2620	char flagdesc[512];
2656	char info2[256 * 4];	2621	char info2[256 * 4];
2657	char *p = info;	2622	char *p = info;
2658		2623
2659	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2624	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2660	count, uuid.seq,	2625	count, uuid.seq,
2661	&name,	2626	&name,
2662	title ? "\",title:" : "",	2627	title ? "\",title:\"" : "",
2663	title ? (const char *)title : "",	2628	title ? (const char *)title : "",
2664	flag_desc (flagdesc, 512), type);	2629	flag_desc (flagdesc, 512), type);
2665		2630
2666	if (env)	2631	if (env)
2667	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2632	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2673	}	2638	}
2674		2639
2675	const char *	2640	const char *
2676	object::debug_desc () const	2641	object::debug_desc () const
2677	{	2642	{
2678	static char info[256 * 4];	2643	static char info[3][256 * 4];
		2644	static int info_idx;
		2645
2679	return debug_desc (info);	2646	return debug_desc (info [++info_idx % 3]);
2680	}	2647	}
2681		2648
		2649	struct region *
		2650	object::region () const
		2651	{
		2652	return map ? map->region (x, y)
		2653	: region::default_region ();
		2654	}
		2655
		2656	const materialtype_t *
		2657	object::dominant_material () const
		2658	{
		2659	if (materialtype_t *mat = name_to_material (materialname))
		2660	return mat;
		2661
		2662	// omfg this is slow, this has to be temporary :)
		2663	shstr unknown ("unknown");
		2664
		2665	return name_to_material (unknown);
		2666	}
		2667
		2668	void
		2669	object::open_container (object *new_container)
		2670	{
		2671	if (container == new_container)
		2672	return;
		2673
		2674	if (object *old_container = container)
		2675	{
		2676	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2677	return;
		2678
		2679	#if 0
		2680	// remove the "Close old_container" object.
		2681	if (object *closer = old_container->inv)
		2682	if (closer->type == CLOSE_CON)
		2683	closer->destroy ();
		2684	#endif
		2685
		2686	old_container->flag [FLAG_APPLIED] = 0;
		2687	container = 0;
		2688
		2689	esrv_update_item (UPD_FLAGS, this, old_container);
		2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2691	}
		2692
		2693	if (new_container)
		2694	{
		2695	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2696	return;
		2697
		2698	// TODO: this does not seem to serve any purpose anymore?
		2699	#if 0
		2700	// insert the "Close Container" object.
		2701	if (archetype *closer = new_container->other_arch)
		2702	{
		2703	object *closer = arch_to_object (new_container->other_arch);
		2704	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2705	new_container->insert (closer);
		2706	}
		2707	#endif
		2708
		2709	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2710
		2711	new_container->flag [FLAG_APPLIED] = 1;
		2712	container = new_container;
		2713
		2714	esrv_update_item (UPD_FLAGS, this, new_container);
		2715	esrv_send_inventory (this, new_container);
		2716	}
		2717	}
		2718
		2719

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.106 by root, Wed Jan 3 20:08:04 2007 UTC vs. Revision 1.149 by root, Mon May 14 19:56:45 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.149 by root, Mon May 14 19:56:45 2007 UTC