ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 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,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
356	/*	357	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	359	* Some error messages.
359	* 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.
360	*/	361	*/
361
362	char *	362	char *
363	dump_object (object *op)	363	dump_object (object *op)
364	{	364	{
365	if (!op)	365	if (!op)
366	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
367		367
368	object_freezer freezer;	368	object_freezer freezer;
369	save_object (freezer, op, 3);	369	op->write (freezer);
370	return freezer.as_string ();	370	return freezer.as_string ();
371	}	371	}
372		372
373	/*	373	/*
374	* 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
…		…
391	}	391	}
392		392
393	/*	393	/*
394	* 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.
395	*/	395	*/
396
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
401	if (op->count == i)	400	if (op->count == i)
402	return op;	401	return op;
403		402
404	return 0;	403	return 0;
405	}	404	}
406		405
407	/*	406	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
411	*/	410	*/
412
413	object *	411	object *
414	find_object_name (const char *str)	412	find_object_name (const char *str)
415	{	413	{
416	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
417	object *op;	415	object *op;
418		416
419	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
420	if (op->name == str_)	418	if (op->name == str_)
421	break;	419	break;
422		420
423	return op;	421	return op;
424	}	422	}
…		…
456	* refcounts and freeing the links.	454	* refcounts and freeing the links.
457	*/	455	*/
458	static void	456	static void
459	free_key_values (object *op)	457	free_key_values (object *op)
460	{	458	{
461	for (key_value *i = op->key_values; i != 0;)	459	for (key_value *i = op->key_values; i; )
462	{	460	{
463	key_value *next = i->next;	461	key_value *next = i->next;
464	delete i;	462	delete i;
465		463
466	i = next;	464	i = next;
467	}	465	}
468		466
469	op->key_values = 0;	467	op->key_values = 0;
470	}	468	}
471		469
472	void object::clear ()	470	object &
		471	object::operator =(const object &src)
473	{	472	{
474	attachable_base::clear ();	473	bool is_freed = flag [FLAG_FREED];
		474	bool is_removed = flag [FLAG_REMOVED];
475		475
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*
515	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
519	* if the first object is freed, the pointers in the new object
520	* will point at garbage.
521	*/
522	void
523	object::copy_to (object *dst)
524	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528	*(object_copy *)dst = *this;	476	*(object_copy *)this = src;
529	*(object_pod *)dst = *this;
530		477
531	if (self || cb)	478	flag [FLAG_FREED] = is_freed;
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	479	flag [FLAG_REMOVED] = is_removed;
533
534	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);
536
537	if (is_removed)
538	SET_FLAG (dst, FLAG_REMOVED);
539
540	if (speed < 0)
541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542		480
543	/* Copy over key_values, if any. */	481	/* Copy over key_values, if any. */
544	if (key_values)	482	if (src.key_values)
545	{	483	{
546	key_value *tail = 0;	484	key_value *tail = 0;
547	key_value *i;
548
549	dst->key_values = 0;	485	key_values = 0;
550		486
551	for (i = key_values; i; i = i->next)	487	for (key_value *i = src.key_values; i; i = i->next)
552	{	488	{
553	key_value *new_link = new key_value;	489	key_value *new_link = new key_value;
554		490
555	new_link->next = 0;	491	new_link->next = 0;
556	new_link->key = i->key;	492	new_link->key = i->key;
557	new_link->value = i->value;	493	new_link->value = i->value;
558		494
559	/* Try and be clever here, too. */	495	/* Try and be clever here, too. */
560	if (!dst->key_values)	496	if (!key_values)
561	{	497	{
562	dst->key_values = new_link;	498	key_values = new_link;
563	tail = new_link;	499	tail = new_link;
564	}	500	}
565	else	501	else
566	{	502	{
567	tail->next = new_link;	503	tail->next = new_link;
568	tail = new_link;	504	tail = new_link;
569	}	505	}
570	}	506	}
571	}	507	}
		508	}
572		509
573	update_ob_speed (dst);	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
		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 ();
574	}	545	}
575		546
576	object *	547	object *
577	object::clone ()	548	object::clone ()
578	{	549	{
…		…
584	/*	555	/*
585	* If an object with the IS_TURNABLE() flag needs to be turned due	556	* If an object with the IS_TURNABLE() flag needs to be turned due
586	* to the closest player being on the other side, this function can	557	* to the closest player being on the other side, this function can
587	* be called to update the face variable, _and_ how it looks on the map.	558	* be called to update the face variable, _and_ how it looks on the map.
588	*/	559	*/
589
590	void	560	void
591	update_turn_face (object *op)	561	update_turn_face (object *op)
592	{	562	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	563	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	564	return;
		565
595	SET_ANIMATION (op, op->direction);	566	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	567	update_object (op, UP_OBJ_FACE);
597	}	568	}
598		569
599	/*	570	/*
600	* Updates the speed of an object. If the speed changes from 0 to another	571	* Updates the speed of an object. If the speed changes from 0 to another
601	* value, or vice versa, then add/remove the object from the active list.	572	* value, or vice versa, then add/remove the object from the active list.
602	* This function needs to be called whenever the speed of an object changes.	573	* This function needs to be called whenever the speed of an object changes.
603	*/	574	*/
604	void	575	void
605	update_ob_speed (object *op)	576	object::set_speed (float speed)
606	{	577	{
607	extern int arch_init;	578	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	579	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	580	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	581	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	582	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		583
632	/* process_events() expects us to insert the object at the beginning	584	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		585
636	if (op->active_next != NULL)	586	if (has_active_speed ())
637	op->active_next->active_prev = op;	587	activate ();
638
639	active_objects = op;
640	}
641	else	588	else
642	{	589	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}
666
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}	590	}
697		591
698	/*	592	/*
699	* update_object() updates the the map.	593	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	594	* It takes into account invisible objects (and represent squares covered
…		…
713	* UP_OBJ_FACE: only the objects face has changed.	607	* UP_OBJ_FACE: only the objects face has changed.
714	*/	608	*/
715	void	609	void
716	update_object (object *op, int action)	610	update_object (object *op, int action)
717	{	611	{
718	MoveType move_on, move_off, move_block, move_slow;
719
720	if (op == NULL)	612	if (op == NULL)
721	{	613	{
722	/* this should never happen */	614	/* this should never happen */
723	LOG (llevDebug, "update_object() called for NULL object.\n");	615	LOG (llevDebug, "update_object() called for NULL object.\n");
724	return;	616	return;
…		…
737	*/	629	*/
738	if (!op->map || op->map->in_memory == MAP_SAVING)	630	if (!op->map || op->map->in_memory == MAP_SAVING)
739	return;	631	return;
740		632
741	/* make sure the object is within map boundaries */	633	/* make sure the object is within map boundaries */
742	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	634	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743	{	635	{
744	LOG (llevError, "update_object() called for object out of map!\n");	636	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	637	#ifdef MANY_CORES
746	abort ();	638	abort ();
747	#endif	639	#endif
748	return;	640	return;
749	}	641	}
750		642
751	mapspace &m = op->map->at (op->x, op->y);	643	mapspace &m = op->ms ();
752		644
753	if (m.flags_ & P_NEED_UPDATE)	645	if (!(m.flags_ & P_UPTODATE))
754	/* nop */;	646	/* nop */;
755	else if (action == UP_OBJ_INSERT)	647	else if (action == UP_OBJ_INSERT)
756	{	648	{
757	// this is likely overkill, TODO: revisit (schmorp)	649	// this is likely overkill, TODO: revisit (schmorp)
758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	650	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
767	/* This isn't perfect, but I don't expect a lot of objects to	659	/* This isn't perfect, but I don't expect a lot of objects to
768	* to have move_allow right now.	660	* to have move_allow right now.
769	*/	661	*/
770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	662	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	663	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
772	m.flags_ = P_NEED_UPDATE;	664	m.flags_ = 0;
773	}	665	}
774	/* if the object is being removed, we can't make intelligent	666	/* if the object is being removed, we can't make intelligent
775	* decisions, because remove_ob can't really pass the object	667	* decisions, because remove_ob can't really pass the object
776	* that is being removed.	668	* that is being removed.
777	*/	669	*/
778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	670	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779	m.flags_ = P_NEED_UPDATE;	671	m.flags_ = 0;
780	else if (action == UP_OBJ_FACE)	672	else if (action == UP_OBJ_FACE)
781	/* Nothing to do for that case */ ;	673	/* Nothing to do for that case */ ;
782	else	674	else
783	LOG (llevError, "update_object called with invalid action: %d\n", action);	675	LOG (llevError, "update_object called with invalid action: %d\n", action);
784		676
785	if (op->more)	677	if (op->more)
786	update_object (op->more, action);	678	update_object (op->more, action);
787	}	679	}
788		680
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used
791	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804
805	object::object ()	681	object::object ()
806	{	682	{
807	SET_FLAG (this, FLAG_REMOVED);	683	SET_FLAG (this, FLAG_REMOVED);
808		684
809	expmul = 1.0;	685	expmul = 1.0;
810	face = blank_face;	686	face = blank_face;
811	}	687	}
812		688
813	object::~object ()	689	object::~object ()
814	{	690	{
		691	unlink ();
		692
815	free_key_values (this);	693	free_key_values (this);
816	}	694	}
817		695
		696	static int object_count;
		697
818	void object::link ()	698	void object::link ()
819	{	699	{
820	count = ++ob_count;	700	assert (!index);//D
821	uuid = gen_uuid ();	701	uuid = gen_uuid ();
		702	count = ++object_count;
822		703
823	prev = 0;	704	refcnt_inc ();
824	next = object::first;	705	objects.insert (this);
825
826	if (object::first)
827	object::first->prev = this;
828
829	object::first = this;
830	}	706	}
831		707
832	void object::unlink ()	708	void object::unlink ()
833	{	709	{
834	if (this == object::first)	710	if (!index)
835	object::first = next;	711	return;
836		712
837	/* Remove this object from the list of used objects */	713	objects.erase (this);
838	if (prev) prev->next = next;	714	refcnt_dec ();
839	if (next) next->prev = prev;	715	}
840		716
841	prev = 0;	717	void
842	next = 0;	718	object::activate ()
		719	{
		720	/* If already on active list, don't do anything */
		721	if (active)
		722	return;
		723
		724	if (has_active_speed ())
		725	actives.insert (this);
		726	}
		727
		728	void
		729	object::activate_recursive ()
		730	{
		731	activate ();
		732
		733	for (object *op = inv; op; op = op->below)
		734	op->activate_recursive ();
		735	}
		736
		737	/* This function removes object 'op' from the list of active
		738	* objects.
		739	* This should only be used for style maps or other such
		740	* reference maps where you don't want an object that isn't
		741	* in play chewing up cpu time getting processed.
		742	* The reverse of this is to call update_ob_speed, which
		743	* will do the right thing based on the speed of the object.
		744	*/
		745	void
		746	object::deactivate ()
		747	{
		748	/* If not on the active list, nothing needs to be done */
		749	if (!active)
		750	return;
		751
		752	actives.erase (this);
		753	}
		754
		755	void
		756	object::deactivate_recursive ()
		757	{
		758	for (object *op = inv; op; op = op->below)
		759	op->deactivate_recursive ();
		760
		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	}
		772	}
		773
		774	/*
		775	* Remove and free all objects in the inventory of the given object.
		776	* object.c ?
		777	*/
		778	void
		779	object::destroy_inv (bool drop_to_ground)
		780	{
		781	// need to check first, because the checks below might segfault
		782	// as we might be on an invalid mapspace and crossfire code
		783	// is too buggy to ensure that the inventory is empty.
		784	// corollary: if you create arrows etc. with stuff in tis inventory,
		785	// cf will crash below with off-map x and y
		786	if (!inv)
		787	return;
		788
		789	/* Only if the space blocks everything do we not process -
		790	* if some form of movement is allowed, let objects
		791	* drop on that space.
		792	*/
		793	if (!drop_to_ground
		794	|| !map
		795	|| map->in_memory != MAP_IN_MEMORY
		796	|| map->nodrop
		797	|| ms ().move_block == MOVE_ALL)
		798	{
		799	while (inv)
		800	{
		801	inv->destroy_inv (drop_to_ground);
		802	inv->destroy ();
		803	}
		804	}
		805	else
		806	{ /* Put objects in inventory onto this space */
		807	while (inv)
		808	{
		809	object *op = inv;
		810
		811	if (op->flag [FLAG_STARTEQUIP]
		812	|| op->flag [FLAG_NO_DROP]
		813	|| op->type == RUNE
		814	|| op->type == TRAP
		815	|| op->flag [FLAG_IS_A_TEMPLATE]
		816	|| op->flag [FLAG_DESTROY_ON_DEATH])
		817	op->destroy ();
		818	else
		819	map->insert (op, x, y);
		820	}
		821	}
843	}	822	}
844		823
845	object *object::create ()	824	object *object::create ()
846	{	825	{
847	object *op = new object;	826	object *op = new object;
848	op->link ();	827	op->link ();
849	return op;	828	return op;
850	}	829	}
851		830
852	/*	831	void
853	* free_object() frees everything allocated by an object, removes	832	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	833	{
864	if (QUERY_FLAG (this, FLAG_FREED))	834	attachable::do_destroy ();
865	return;
866		835
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	836	if (flag [FLAG_IS_LINKED])
		837	remove_button_link (this);
		838
		839	if (flag [FLAG_FRIENDLY])
		840	{
868	remove_friendly_object (this);	841	remove_friendly_object (this);
869		842
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	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	}
		849
		850	if (!flag [FLAG_REMOVED])
871	remove ();	851	remove ();
872		852
873	SET_FLAG (this, FLAG_FREED);	853	destroy_inv (true);
874		854
875	if (more)	855	deactivate ();
876	{	856	unlink ();
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880		857
881	if (inv)	858	flag [FLAG_FREED] = 1;
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		859
923	// hack to ensure that freed objects still have a valid map	860	// hack to ensure that freed objects still have a valid map
924	{	861	{
925	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
926		863
…		…
930		867
931	freed_map->name = "/internal/freed_objects_map";	868	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	869	freed_map->width = 3;
933	freed_map->height = 3;	870	freed_map->height = 3;
934		871
935	freed_map->allocate ();	872	freed_map->alloc ();
		873	freed_map->in_memory = MAP_IN_MEMORY;
936	}	874	}
937		875
938	map = freed_map;	876	map = freed_map;
939	x = 1;	877	x = 1;
940	y = 1;	878	y = 1;
941	}	879	}
942		880
		881	head = 0;
		882
		883	if (more)
		884	{
		885	more->destroy ();
		886	more = 0;
		887	}
		888
943	// clear those pointers that likely might have circular references to us	889	// clear those pointers that likely might have circular references to us
944	owner = 0;	890	owner = 0;
945	enemy = 0;	891	enemy = 0;
946	attacked_by = 0;	892	attacked_by = 0;
		893	}
947		894
948	// only relevant for players(?), but make sure of it anyways	895	void
949	contr = 0;	896	object::destroy (bool destroy_inventory)
		897	{
		898	if (destroyed ())
		899	return;
950		900
951	/* Remove object from the active list */	901	if (destroy_inventory)
952	speed = 0;	902	destroy_inv (false);
953	update_ob_speed (this);
954		903
955	unlink ();	904	attachable::destroy ();
956
957	mortals.push_back (this);
958	}	905	}
959		906
960	/*	907	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	908	* sub_weight() recursively (outwards) subtracts a number from the
962	* weight of an object (and what is carried by it's environment(s)).	909	* weight of an object (and what is carried by it's environment(s)).
…		…
978	* 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
979	* 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
980	* object will have no environment. If the object previously had an	927	* object will have no environment. If the object previously had an
981	* environment, the x and y coordinates will be updated to	928	* environment, the x and y coordinates will be updated to
982	* the previous environment.	929	* the previous environment.
983	* Beware: This function is called from the editor as well!
984	*/	930	*/
985	void	931	void
986	object::remove ()	932	object::do_remove ()
987	{	933	{
988	object *tmp, *last = 0;	934	object *tmp, *last = 0;
989	object *otmp;	935	object *otmp;
990		936
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	937	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	938	return;
995		939
996	SET_FLAG (this, FLAG_REMOVED);	940	SET_FLAG (this, FLAG_REMOVED);
		941	INVOKE_OBJECT (REMOVE, this);
997		942
998	if (more)	943	if (more)
999	more->remove ();	944	more->remove ();
1000		945
1001	/*	946	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	957	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	958	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	959	* to save cpu time.
1015	*/	960	*/
1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	961	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017	fix_player (otmp);	962	otmp->update_stats ();
1018		963
1019	if (above != NULL)	964	if (above)
1020	above->below = below;	965	above->below = below;
1021	else	966	else
1022	env->inv = below;	967	env->inv = below;
1023		968
1024	if (below != NULL)	969	if (below)
1025	below->above = above;	970	below->above = above;
1026		971
1027	/* we set up values so that it could be inserted into	972	/* we set up values so that it could be inserted into
1028	* the map, but we don't actually do that - it is up	973	* the map, but we don't actually do that - it is up
1029	* to the caller to decide what we want to do.	974	* to the caller to decide what we want to do.
…		…
1033	above = 0, below = 0;	978	above = 0, below = 0;
1034	env = 0;	979	env = 0;
1035	}	980	}
1036	else if (map)	981	else if (map)
1037	{	982	{
1038	/* Re did the following section of code - it looks like it had	983	if (type == PLAYER)
1039	* lots of logic for things we no longer care about
1040	*/	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
		991	--map->players;
		992	map->touch ();
		993	}
		994
		995	map->dirty = true;
		996	mapspace &ms = this->ms ();
1041		997
1042	/* link the object above us */	998	/* link the object above us */
1043	if (above)	999	if (above)
1044	above->below = below;	1000	above->below = below;
1045	else	1001	else
1046	map->at (x, y).top = below; /* we were top, set new top */	1002	ms.top = below; /* we were top, set new top */
1047		1003
1048	/* Relink the object below us, if there is one */	1004	/* Relink the object below us, if there is one */
1049	if (below)	1005	if (below)
1050	below->above = above;	1006	below->above = above;
1051	else	1007	else
…		…
1053	/* 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
1054	* use translated coordinates in case some oddness with map tiling is	1010	* use translated coordinates in case some oddness with map tiling is
1055	* evident	1011	* evident
1056	*/	1012	*/
1057	if (GET_MAP_OB (map, x, y) != this)	1013	if (GET_MAP_OB (map, x, y) != this)
1058	{
1059	char *dump = dump_object (this);
1060	LOG (llevError,
1061	"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 ());
1062	free (dump);
1063	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);
1065	free (dump);
1066	}
1067		1015
1068	map->at (x, y).bottom = above; /* goes on above it. */	1016	ms.bot = above; /* goes on above it. */
1069	}	1017	}
1070		1018
1071	above = 0;	1019	above = 0;
1072	below = 0;	1020	below = 0;
1073		1021
1074	if (map->in_memory == MAP_SAVING)	1022	if (map->in_memory == MAP_SAVING)
1075	return;	1023	return;
1076		1024
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1025	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		1026
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1027	for (tmp = ms.bot; tmp; tmp = tmp->above)
1080	{	1028	{
1081	/* 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
1082	* being removed.	1030	* being removed.
1083	*/	1031	*/
1084		1032
…		…
1088	* removed (most likely destroyed), update the player view	1036	* removed (most likely destroyed), update the player view
1089	* appropriately.	1037	* appropriately.
1090	*/	1038	*/
1091	if (tmp->container == this)	1039	if (tmp->container == this)
1092	{	1040	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);	1041	flag [FLAG_APPLIED] = 0;
1094	tmp->container = 0;	1042	tmp->container = 0;
1095	}	1043	}
1096		1044
		1045	if (tmp->contr->ns)
1097	tmp->contr->socket->floorbox_update ();	1046	tmp->contr->ns->floorbox_update ();
1098	}	1047	}
1099		1048
1100	/* See if player moving off should effect something */	1049	/* See if object moving off should effect something */
1101	if (check_walk_off	1050	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1051	&& ((move_type & tmp->move_off)
1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1052	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104	{	1053	{
1105	move_apply (tmp, this, 0);	1054	move_apply (tmp, this, 0);
…		…
1107	if (destroyed ())	1056	if (destroyed ())
1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1057	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1109	}	1058	}
1110		1059
1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1060	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112		1061	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1113	if (tmp->above == tmp)	1062	if (tmp->above == tmp)
1114	tmp->above = 0;	1063	tmp->above = 0;
1115		1064
1116	last = tmp;	1065	last = tmp;
1117	}	1066	}
1118		1067
1119	/* last == NULL of there are no objects on this space */	1068	/* last == NULL if there are no objects on this space */
		1069	//TODO: this makes little sense, why only update the topmost object?
1120	if (!last)	1070	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1071	map->at (x, y).flags_ = 0;
1122	else	1072	else
1123	update_object (last, UP_OBJ_REMOVE);	1073	update_object (last, UP_OBJ_REMOVE);
1124		1074
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1075	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126	update_all_los (map, x, y);	1076	update_all_los (map, x, y);
1127	}	1077	}
1128	}	1078	}
1129		1079
1130	/*	1080	/*
…		…
1139	merge_ob (object *op, object *top)	1089	merge_ob (object *op, object *top)
1140	{	1090	{
1141	if (!op->nrof)	1091	if (!op->nrof)
1142	return 0;	1092	return 0;
1143		1093
1144	if (top == NULL)	1094	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1095	for (top = op; top && top->above; top = top->above)
		1096	;
1146		1097
1147	for (; top != NULL; top = top->below)	1098	for (; top; top = top->below)
1148	{	1099	{
1149	if (top == op)	1100	if (top == op)
1150	continue;	1101	continue;
1151		1102
1152	if (object::can_merge (op, top))	1103	if (object::can_merge (op, top))
…		…
1162		1113
1163	return 0;	1114	return 0;
1164	}	1115	}
1165		1116
1166	/*	1117	/*
1167	* 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
1168	* job preparing multi-part monsters	1119	* job preparing multi-part monsters.
1169	*/	1120	*/
1170	object *	1121	object *
1171	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)
1172	{	1123	{
1173	object *tmp;
1174
1175	if (op->head)
1176	op = op->head;
1177
1178	for (tmp = op; tmp; tmp = tmp->more)	1124	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179	{	1125	{
1180	tmp->x = x + tmp->arch->clone.x;	1126	tmp->x = x + tmp->arch->clone.x;
1181	tmp->y = y + tmp->arch->clone.y;	1127	tmp->y = y + tmp->arch->clone.y;
1182	}	1128	}
1183		1129
…		…
1202	* Return value:	1148	* Return value:
1203	* new object if 'op' was merged with other object	1149	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1150	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1151	* just 'op' otherwise
1206	*/	1152	*/
1207
1208	object *	1153	object *
1209	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)
1210	{	1155	{
1211	object *tmp, *top, *floor = NULL;	1156	object *tmp, *top, *floor = NULL;
1212	sint16 x, y;
1213		1157
1214	if (QUERY_FLAG (op, FLAG_FREED))	1158	if (QUERY_FLAG (op, FLAG_FREED))
1215	{	1159	{
1216	LOG (llevError, "Trying to insert freed object!\n");	1160	LOG (llevError, "Trying to insert freed object!\n");
1217	return NULL;	1161	return NULL;
1218	}	1162	}
1219		1163
1220	if (m == NULL)	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 ();
		1168
		1169	if (!m)
1221	{	1170	{
1222	char *dump = dump_object (op);	1171	char *dump = dump_object (op);
1223	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);
1224	free (dump);	1173	free (dump);
1225	return op;	1174	return op;
…		…
1238	#endif	1187	#endif
1239	free (dump);	1188	free (dump);
1240	return op;	1189	return op;
1241	}	1190	}
1242		1191
1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1244	{
1245	char *dump = dump_object (op);
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);
1248	return op;
1249	}
1250
1251	if (op->more != NULL)
1252	{
1253	/* The part may be on a different map. */
1254
1255	object *more = op->more;	1192	if (object *more = op->more)
1256		1193	{
1257	/* We really need the caller to normalize coordinates - if
1258	* we set the map, that doesn't work if the location is within
1259	* a map and this is straddling an edge. So only if coordinate
1260	* is clear wrong do we normalize it.
1261	*/
1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263	more->map = get_map_from_coord (m, &more->x, &more->y);
1264	else if (!more->map)
1265	{
1266	/* For backwards compatibility - when not dealing with tiled maps,
1267	* more->map should always point to the parent.
1268	*/
1269	more->map = m;
1270	}
1271
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1194	if (!insert_ob_in_map (more, m, originator, flag))
1273	{	1195	{
1274	if (!op->head)	1196	if (!op->head)
1275	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");
1276		1198
1277	return NULL;	1199	return 0;
1278	}	1200	}
1279	}	1201	}
1280		1202
1281	CLEAR_FLAG (op, FLAG_REMOVED);	1203	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1204
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1205	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* 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
1285	* need extra work	1207	* need extra work
1286	*/	1208	*/
1287	op->map = get_map_from_coord (m, &op->x, &op->y);	1209	if (!xy_normalise (m, op->x, op->y))
1288	x = op->x;	1210	return 0;
1289	y = op->y;	1211
		1212	op->map = m;
		1213	mapspace &ms = op->ms ();
1290		1214
1291	/* this has to be done after we translate the coordinates.	1215	/* this has to be done after we translate the coordinates.
1292	*/	1216	*/
1293	if (op->nrof && !(flag & INS_NO_MERGE))	1217	if (op->nrof && !(flag & INS_NO_MERGE))
1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1218	for (tmp = ms.bot; tmp; tmp = tmp->above)
1295	if (object::can_merge (op, tmp))	1219	if (object::can_merge (op, tmp))
1296	{	1220	{
1297	op->nrof += tmp->nrof;	1221	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1222	tmp->destroy ();
1299	}	1223	}
…		…
1316	op->below = originator->below;	1240	op->below = originator->below;
1317		1241
1318	if (op->below)	1242	if (op->below)
1319	op->below->above = op;	1243	op->below->above = op;
1320	else	1244	else
1321	op->map->at (op->x, op->y).bottom = op;	1245	ms.bot = op;
1322		1246
1323	/* since *below* originator, no need to update top */	1247	/* since *below* originator, no need to update top */
1324	originator->below = op;	1248	originator->below = op;
1325	}	1249	}
1326	else	1250	else
1327	{	1251	{
		1252	top = ms.bot;
		1253
1328	/* If there are other objects, then */	1254	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1255	if ((!(flag & INS_MAP_LOAD)) && top)
1330	{	1256	{
1331	object *last = NULL;	1257	object *last = 0;
1332		1258
1333	/*	1259	/*
1334	* 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.
1335	* We've already dealt with merging if appropriate.	1261	* We've already dealt with merging if appropriate.
1336	* Generally, we want to put the new object on top. But if	1262	* Generally, we want to put the new object on top. But if
…		…
1340	* 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
1341	* 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
1342	* 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
1343	* that flying non pickable objects are spell objects.	1269	* that flying non pickable objects are spell objects.
1344	*/	1270	*/
1345		1271	for (top = ms.bot; top; top = top->above)
1346	while (top != NULL)
1347	{	1272	{
1348	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))
1349	floor = top;	1274	floor = top;
1350		1275
1351	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))
…		…
1354	top = top->below;	1279	top = top->below;
1355	break;	1280	break;
1356	}	1281	}
1357		1282
1358	last = top;	1283	last = top;
1359	top = top->above;
1360	}	1284	}
1361		1285
1362	/* 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 */
1363	top = last;	1287	top = last;
1364		1288
…		…
1366	* looks like instead of lots of conditions here.	1290	* looks like instead of lots of conditions here.
1367	* makes things faster, and effectively the same result.	1291	* makes things faster, and effectively the same result.
1368	*/	1292	*/
1369		1293
1370	/* Have object 'fall below' other objects that block view.	1294	/* Have object 'fall below' other objects that block view.
1371	* Unless those objects are exits, type 66	1295	* Unless those objects are exits.
1372	* If INS_ON_TOP is used, don't do this processing	1296	* If INS_ON_TOP is used, don't do this processing
1373	* Need to find the object that in fact blocks view, otherwise	1297	* Need to find the object that in fact blocks view, otherwise
1374	* stacking is a bit odd.	1298	* stacking is a bit odd.
1375	*/	1299	*/
1376	if (!(flag & INS_ON_TOP) &&	1300	if (!(flag & INS_ON_TOP)
1377	(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))
1378	{	1303	{
1379	for (last = top; last != floor; last = last->below)	1304	for (last = top; last != floor; last = last->below)
1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1305	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1381	break;	1306	break;
		1307
1382	/* Check to see if we found the object that blocks view,	1308	/* Check to see if we found the object that blocks view,
1383	* 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
1384	* we can get inserted below this one, which requires we	1310	* we can get inserted below this one, which requires we
1385	* set top to the object below us.	1311	* set top to the object below us.
1386	*/	1312	*/
…		…
1388	top = last->below;	1314	top = last->below;
1389	}	1315	}
1390	} /* If objects on this space */	1316	} /* If objects on this space */
1391		1317
1392	if (flag & INS_MAP_LOAD)	1318	if (flag & INS_MAP_LOAD)
1393	top = GET_MAP_TOP (op->map, op->x, op->y);	1319	top = ms.top;
1394		1320
1395	if (flag & INS_ABOVE_FLOOR_ONLY)	1321	if (flag & INS_ABOVE_FLOOR_ONLY)
1396	top = floor;	1322	top = floor;
1397		1323
1398	/* 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.
1399	*/	1325	*/
1400		1326
1401	/* First object on this space */	1327	/* First object on this space */
1402	if (!top)	1328	if (!top)
1403	{	1329	{
1404	op->above = GET_MAP_OB (op->map, op->x, op->y);	1330	op->above = ms.bot;
1405		1331
1406	if (op->above)	1332	if (op->above)
1407	op->above->below = op;	1333	op->above->below = op;
1408		1334
1409	op->below = NULL;	1335	op->below = 0;
1410	op->map->at (op->x, op->y).bottom = op;	1336	ms.bot = op;
1411	}	1337	}
1412	else	1338	else
1413	{ /* get inserted into the stack above top */	1339	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1340	op->above = top->above;
1415		1341
…		…
1418		1344
1419	op->below = top;	1345	op->below = top;
1420	top->above = op;	1346	top->above = op;
1421	}	1347	}
1422		1348
1423	if (op->above == NULL)	1349	if (!op->above)
1424	op->map->at (op->x, op->y).top = op;	1350	ms.top = op;
1425	} /* else not INS_BELOW_ORIGINATOR */	1351	} /* else not INS_BELOW_ORIGINATOR */
1426		1352
1427	if (op->type == PLAYER)	1353	if (op->type == PLAYER)
		1354	{
1428	op->contr->do_los = 1;	1355	op->contr->do_los = 1;
		1356	++op->map->players;
		1357	op->map->touch ();
		1358	}
		1359
		1360	op->map->dirty = true;
1429		1361
1430	/* 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
1431	* it, so save a few ticks and start from there.	1363	* it, so save a few ticks and start from there.
1432	*/	1364	*/
1433	if (!(flag & INS_MAP_LOAD))	1365	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->map->at (op->x, op->y).player ())	1366	if (object *pl = ms.player ())
		1367	if (pl->contr->ns)
1435	pl->contr->socket->floorbox_update ();	1368	pl->contr->ns->floorbox_update ();
1436		1369
1437	/* If this object glows, it may affect lighting conditions that are	1370	/* If this object glows, it may affect lighting conditions that are
1438	* 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
1439	* an inefficient way to do this, as it means los for all players	1372	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1373	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1374	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1375	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1376	* or just updating the P_UPTODATE for spaces within this area
1444	* of effect may be sufficient.	1377	* of effect may be sufficient.
1445	*/	1378	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1379	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1380	update_all_los (op->map, op->x, op->y);
1448		1381
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1382	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1383	update_object (op, UP_OBJ_INSERT);
		1384
		1385	INVOKE_OBJECT (INSERT, op);
1451		1386
1452	/* Don't know if moving this to the end will break anything. However,	1387	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1388	* we want to have floorbox_update called before calling this.
1454	*	1389	*
1455	* check_move_on() must be after this because code called from	1390	* check_move_on() must be after this because code called from
…		…
1460		1395
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1396	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1397	if (!(flag & INS_NO_WALK_ON) && !op->head)
1463	{	1398	{
1464	if (check_move_on (op, originator))	1399	if (check_move_on (op, originator))
1465	return NULL;	1400	return 0;
1466		1401
1467	/* If we are a multi part object, lets work our way through the check	1402	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1403	* walk on's.
1469	*/	1404	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1405	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1406	if (check_move_on (tmp, originator))
1472	return NULL;	1407	return 0;
1473	}	1408	}
1474		1409
1475	return op;	1410	return op;
1476	}	1411	}
1477		1412
…		…
1484	{	1419	{
1485	object *tmp, *tmp1;	1420	object *tmp, *tmp1;
1486		1421
1487	/* first search for itself and remove any old instances */	1422	/* first search for itself and remove any old instances */
1488		1423
1489	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)
1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1425	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1491	tmp->destroy ();	1426	tmp->destroy ();
1492		1427
1493	tmp1 = arch_to_object (archetype::find (arch_string));	1428	tmp1 = arch_to_object (archetype::find (arch_string));
1494		1429
1495	tmp1->x = op->x;	1430	tmp1->x = op->x;
1496	tmp1->y = op->y;	1431	tmp1->y = op->y;
1497	insert_ob_in_map (tmp1, op->map, op, 0);	1432	insert_ob_in_map (tmp1, op->map, op, 0);
		1433	}
		1434
		1435	// XXX: function not returning object*
		1436	object *
		1437	object::insert_at (object *where, object *originator, int flags)
		1438	{
		1439	where->map->insert (this, where->x, where->y, originator, flags);
1498	}	1440	}
1499		1441
1500	/*	1442	/*
1501	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1443	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1502	* is returned contains nr objects, and the remaining parts contains	1444	* is returned contains nr objects, and the remaining parts contains
1503	* the rest (or is removed and freed if that number is 0).	1445	* the rest (or is removed and freed if that number is 0).
1504	* On failure, NULL is returned, and the reason put into the	1446	* On failure, NULL is returned, and the reason put into the
1505	* global static errmsg array.	1447	* global static errmsg array.
1506	*/	1448	*/
1507
1508	object *	1449	object *
1509	get_split_ob (object *orig_ob, uint32 nr)	1450	get_split_ob (object *orig_ob, uint32 nr)
1510	{	1451	{
1511	object *newob;	1452	object *newob;
1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1453	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1548		1489
1549	object *	1490	object *
1550	decrease_ob_nr (object *op, uint32 i)	1491	decrease_ob_nr (object *op, uint32 i)
1551	{	1492	{
1552	object *tmp;	1493	object *tmp;
1553	player *pl;
1554		1494
1555	if (i == 0) /* objects with op->nrof require this check */	1495	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1496	return op;
1557		1497
1558	if (i > op->nrof)	1498	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1511	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1512	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1513	* and then searching the map for a player.
1574	*/	1514	*/
1575	if (!tmp)	1515	if (!tmp)
1576	{	1516	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1517	if (pl->ob->container == op->env)
1579	{	1518	{
1580	tmp = pl->ob;	1519	tmp = pl->ob;
1581	break;	1520	break;
1582	}	1521	}
1583	}
1584		1522
1585	if (i < op->nrof)	1523	if (i < op->nrof)
1586	{	1524	{
1587	sub_weight (op->env, op->weight * i);	1525	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1526	op->nrof -= i;
…		…
1724	add_weight (this, (op->weight + op->carrying));	1662	add_weight (this, (op->weight + op->carrying));
1725		1663
1726	otmp = this->in_player ();	1664	otmp = this->in_player ();
1727	if (otmp && otmp->contr)	1665	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1666	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1667	otmp->update_stats ();
1730		1668
1731	op->map = 0;	1669	op->map = 0;
1732	op->env = this;	1670	op->env = this;
1733	op->above = 0;	1671	op->above = 0;
1734	op->below = 0;	1672	op->below = 0;
…		…
1738	if ((op->glow_radius != 0) && map)	1676	if ((op->glow_radius != 0) && map)
1739	{	1677	{
1740	#ifdef DEBUG_LIGHTS	1678	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1679	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1680	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1681	if (map->darkness)
1744	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1745	}	1683	}
1746		1684
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1685	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1686	* It sure simplifies this function...
…		…
1753	{	1691	{
1754	op->below = inv;	1692	op->below = inv;
1755	op->below->above = op;	1693	op->below->above = op;
1756	inv = op;	1694	inv = op;
1757	}	1695	}
		1696
		1697	INVOKE_OBJECT (INSERT, this);
1758		1698
1759	return op;	1699	return op;
1760	}	1700	}
1761		1701
1762	/*	1702	/*
…		…
1777	*	1717	*
1778	* MSW 2001-07-08: Check all objects on space, not just those below	1718	* MSW 2001-07-08: Check all objects on space, not just those below
1779	* object being inserted. insert_ob_in_map may not put new objects	1719	* object being inserted. insert_ob_in_map may not put new objects
1780	* on top.	1720	* on top.
1781	*/	1721	*/
1782
1783	int	1722	int
1784	check_move_on (object *op, object *originator)	1723	check_move_on (object *op, object *originator)
1785	{	1724	{
1786	object *tmp;	1725	object *tmp;
1787	maptile *m = op->map;	1726	maptile *m = op->map;
…		…
1814		1753
1815	/* The objects have to be checked from top to bottom.	1754	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1755	* Hence, we first go to the top:
1817	*/	1756	*/
1818		1757
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1758	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820	{	1759	{
1821	/* Trim the search when we find the first other spell effect	1760	/* Trim the search when we find the first other spell effect
1822	* 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,
1823	* we don't need to check all of them.	1762	* we don't need to check all of them.
1824	*/	1763	*/
…		…
1842	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1781	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843	((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))
1844	{	1783	{
1845		1784
1846	float	1785	float
1847	diff = tmp->move_slow_penalty * FABS (op->speed);	1786	diff = tmp->move_slow_penalty * fabs (op->speed);
1848		1787
1849	if (op->type == PLAYER)	1788	if (op->type == PLAYER)
1850	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)) ||
1851	(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)))
1852	diff /= 4.0;	1791	diff /= 4.0;
…		…
1879	/*	1818	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1819	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1820	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1821	* The first matching object is returned, or NULL if none.
1883	*/	1822	*/
1884
1885	object *	1823	object *
1886	present_arch (const archetype *at, maptile *m, int x, int y)	1824	present_arch (const archetype *at, maptile *m, int x, int y)
1887	{	1825	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL || out_of_map (m, x, y))	1826	if (!m || out_of_map (m, x, y))
1892	{	1827	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1828	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1829	return NULL;
1895	}	1830	}
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1831
		1832	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897	if (tmp->arch == at)	1833	if (tmp->arch == at)
1898	return tmp;	1834	return tmp;
		1835
1899	return NULL;	1836	return NULL;
1900	}	1837	}
1901		1838
1902	/*	1839	/*
1903	* present(type, map, x, y) searches for any objects with	1840	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1841	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1842	* The first matching object is returned, or NULL if none.
1906	*/	1843	*/
1907
1908	object *	1844	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1845	present (unsigned char type, maptile *m, int x, int y)
1910	{	1846	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1847	if (out_of_map (m, x, y))
1915	{	1848	{
1916	LOG (llevError, "Present called outside map.\n");	1849	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1850	return NULL;
1918	}	1851	}
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1852
		1853	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920	if (tmp->type == type)	1854	if (tmp->type == type)
1921	return tmp;	1855	return tmp;
		1856
1922	return NULL;	1857	return NULL;
1923	}	1858	}
1924		1859
1925	/*	1860	/*
1926	* present_in_ob(type, object) searches for any objects with	1861	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1862	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
1929	*/	1864	*/
1930
1931	object *	1865	object *
1932	present_in_ob (unsigned char type, const object *op)	1866	present_in_ob (unsigned char type, const object *op)
1933	{	1867	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1868	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1869	if (tmp->type == type)
1939	return tmp;	1870	return tmp;
		1871
1940	return NULL;	1872	return NULL;
1941	}	1873	}
1942		1874
1943	/*	1875	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1876	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1884	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1885	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1886	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1887	* to be unique.
1956	*/	1888	*/
1957
1958	object *	1889	object *
1959	present_in_ob_by_name (int type, const char *str, const object *op)	1890	present_in_ob_by_name (int type, const char *str, const object *op)
1960	{	1891	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1893	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1894	return tmp;
1968	}	1895
1969	return NULL;	1896	return 0;
1970	}	1897	}
1971		1898
1972	/*	1899	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1900	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1901	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1902	* The first matching object is returned, or NULL if none.
1976	*/	1903	*/
1977
1978	object *	1904	object *
1979	present_arch_in_ob (const archetype *at, const object *op)	1905	present_arch_in_ob (const archetype *at, const object *op)
1980	{	1906	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1907	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1908	if (tmp->arch == at)
1986	return tmp;	1909	return tmp;
		1910
1987	return NULL;	1911	return NULL;
1988	}	1912	}
1989		1913
1990	/*	1914	/*
1991	* activate recursively a flag on an object inventory	1915	* activate recursively a flag on an object inventory
1992	*/	1916	*/
1993	void	1917	void
1994	flag_inv (object *op, int flag)	1918	flag_inv (object *op, int flag)
1995	{	1919	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1920	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1921	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1922	{
2002	SET_FLAG (tmp, flag);	1923	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1924	flag_inv (tmp, flag);
2004	}	1925	}
2005	} /*	1926	}
		1927
		1928	/*
2006	* desactivate recursively a flag on an object inventory	1929	* deactivate recursively a flag on an object inventory
2007	*/	1930	*/
2008	void	1931	void
2009	unflag_inv (object *op, int flag)	1932	unflag_inv (object *op, int flag)
2010	{	1933	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1934	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	1936	{
2017	CLEAR_FLAG (tmp, flag);	1937	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	1938	unflag_inv (tmp, flag);
2019	}	1939	}
2020	}	1940	}
…		…
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1943	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).	1944	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for	1945	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.	1946	* him/her-self and all object carried by a call to this function.
2027	*/	1947	*/
2028
2029	void	1948	void
2030	set_cheat (object *op)	1949	set_cheat (object *op)
2031	{	1950	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);	1951	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);	1952	flag_inv (op, FLAG_WAS_WIZ);
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	1971	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	1972	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	1973	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	1974	* customized, changed states, etc.
2056	*/	1975	*/
2057
2058	int	1976	int
2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1977	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060	{	1978	{
2061	int
2062	i,
2063	index = 0, flag;	1979	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	1980	int altern[SIZEOFFREE];
2066		1981
2067	for (i = start; i < stop; i++)	1982	for (int i = start; i < stop; i++)
2068	{	1983	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1984	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070	if (!flag)	1985	if (!flag)
2071	altern[index++] = i;	1986	altern [index++] = i;
2072		1987
2073	/* Basically, if we find a wall on a space, we cut down the search size.	1988	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	1989	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	1990	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	1991	* if the space being examined only has a wall to the north and empty
…		…
2083	}	1998	}
2084		1999
2085	if (!index)	2000	if (!index)
2086	return -1;	2001	return -1;
2087		2002
2088	return altern[RANDOM () % index];	2003	return altern [rndm (index)];
2089	}	2004	}
2090		2005
2091	/*	2006	/*
2092	* find_first_free_spot(archetype, maptile, x, y) works like	2007	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	2008	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	2009	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2010	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	2011	*/
2097
2098	int	2012	int
2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2013	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100	{	2014	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2015	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2016	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2017	return i;
2108	}	2018
2109	return -1;	2019	return -1;
2110	}	2020	}
2111		2021
2112	/*	2022	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2023	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2024	* arr[begin..end-1].
		2025	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2026	*/
2116	static void	2027	static void
2117	permute (int *arr, int begin, int end)	2028	permute (int *arr, int begin, int end)
2118	{	2029	{
2119	int	2030	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2031	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2032
2130	tmp = arr[i];	2033	while (--end)
2131	arr[i] = arr[j];	2034	swap (arr [end], arr [rndm (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2035	}
2135		2036
2136	/* new function to make monster searching more efficient, and effective!	2037	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2038	* This basically returns a randomized array (in the passed pointer) of
2138	* 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
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2042	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2043	*/
2143	void	2044	void
2144	get_search_arr (int *search_arr)	2045	get_search_arr (int *search_arr)
2145	{	2046	{
2146	int	2047	int i;
2147	i;
2148		2048
2149	for (i = 0; i < SIZEOFFREE; i++)	2049	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2050	search_arr[i] = i;
2152	}
2153		2051
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2052	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2053	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2054	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2055	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2064	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2065	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2066	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2067	* there is capable of.
2170	*/	2068	*/
2171
2172	int	2069	int
2173	find_dir (maptile *m, int x, int y, object *exclude)	2070	find_dir (maptile *m, int x, int y, object *exclude)
2174	{	2071	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2072	int i, max = SIZEOFFREE, mflags;
2178		2073
2179	sint16 nx, ny;	2074	sint16 nx, ny;
2180	object *	2075	object *tmp;
2181	tmp;
2182	maptile *	2076	maptile *mp;
2183	mp;
2184		2077
2185	MoveType blocked, move_type;	2078	MoveType blocked, move_type;
2186		2079
2187	if (exclude && exclude->head)	2080	if (exclude && exclude->head)
2188	{	2081	{
…		…
2205		2098
2206	if (mflags & P_OUT_OF_MAP)	2099	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2100	max = maxfree[i];
2208	else	2101	else
2209	{	2102	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2103	mapspace &ms = mp->at (nx, ny);
		2104
		2105	blocked = ms.move_block;
2211		2106
2212	if ((move_type & blocked) == move_type)	2107	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2108	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2109	else if (mflags & P_IS_ALIVE)
2215	{	2110	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2111	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2112	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2113	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218	break;	2114	break;
2219		2115
2220	if (tmp)	2116	if (tmp)
2221	return freedir[i];	2117	return freedir[i];
2222	}	2118	}
…		…
2228		2124
2229	/*	2125	/*
2230	* distance(object 1, object 2) will return the square of the	2126	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2127	* distance between the two given objects.
2232	*/	2128	*/
2233
2234	int	2129	int
2235	distance (const object *ob1, const object *ob2)	2130	distance (const object *ob1, const object *ob2)
2236	{	2131	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2132	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2133	}
2242		2134
2243	/*	2135	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2136	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2137	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2138	* object, needs to travel toward it.
2247	*/	2139	*/
2248
2249	int	2140	int
2250	find_dir_2 (int x, int y)	2141	find_dir_2 (int x, int y)
2251	{	2142	{
2252	int q;	2143	int q;
2253		2144
…		…
2282		2173
2283	return 3;	2174	return 3;
2284	}	2175	}
2285		2176
2286	/*	2177	/*
2287	* absdir(int): Returns a number between 1 and 8, which represent
2288	* the "absolute" direction of a number (it actually takes care of
2289	* "overflow" in previous calculations of a direction).
2290	*/
2291
2292	int
2293	absdir (int d)
2294	{
2295	while (d < 1)
2296	d += 8;
2297	while (d > 8)
2298	d -= 8;
2299	return d;
2300	}
2301
2302	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2178	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304	* between two directions (which are expected to be absolute (see absdir())	2179	* between two directions (which are expected to be absolute (see absdir())
2305	*/	2180	*/
2306
2307	int	2181	int
2308	dirdiff (int dir1, int dir2)	2182	dirdiff (int dir1, int dir2)
2309	{	2183	{
2310	int	2184	int d;
2311	d;
2312		2185
2313	d = abs (dir1 - dir2);	2186	d = abs (dir1 - dir2);
2314	if (d > 4)	2187	if (d > 4)
2315	d = 8 - d;	2188	d = 8 - d;
		2189
2316	return d;	2190	return d;
2317	}	2191	}
2318		2192
2319	/* peterm:	2193	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2194	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2197	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2198	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2199	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2200	* functions.
2327	*/	2201	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2202	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2203	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2204	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2205	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2206	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2207	{0, 0, 0}, /* 4 */
…		…
2479	insert_ob_in_ob (object_create_clone (item), dst);	2351	insert_ob_in_ob (object_create_clone (item), dst);
2480		2352
2481	return dst;	2353	return dst;
2482	}	2354	}
2483		2355
2484	/* GROS - Creates an object using a string representing its content. */
2485	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *
2492	load_object_str (const char *obstr)
2493	{
2494	object *op;
2495	char filename[MAX_BUF];
2496
2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499	FILE *tempfile = fopen (filename, "w");
2500
2501	if (tempfile == NULL)
2502	{
2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2504	return NULL;
2505	}
2506
2507	fprintf (tempfile, obstr);
2508	fclose (tempfile);
2509
2510	op = object::create ();
2511
2512	object_thawer thawer (filename);
2513
2514	if (thawer)
2515	load_object (thawer, op, 0);
2516
2517	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518	CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520	return op;
2521	}
2522
2523	/* This returns the first object in who's inventory that	2356	/* This returns the first object in who's inventory that
2524	* has the same type and subtype match.	2357	* has the same type and subtype match.
2525	* returns NULL if no match.	2358	* returns NULL if no match.
2526	*/	2359	*/
2527	object *	2360	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2361	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2362	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2363	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2364	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2365	return tmp;
2535		2366
2536	return NULL;	2367	return 0;
2537	}	2368	}
2538		2369
2539	/* If ob has a field named key, return the link from the list,	2370	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2371	* otherwise return NULL.
2541	*	2372	*
…		…
2543	* do the desired thing.	2374	* do the desired thing.
2544	*/	2375	*/
2545	key_value *	2376	key_value *
2546	get_ob_key_link (const object *ob, const char *key)	2377	get_ob_key_link (const object *ob, const char *key)
2547	{	2378	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2379	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2380	if (link->key == key)
2552	return link;	2381	return link;
2553		2382
2554	return NULL;	2383	return 0;
2555	}	2384	}
2556		2385
2557	/*	2386	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2387	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2388	*
…		…
2584	if (link->key == canonical_key)	2413	if (link->key == canonical_key)
2585	return link->value;	2414	return link->value;
2586		2415
2587	return 0;	2416	return 0;
2588	}	2417	}
2589
2590		2418
2591	/*	2419	/*
2592	* Updates the canonical_key in op to value.	2420	* Updates the canonical_key in op to value.
2593	*	2421	*
2594	* 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).
…		…
2599	* Returns TRUE on success.	2427	* Returns TRUE on success.
2600	*/	2428	*/
2601	int	2429	int
2602	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2430	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603	{	2431	{
2604	key_value *
2605	field = NULL, *last = NULL;	2432	key_value *field = NULL, *last = NULL;
2606		2433
2607	for (field = op->key_values; field != NULL; field = field->next)	2434	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2435	{
2609	if (field->key != canonical_key)	2436	if (field->key != canonical_key)
2610	{	2437	{
…		…
2638	/* IF we get here, key doesn't exist */	2465	/* IF we get here, key doesn't exist */
2639		2466
2640	/* No field, we'll have to add it. */	2467	/* No field, we'll have to add it. */
2641		2468
2642	if (!add_key)	2469	if (!add_key)
2643	{
2644	return FALSE;	2470	return FALSE;
2645	}	2471
2646	/* There isn't any good reason to store a null	2472	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2473	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2474	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2475	* be here. If user wants to store empty strings,
2650	* should pass in ""	2476	* should pass in ""
…		…
2699	}	2525	}
2700	else	2526	else
2701	item = item->env;	2527	item = item->env;
2702	}	2528	}
2703		2529
		2530
		2531	const char *
		2532	object::flag_desc (char *desc, int len) const
		2533	{
		2534	char *p = desc;
		2535	bool first = true;
		2536
		2537	*p = 0;
		2538
		2539	for (int i = 0; i < NUM_FLAGS; i++)
		2540	{
		2541	if (len <= 10) // magic constant!
		2542	{
		2543	snprintf (p, len, ",...");
		2544	break;
		2545	}
		2546
		2547	if (flag [i])
		2548	{
		2549	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2550	len -= cnt;
		2551	p += cnt;
		2552	first = false;
		2553	}
		2554	}
		2555
		2556	return desc;
		2557	}
		2558
2704	// return a suitable string describing an objetc in enough detail to find it	2559	// return a suitable string describing an object in enough detail to find it
2705	const char *	2560	const char *
2706	object::debug_desc (char *info) const	2561	object::debug_desc (char *info) const
2707	{	2562	{
		2563	char flagdesc[512];
2708	char info2[256 * 3];	2564	char info2[256 * 4];
2709	char *p = info;	2565	char *p = info;
2710		2566
2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2567	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2712	count,	2568	count, uuid.seq,
2713	&name,	2569	&name,
2714	title ? " " : "",	2570	title ? "\",title:\"" : "",
2715	title ? (const char *)title : "");	2571	title ? (const char *)title : "",
		2572	flag_desc (flagdesc, 512), type);
2716		2573
2717	if (env)	2574	if (env)
2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719		2576
2720	if (map)	2577	if (map)
2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2578	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722		2579
2723	return info;	2580	return info;
2724	}	2581	}
2725		2582
2726	const char *	2583	const char *
2727	object::debug_desc () const	2584	object::debug_desc () const
2728	{	2585	{
2729	static char info[256 * 3];	2586	static char info[256 * 4];
2730	return debug_desc (info);	2587	return debug_desc (info);
2731	}	2588	}
2732		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