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.95 by root, Wed Dec 27 05:42:08 2006 UTC vs.
Revision 1.166 by elmex, Mon Jul 16 14:49:01 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
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,
…		…
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
…		…
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:
…		…
323	sum_weight (object *op)	324	sum_weight (object *op)
324	{	325	{
325	long sum;	326	long sum;
326	object *inv;	327	object *inv;
327		328
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	330	{
330	if (inv->inv)	331	if (inv->inv)
331	sum_weight (inv);	332	sum_weight (inv);
		333
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	335	}
334		336
335	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 1);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
450	owner = owner->owner;	449	owner = owner->owner;
451		450
452	this->owner = owner;	451	this->owner = owner;
453	}	452	}
454		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		501	"[You need to unapply some items first.]", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
455	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	521	* refcounts and freeing the links.
457	*/	522	*/
458	static void	523	static void
459	free_key_values (object *op)	524	free_key_values (object *op)
460	{	525	{
461	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
462	{	527	{
463	key_value *next = i->next;	528	key_value *next = i->next;
464	delete i;	529	delete i;
465		530
466	i = next;	531	i = next;
467	}	532	}
468		533
469	op->key_values = 0;	534	op->key_values = 0;
470	}	535	}
471		536
472	/*	537	object &
473	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	539	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
485		542
486	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
487		544
488	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	546	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		547
497	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
498	if (key_values)	549	if (src.key_values)
499	{	550	{
500	key_value *tail = 0;	551	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	552	key_values = 0;
504		553
505	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
506	{	555	{
507	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
508		557
509	new_link->next = 0;	558	new_link->next = 0;
510	new_link->key = i->key;	559	new_link->key = i->key;
511	new_link->value = i->value;	560	new_link->value = i->value;
512		561
513	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
514	if (!dst->key_values)	563	if (!key_values)
515	{	564	{
516	dst->key_values = new_link;	565	key_values = new_link;
517	tail = new_link;	566	tail = new_link;
518	}	567	}
519	else	568	else
520	{	569	{
521	tail->next = new_link;	570	tail->next = new_link;
522	tail = new_link;	571	tail = new_link;
523	}	572	}
524	}	573	}
525	}	574	}
		575	}
		576
		577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
526		592
527	dst->set_speed (dst->speed);	593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
528	}	613	}
529		614
530	object *	615	object *
531	object::clone ()	616	object::clone ()
532	{	617	{
…		…
538	/*	623	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	624	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	625	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	626	* be called to update the face variable, _and_ how it looks on the map.
542	*/	627	*/
543
544	void	628	void
545	update_turn_face (object *op)	629	update_turn_face (object *op)
546	{	630	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	631	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	632	return;
		633
549	SET_ANIMATION (op, op->direction);	634	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	635	update_object (op, UP_OBJ_FACE);
551	}	636	}
552		637
553	/*	638	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	641	* This function needs to be called whenever the speed of an object changes.
557	*/	642	*/
558	void	643	void
559	object::set_speed (float speed)	644	object::set_speed (float speed)
560	{	645	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	646	if (flag [FLAG_FREED] && speed)
567	{	647	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	648	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	649	speed = 0;
570	}	650	}
571		651
572	this->speed = speed;	652	this->speed = speed;
573		653
574	if (arch_init)	654	if (has_active_speed ())
575	return;	655	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	656	else
593	{	657	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	658	}
648		659
649	/*	660	/*
650	* update_object() updates the the map.	661	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
665	*/	676	*/
666	void	677	void
667	update_object (object *op, int action)	678	update_object (object *op, int action)
668	{	679	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	680	if (op == NULL)
672	{	681	{
673	/* this should never happen */	682	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	684	return;
…		…
699	return;	708	return;
700	}	709	}
701		710
702	mapspace &m = op->ms ();	711	mapspace &m = op->ms ();
703		712
704	if (m.flags_ & P_NEED_UPDATE)	713	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	714	/* nop */;
706	else if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
707	{	716	{
708	// this is likely overkill, TODO: revisit (schmorp)	717	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	718	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	727	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	728	* to have move_allow right now.
720	*/	729	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
724	}	733	}
725	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	736	* that is being removed.
728	*/	737	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	739	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
733	else	742	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		744
736	if (op->more)	745	if (op->more)
737	update_object (op->more, action);	746	update_object (op->more, action);
738	}	747	}
739		748
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	749	object::object ()
744	{	750	{
745	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
746		752
747	expmul = 1.0;	753	expmul = 1.0;
748	face = blank_face;	754	face = blank_face;
749	}	755	}
750		756
751	object::~object ()	757	object::~object ()
752	{	758	{
		759	unlink ();
		760
753	free_key_values (this);	761	free_key_values (this);
754	}	762	}
755		763
		764	static int object_count;
		765
756	void object::link ()	766	void object::link ()
757	{	767	{
758	count = ++ob_count;	768	assert (!index);//D
759	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
760		771
761	prev = 0;	772	refcnt_inc ();
762	next = object::first;	773	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	774	}
769		775
770	void object::unlink ()	776	void object::unlink ()
771	{	777	{
772	if (this == object::first)	778	if (!index)
773	object::first = next;	779	return;
774		780
775	/* Remove this object from the list of used objects */	781	objects.erase (this);
776	if (prev) prev->next = next;	782	refcnt_dec ();
777	if (next) next->prev = prev;	783	}
778		784
779	prev = 0;	785	void
780	next = 0;	786	object::activate ()
		787	{
		788	/* If already on active list, don't do anything */
		789	if (active)
		790	return;
		791
		792	if (has_active_speed ())
		793	actives.insert (this);
		794	}
		795
		796	void
		797	object::activate_recursive ()
		798	{
		799	activate ();
		800
		801	for (object *op = inv; op; op = op->below)
		802	op->activate_recursive ();
		803	}
		804
		805	/* This function removes object 'op' from the list of active
		806	* objects.
		807	* This should only be used for style maps or other such
		808	* reference maps where you don't want an object that isn't
		809	* in play chewing up cpu time getting processed.
		810	* The reverse of this is to call update_ob_speed, which
		811	* will do the right thing based on the speed of the object.
		812	*/
		813	void
		814	object::deactivate ()
		815	{
		816	/* If not on the active list, nothing needs to be done */
		817	if (!active)
		818	return;
		819
		820	actives.erase (this);
		821	}
		822
		823	void
		824	object::deactivate_recursive ()
		825	{
		826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
		829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
		836	{
		837	op->flag [flag] = value;
		838	op->set_flag_inv (flag, value);
		839	}
781	}	840	}
782		841
783	/*	842	/*
784	* Remove and free all objects in the inventory of the given object.	843	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	844	* object.c ?
…		…
800	* drop on that space.	859	* drop on that space.
801	*/	860	*/
802	if (!drop_to_ground	861	if (!drop_to_ground
803	|| !map	862	|| !map
804	|| map->in_memory != MAP_IN_MEMORY	863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
805	|| ms ().move_block == MOVE_ALL)	865	|| ms ().move_block == MOVE_ALL)
806	{	866	{
807	while (inv)	867	while (inv)
808	{	868	{
809	inv->destroy_inv (drop_to_ground);	869	inv->destroy_inv (drop_to_ground);
…		…
818		878
819	if (op->flag [FLAG_STARTEQUIP]	879	if (op->flag [FLAG_STARTEQUIP]
820	|| op->flag [FLAG_NO_DROP]	880	|| op->flag [FLAG_NO_DROP]
821	|| op->type == RUNE	881	|| op->type == RUNE
822	|| op->type == TRAP	882	|| op->type == TRAP
823	|| op->flag [FLAG_IS_A_TEMPLATE])	883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	885	op->destroy ();
825	else	886	else
826	map->insert (op, x, y);	887	map->insert (op, x, y);
827	}	888	}
828	}	889	}
…		…
836	}	897	}
837		898
838	void	899	void
839	object::do_destroy ()	900	object::do_destroy ()
840	{	901	{
		902	attachable::do_destroy ();
		903
841	if (flag [FLAG_IS_LINKED])	904	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	905	remove_button_link (this);
843		906
844	if (flag [FLAG_FRIENDLY])	907	if (flag [FLAG_FRIENDLY])
845	remove_friendly_object (this);	908	remove_friendly_object (this);
846		909
847	if (!flag [FLAG_REMOVED])	910	if (!flag [FLAG_REMOVED])
848	remove ();	911	remove ();
849		912
850	if (flag [FLAG_FREED])	913	destroy_inv (true);
851	return;
852		914
853	set_speed (0);	915	deactivate ();
		916	unlink ();
854		917
855	flag [FLAG_FREED] = 1;	918	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		919
862	// hack to ensure that freed objects still have a valid map	920	// hack to ensure that freed objects still have a valid map
863	{	921	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	922	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		923
…		…
869		927
870	freed_map->name = "/internal/freed_objects_map";	928	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;	929	freed_map->width = 3;
872	freed_map->height = 3;	930	freed_map->height = 3;
873		931
874	freed_map->allocate ();	932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
875	}	934	}
876		935
877	map = freed_map;	936	map = freed_map;
878	x = 1;	937	x = 1;
879	y = 1;	938	y = 1;
880	}	939	}
881		940
882	head = 0;
883
884	if (more)	941	if (more)
885	{	942	{
886	more->destroy ();	943	more->destroy ();
887	more = 0;	944	more = 0;
888	}	945	}
889		946
		947	head = 0;
		948
890	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might cause circular references
891	owner = 0;	950	owner = 0;
892	enemy = 0;	951	enemy = 0;
893	attacked_by = 0;	952	attacked_by = 0;
894		953	current_weapon = 0;
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	954	}
898		955
899	void	956	void
900	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
901	{	958	{
…		…
929	* This function removes the object op from the linked list of objects	986	* This function removes the object op from the linked list of objects
930	* which it is currently tied to. When this function is done, the	987	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	988	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	989	* environment, the x and y coordinates will be updated to
933	* the previous environment.	990	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	991	*/
936	void	992	void
937	object::remove ()	993	object::do_remove ()
938	{	994	{
939	object *tmp, *last = 0;	995	object *tmp, *last = 0;
940	object *otmp;	996	object *otmp;
941		997
942	if (QUERY_FLAG (this, FLAG_REMOVED))	998	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
964	* to save cpu time.	1020	* to save cpu time.
965	*/	1021	*/
966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967	otmp->update_stats ();	1023	otmp->update_stats ();
968		1024
969	if (above != NULL)	1025	if (above)
970	above->below = below;	1026	above->below = below;
971	else	1027	else
972	env->inv = below;	1028	env->inv = below;
973		1029
974	if (below != NULL)	1030	if (below)
975	below->above = above;	1031	below->above = above;
976		1032
977	/* we set up values so that it could be inserted into	1033	/* we set up values so that it could be inserted into
978	* the map, but we don't actually do that - it is up	1034	* the map, but we don't actually do that - it is up
979	* to the caller to decide what we want to do.	1035	* to the caller to decide what we want to do.
…		…
983	above = 0, below = 0;	1039	above = 0, below = 0;
984	env = 0;	1040	env = 0;
985	}	1041	}
986	else if (map)	1042	else if (map)
987	{	1043	{
988	/* Re did the following section of code - it looks like it had	1044	if (type == PLAYER)
989	* lots of logic for things we no longer care about
990	*/	1045	{
		1046	// leaving a spot always closes any open container on the ground
		1047	if (container && !container->env)
		1048	// this causes spurious floorbox updates, but it ensures
		1049	// that the CLOSE event is being sent.
		1050	close_container ();
		1051
		1052	--map->players;
		1053	map->touch ();
		1054	}
		1055
		1056	map->dirty = true;
		1057	mapspace &ms = this->ms ();
991		1058
992	/* link the object above us */	1059	/* link the object above us */
993	if (above)	1060	if (above)
994	above->below = below;	1061	above->below = below;
995	else	1062	else
996	map->at (x, y).top = below; /* we were top, set new top */	1063	ms.top = below; /* we were top, set new top */
997		1064
998	/* Relink the object below us, if there is one */	1065	/* Relink the object below us, if there is one */
999	if (below)	1066	if (below)
1000	below->above = above;	1067	below->above = above;
1001	else	1068	else
…		…
1003	/* Nothing below, which means we need to relink map object for this space	1070	/* Nothing below, which means we need to relink map object for this space
1004	* use translated coordinates in case some oddness with map tiling is	1071	* use translated coordinates in case some oddness with map tiling is
1005	* evident	1072	* evident
1006	*/	1073	*/
1007	if (GET_MAP_OB (map, x, y) != this)	1074	if (GET_MAP_OB (map, x, y) != this)
1008	{
1009	char *dump = dump_object (this);
1010	LOG (llevError,
1011	"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);	1075	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 ());
1012	free (dump);
1013	dump = dump_object (GET_MAP_OB (map, x, y));
1014	LOG (llevError, "%s\n", dump);
1015	free (dump);
1016	}
1017		1076
1018	map->at (x, y).bot = above; /* goes on above it. */	1077	ms.bot = above; /* goes on above it. */
1019	}	1078	}
1020		1079
1021	above = 0;	1080	above = 0;
1022	below = 0;	1081	below = 0;
1023		1082
1024	if (map->in_memory == MAP_SAVING)	1083	if (map->in_memory == MAP_SAVING)
1025	return;	1084	return;
1026		1085
1027	int check_walk_off = !flag [FLAG_NO_APPLY];	1086	int check_walk_off = !flag [FLAG_NO_APPLY];
1028		1087
1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1088	for (tmp = ms.bot; tmp; tmp = tmp->above)
1030	{	1089	{
1031	/* No point updating the players look faces if he is the object	1090	/* No point updating the players look faces if he is the object
1032	* being removed.	1091	* being removed.
1033	*/	1092	*/
1034		1093
…		…
1046		1105
1047	if (tmp->contr->ns)	1106	if (tmp->contr->ns)
1048	tmp->contr->ns->floorbox_update ();	1107	tmp->contr->ns->floorbox_update ();
1049	}	1108	}
1050		1109
1051	/* See if player moving off should effect something */	1110	/* See if object moving off should effect something */
1052	if (check_walk_off	1111	if (check_walk_off
1053	&& ((move_type & tmp->move_off)	1112	&& ((move_type & tmp->move_off)
1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055	{	1114	{
1056	move_apply (tmp, this, 0);	1115	move_apply (tmp, this, 0);
1057		1116
1058	if (destroyed ())	1117	if (destroyed ())
1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1118	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060	}	1119	}
1061		1120
1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063
1064	if (tmp->above == tmp)
1065	tmp->above = 0;
1066
1067	last = tmp;	1121	last = tmp;
1068	}	1122	}
1069		1123
1070	/* last == NULL of there are no objects on this space */	1124	/* last == NULL if there are no objects on this space */
		1125	//TODO: this makes little sense, why only update the topmost object?
1071	if (!last)	1126	if (!last)
1072	map->at (x, y).flags_ = P_NEED_UPDATE;	1127	map->at (x, y).flags_ = 0;
1073	else	1128	else
1074	update_object (last, UP_OBJ_REMOVE);	1129	update_object (last, UP_OBJ_REMOVE);
1075		1130
1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1131	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077	update_all_los (map, x, y);	1132	update_all_los (map, x, y);
…		…
1113	}	1168	}
1114		1169
1115	return 0;	1170	return 0;
1116	}	1171	}
1117		1172
		1173	void
		1174	object::expand_tail ()
		1175	{
		1176	if (more)
		1177	return;
		1178
		1179	object *prev = this;
		1180
		1181	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1182	{
		1183	object *op = arch_to_object (at);
		1184
		1185	op->name = name;
		1186	op->name_pl = name_pl;
		1187	op->title = title;
		1188
		1189	op->head = this;
		1190	prev->more = op;
		1191
		1192	prev = op;
		1193	}
		1194	}
		1195
1118	/*	1196	/*
1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1197	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1120	* job preparing multi-part monsters	1198	* job preparing multi-part monsters.
1121	*/	1199	*/
1122	object *	1200	object *
1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1201	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124	{	1202	{
1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1203	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1126	{	1204	{
1127	tmp->x = x + tmp->arch->clone.x;	1205	tmp->x = x + tmp->arch->x;
1128	tmp->y = y + tmp->arch->clone.y;	1206	tmp->y = y + tmp->arch->y;
1129	}	1207	}
1130		1208
1131	return insert_ob_in_map (op, m, originator, flag);	1209	return insert_ob_in_map (op, m, originator, flag);
1132	}	1210	}
1133		1211
…		…
1152	* just 'op' otherwise	1230	* just 'op' otherwise
1153	*/	1231	*/
1154	object *	1232	object *
1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1233	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1156	{	1234	{
		1235	assert (!op->flag [FLAG_FREED]);
		1236
1157	object *tmp, *top, *floor = NULL;	1237	object *top, *floor = NULL;
1158	sint16 x, y;
1159		1238
1160	if (QUERY_FLAG (op, FLAG_FREED))	1239	op->remove ();
1161	{
1162	LOG (llevError, "Trying to insert freed object!\n");
1163	return NULL;
1164	}
1165		1240
1166	if (m == NULL)	1241	#if 0
1167	{	1242	if (!m->active != !op->active)
1168	char *dump = dump_object (op);	1243	if (m->active)
1169	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1244	op->activate_recursive ();
1170	free (dump);	1245	else
1171	return op;	1246	op->deactivate_recursive ();
1172	}	1247	#endif
1173		1248
1174	if (out_of_map (m, op->x, op->y))	1249	if (out_of_map (m, op->x, op->y))
1175	{	1250	{
1176	char *dump = dump_object (op);
1177	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1178	#ifdef MANY_CORES	1252	#ifdef MANY_CORES
1179	/* Better to catch this here, as otherwise the next use of this object	1253	/* Better to catch this here, as otherwise the next use of this object
1180	* is likely to cause a crash. Better to find out where it is getting	1254	* is likely to cause a crash. Better to find out where it is getting
1181	* improperly inserted.	1255	* improperly inserted.
1182	*/	1256	*/
1183	abort ();	1257	abort ();
1184	#endif	1258	#endif
1185	free (dump);
1186	return op;	1259	return op;
1187	}	1260	}
1188		1261
1189	if (!QUERY_FLAG (op, FLAG_REMOVED))	1262	if (object *more = op->more)
1190	{	1263	if (!insert_ob_in_map (more, m, originator, flag))
1191	char *dump = dump_object (op);
1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1193	free (dump);
1194	return op;	1264	return 0;
1195	}
1196
1197	if (op->more)
1198	{
1199	/* The part may be on a different map. */
1200
1201	object *more = op->more;
1202
1203	/* We really need the caller to normalize coordinates - if
1204	* we set the map, that doesn't work if the location is within
1205	* a map and this is straddling an edge. So only if coordinate
1206	* is clear wrong do we normalize it.
1207	*/
1208	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1209	more->map = get_map_from_coord (m, &more->x, &more->y);
1210	else if (!more->map)
1211	{
1212	/* For backwards compatibility - when not dealing with tiled maps,
1213	* more->map should always point to the parent.
1214	*/
1215	more->map = m;
1216	}
1217
1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1219	{
1220	if (!op->head)
1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1222
1223	return 0;
1224	}
1225	}
1226		1265
1227	CLEAR_FLAG (op, FLAG_REMOVED);	1266	CLEAR_FLAG (op, FLAG_REMOVED);
1228		1267
1229	/* Ideally, the caller figures this out. However, it complicates a lot	1268	/* Ideally, the caller figures this out. However, it complicates a lot
1230	* of areas of callers (eg, anything that uses find_free_spot would now	1269	* of areas of callers (eg, anything that uses find_free_spot would now
1231	* need extra work	1270	* need extra work
1232	*/	1271	*/
1233	op->map = get_map_from_coord (m, &op->x, &op->y);	1272	if (!xy_normalise (m, op->x, op->y))
1234	x = op->x;	1273	return 0;
1235	y = op->y;	1274
		1275	op->map = m;
		1276	mapspace &ms = op->ms ();
1236		1277
1237	/* this has to be done after we translate the coordinates.	1278	/* this has to be done after we translate the coordinates.
1238	*/	1279	*/
1239	if (op->nrof && !(flag & INS_NO_MERGE))	1280	if (op->nrof && !(flag & INS_NO_MERGE))
1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1281	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1241	if (object::can_merge (op, tmp))	1282	if (object::can_merge (op, tmp))
1242	{	1283	{
1243	op->nrof += tmp->nrof;	1284	op->nrof += tmp->nrof;
1244	tmp->destroy ();	1285	tmp->destroy ();
1245	}	1286	}
…		…
1262	op->below = originator->below;	1303	op->below = originator->below;
1263		1304
1264	if (op->below)	1305	if (op->below)
1265	op->below->above = op;	1306	op->below->above = op;
1266	else	1307	else
1267	op->ms ().bot = op;	1308	ms.bot = op;
1268		1309
1269	/* since *below* originator, no need to update top */	1310	/* since *below* originator, no need to update top */
1270	originator->below = op;	1311	originator->below = op;
1271	}	1312	}
1272	else	1313	else
1273	{	1314	{
		1315	top = ms.bot;
		1316
1274	/* If there are other objects, then */	1317	/* If there are other objects, then */
1275	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1318	if ((!(flag & INS_MAP_LOAD)) && top)
1276	{	1319	{
1277	object *last = NULL;	1320	object *last = 0;
1278		1321
1279	/*	1322	/*
1280	* If there are multiple objects on this space, we do some trickier handling.	1323	* If there are multiple objects on this space, we do some trickier handling.
1281	* We've already dealt with merging if appropriate.	1324	* We've already dealt with merging if appropriate.
1282	* Generally, we want to put the new object on top. But if	1325	* Generally, we want to put the new object on top. But if
…		…
1286	* once we get to them. This reduces the need to traverse over all of	1329	* once we get to them. This reduces the need to traverse over all of
1287	* them when adding another one - this saves quite a bit of cpu time	1330	* them when adding another one - this saves quite a bit of cpu time
1288	* when lots of spells are cast in one area. Currently, it is presumed	1331	* when lots of spells are cast in one area. Currently, it is presumed
1289	* that flying non pickable objects are spell objects.	1332	* that flying non pickable objects are spell objects.
1290	*/	1333	*/
1291		1334	for (top = ms.bot; top; top = top->above)
1292	while (top != NULL)
1293	{	1335	{
1294	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1336	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1295	floor = top;	1337	floor = top;
1296		1338
1297	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1339	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1300	top = top->below;	1342	top = top->below;
1301	break;	1343	break;
1302	}	1344	}
1303		1345
1304	last = top;	1346	last = top;
1305	top = top->above;
1306	}	1347	}
1307		1348
1308	/* Don't want top to be NULL, so set it to the last valid object */	1349	/* Don't want top to be NULL, so set it to the last valid object */
1309	top = last;	1350	top = last;
1310		1351
…		…
1312	* looks like instead of lots of conditions here.	1353	* looks like instead of lots of conditions here.
1313	* makes things faster, and effectively the same result.	1354	* makes things faster, and effectively the same result.
1314	*/	1355	*/
1315		1356
1316	/* Have object 'fall below' other objects that block view.	1357	/* Have object 'fall below' other objects that block view.
1317	* Unless those objects are exits, type 66	1358	* Unless those objects are exits.
1318	* If INS_ON_TOP is used, don't do this processing	1359	* If INS_ON_TOP is used, don't do this processing
1319	* Need to find the object that in fact blocks view, otherwise	1360	* Need to find the object that in fact blocks view, otherwise
1320	* stacking is a bit odd.	1361	* stacking is a bit odd.
1321	*/	1362	*/
1322	if (!(flag & INS_ON_TOP) &&	1363	if (!(flag & INS_ON_TOP)
1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1364	&& ms.flags () & P_BLOCKSVIEW
		1365	&& (op->face && !faces [op->face].visibility))
1324	{	1366	{
1325	for (last = top; last != floor; last = last->below)	1367	for (last = top; last != floor; last = last->below)
1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1368	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1327	break;	1369	break;
		1370
1328	/* Check to see if we found the object that blocks view,	1371	/* Check to see if we found the object that blocks view,
1329	* and make sure we have a below pointer for it so that	1372	* and make sure we have a below pointer for it so that
1330	* we can get inserted below this one, which requires we	1373	* we can get inserted below this one, which requires we
1331	* set top to the object below us.	1374	* set top to the object below us.
1332	*/	1375	*/
1333	if (last && last->below && last != floor)	1376	if (last && last->below && last != floor)
1334	top = last->below;	1377	top = last->below;
1335	}	1378	}
1336	} /* If objects on this space */	1379	} /* If objects on this space */
1337
1338	if (flag & INS_MAP_LOAD)	1380	if (flag & INS_MAP_LOAD)
1339	top = GET_MAP_TOP (op->map, op->x, op->y);	1381	top = ms.top;
1340		1382
1341	if (flag & INS_ABOVE_FLOOR_ONLY)	1383	if (flag & INS_ABOVE_FLOOR_ONLY)
1342	top = floor;	1384	top = floor;
1343		1385
1344	/* Top is the object that our object (op) is going to get inserted above.	1386	/* Top is the object that our object (op) is going to get inserted above.
1345	*/	1387	*/
1346		1388
1347	/* First object on this space */	1389	/* First object on this space */
1348	if (!top)	1390	if (!top)
1349	{	1391	{
1350	op->above = GET_MAP_OB (op->map, op->x, op->y);	1392	op->above = ms.bot;
1351		1393
1352	if (op->above)	1394	if (op->above)
1353	op->above->below = op;	1395	op->above->below = op;
1354		1396
1355	op->below = NULL;	1397	op->below = 0;
1356	op->ms ().bot = op;	1398	ms.bot = op;
1357	}	1399	}
1358	else	1400	else
1359	{ /* get inserted into the stack above top */	1401	{ /* get inserted into the stack above top */
1360	op->above = top->above;	1402	op->above = top->above;
1361		1403
…		…
1364		1406
1365	op->below = top;	1407	op->below = top;
1366	top->above = op;	1408	top->above = op;
1367	}	1409	}
1368		1410
1369	if (op->above == NULL)	1411	if (!op->above)
1370	op->ms ().top = op;	1412	ms.top = op;
1371	} /* else not INS_BELOW_ORIGINATOR */	1413	} /* else not INS_BELOW_ORIGINATOR */
1372		1414
1373	if (op->type == PLAYER)	1415	if (op->type == PLAYER)
		1416	{
1374	op->contr->do_los = 1;	1417	op->contr->do_los = 1;
		1418	++op->map->players;
		1419	op->map->touch ();
		1420	}
		1421
		1422	op->map->dirty = true;
1375		1423
1376	/* If we have a floor, we know the player, if any, will be above	1424	/* If we have a floor, we know the player, if any, will be above
1377	* it, so save a few ticks and start from there.	1425	* it, so save a few ticks and start from there.
1378	*/	1426	*/
1379	if (!(flag & INS_MAP_LOAD))	1427	if (!(flag & INS_MAP_LOAD))
1380	if (object *pl = op->ms ().player ())	1428	if (object *pl = ms.player ())
1381	if (pl->contr->ns)	1429	if (pl->contr->ns)
1382	pl->contr->ns->floorbox_update ();	1430	pl->contr->ns->floorbox_update ();
1383		1431
1384	/* If this object glows, it may affect lighting conditions that are	1432	/* If this object glows, it may affect lighting conditions that are
1385	* visible to others on this map. But update_all_los is really	1433	* visible to others on this map. But update_all_los is really
1386	* an inefficient way to do this, as it means los for all players	1434	* an inefficient way to do this, as it means los for all players
1387	* on the map will get recalculated. The players could very well	1435	* on the map will get recalculated. The players could very well
1388	* be far away from this change and not affected in any way -	1436	* be far away from this change and not affected in any way -
1389	* this should get redone to only look for players within range,	1437	* this should get redone to only look for players within range,
1390	* or just updating the P_NEED_UPDATE for spaces within this area	1438	* or just updating the P_UPTODATE for spaces within this area
1391	* of effect may be sufficient.	1439	* of effect may be sufficient.
1392	*/	1440	*/
1393	if (op->map->darkness && (op->glow_radius != 0))	1441	if (op->map->darkness && (op->glow_radius != 0))
1394	update_all_los (op->map, op->x, op->y);	1442	update_all_los (op->map, op->x, op->y);
1395		1443
…		…
1406	* blocked() and wall() work properly), and these flags are updated by	1454	* blocked() and wall() work properly), and these flags are updated by
1407	* update_object().	1455	* update_object().
1408	*/	1456	*/
1409		1457
1410	/* if this is not the head or flag has been passed, don't check walk on status */	1458	/* if this is not the head or flag has been passed, don't check walk on status */
1411	if (!(flag & INS_NO_WALK_ON) && !op->head)	1459	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1412	{	1460	{
1413	if (check_move_on (op, originator))	1461	if (check_move_on (op, originator))
1414	return 0;	1462	return 0;
1415		1463
1416	/* If we are a multi part object, lets work our way through the check	1464	/* If we are a multi part object, lets work our way through the check
1417	* walk on's.	1465	* walk on's.
1418	*/	1466	*/
1419	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1467	for (object *tmp = op->more; tmp; tmp = tmp->more)
1420	if (check_move_on (tmp, originator))	1468	if (check_move_on (tmp, originator))
1421	return 0;	1469	return 0;
1422	}	1470	}
1423		1471
1424	return op;	1472	return op;
…		…
1433	{	1481	{
1434	object *tmp, *tmp1;	1482	object *tmp, *tmp1;
1435		1483
1436	/* first search for itself and remove any old instances */	1484	/* first search for itself and remove any old instances */
1437		1485
1438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1487	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1440	tmp->destroy ();	1488	tmp->destroy ();
1441		1489
1442	tmp1 = arch_to_object (archetype::find (arch_string));	1490	tmp1 = arch_to_object (archetype::find (arch_string));
1443		1491
1444	tmp1->x = op->x;	1492	tmp1->x = op->x;
…		…
1447	}	1495	}
1448		1496
1449	object *	1497	object *
1450	object::insert_at (object *where, object *originator, int flags)	1498	object::insert_at (object *where, object *originator, int flags)
1451	{	1499	{
1452	where->map->insert (this, where->x, where->y, originator, flags);	1500	return where->map->insert (this, where->x, where->y, originator, flags);
1453	}	1501	}
1454		1502
1455	/*	1503	/*
1456	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1504	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1457	* is returned contains nr objects, and the remaining parts contains	1505	* is returned contains nr objects, and the remaining parts contains
…		…
1497	* the amount of an object. If the amount reaches 0, the object	1545	* the amount of an object. If the amount reaches 0, the object
1498	* is subsequently removed and freed.	1546	* is subsequently removed and freed.
1499	*	1547	*
1500	* Return value: 'op' if something is left, NULL if the amount reached 0	1548	* Return value: 'op' if something is left, NULL if the amount reached 0
1501	*/	1549	*/
1502
1503	object *	1550	object *
1504	decrease_ob_nr (object *op, uint32 i)	1551	decrease_ob_nr (object *op, uint32 i)
1505	{	1552	{
1506	object *tmp;	1553	object *tmp;
1507		1554
…		…
1582		1629
1583	/*	1630	/*
1584	* add_weight(object, weight) adds the specified weight to an object,	1631	* add_weight(object, weight) adds the specified weight to an object,
1585	* and also updates how much the environment(s) is/are carrying.	1632	* and also updates how much the environment(s) is/are carrying.
1586	*/	1633	*/
1587
1588	void	1634	void
1589	add_weight (object *op, signed long weight)	1635	add_weight (object *op, signed long weight)
1590	{	1636	{
1591	while (op != NULL)	1637	while (op != NULL)
1592	{	1638	{
…		…
1607	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1653	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1608	free (dump);	1654	free (dump);
1609	return op;	1655	return op;
1610	}	1656	}
1611		1657
1612	if (where->head)	1658	if (where->head_ () != where)
1613	{	1659	{
1614	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1660	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1615	where = where->head;	1661	where = where->head;
1616	}	1662	}
1617		1663
1618	return where->insert (op);	1664	return where->insert (op);
1619	}	1665	}
…		…
1624	* inside the object environment.	1670	* inside the object environment.
1625	*	1671	*
1626	* The function returns now pointer to inserted item, and return value can	1672	* The function returns now pointer to inserted item, and return value can
1627	* be != op, if items are merged. -Tero	1673	* be != op, if items are merged. -Tero
1628	*/	1674	*/
1629
1630	object *	1675	object *
1631	object::insert (object *op)	1676	object::insert (object *op)
1632	{	1677	{
1633	object *tmp, *otmp;	1678	object *tmp, *otmp;
1634		1679
…		…
1766		1811
1767	/* The objects have to be checked from top to bottom.	1812	/* The objects have to be checked from top to bottom.
1768	* Hence, we first go to the top:	1813	* Hence, we first go to the top:
1769	*/	1814	*/
1770		1815
1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1816	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1772	{	1817	{
1773	/* Trim the search when we find the first other spell effect	1818	/* Trim the search when we find the first other spell effect
1774	* this helps performance so that if a space has 50 spell objects,	1819	* this helps performance so that if a space has 50 spell objects,
1775	* we don't need to check all of them.	1820	* we don't need to check all of them.
1776	*/	1821	*/
…		…
1794	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1839	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1795	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1840	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1796	{	1841	{
1797		1842
1798	float	1843	float
1799	diff = tmp->move_slow_penalty * FABS (op->speed);	1844	diff = tmp->move_slow_penalty * fabs (op->speed);
1800		1845
1801	if (op->type == PLAYER)	1846	if (op->type == PLAYER)
1802	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1847	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1803	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1848	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1804	diff /= 4.0;	1849	diff /= 4.0;
…		…
1834	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
1835	*/	1880	*/
1836	object *	1881	object *
1837	present_arch (const archetype *at, maptile *m, int x, int y)	1882	present_arch (const archetype *at, maptile *m, int x, int y)
1838	{	1883	{
1839	if (m == NULL || out_of_map (m, x, y))	1884	if (!m || out_of_map (m, x, y))
1840	{	1885	{
1841	LOG (llevError, "Present_arch called outside map.\n");	1886	LOG (llevError, "Present_arch called outside map.\n");
1842	return NULL;	1887	return NULL;
1843	}	1888	}
1844		1889
1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1890	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1846	if (tmp->arch == at)	1891	if (tmp->arch == at)
1847	return tmp;	1892	return tmp;
1848		1893
1849	return NULL;	1894	return NULL;
1850	}	1895	}
…		…
1861	{	1906	{
1862	LOG (llevError, "Present called outside map.\n");	1907	LOG (llevError, "Present called outside map.\n");
1863	return NULL;	1908	return NULL;
1864	}	1909	}
1865		1910
1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1911	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1867	if (tmp->type == type)	1912	if (tmp->type == type)
1868	return tmp;	1913	return tmp;
1869		1914
1870	return NULL;	1915	return NULL;
1871	}	1916	}
…		…
1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1993	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1949	{	1994	{
1950	CLEAR_FLAG (tmp, flag);	1995	CLEAR_FLAG (tmp, flag);
1951	unflag_inv (tmp, flag);	1996	unflag_inv (tmp, flag);
1952	}	1997	}
1953	}
1954
1955	/*
1956	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1957	* all it's inventory (recursively).
1958	* If checksums are used, a player will get set_cheat called for
1959	* him/her-self and all object carried by a call to this function.
1960	*/
1961	void
1962	set_cheat (object *op)
1963	{
1964	SET_FLAG (op, FLAG_WAS_WIZ);
1965	flag_inv (op, FLAG_WAS_WIZ);
1966	}	1998	}
1967		1999
1968	/*	2000	/*
1969	* find_free_spot(object, map, x, y, start, stop) will search for	2001	* find_free_spot(object, map, x, y, start, stop) will search for
1970	* a spot at the given map and coordinates which will be able to contain	2002	* a spot at the given map and coordinates which will be able to contain
…		…
2011	}	2043	}
2012		2044
2013	if (!index)	2045	if (!index)
2014	return -1;	2046	return -1;
2015		2047
2016	return altern[RANDOM () % index];	2048	return altern [rndm (index)];
2017	}	2049	}
2018		2050
2019	/*	2051	/*
2020	* find_first_free_spot(archetype, maptile, x, y) works like	2052	* find_first_free_spot(archetype, maptile, x, y) works like
2021	* find_free_spot(), but it will search max number of squares.	2053	* find_free_spot(), but it will search max number of squares.
…		…
2042	{	2074	{
2043	arr += begin;	2075	arr += begin;
2044	end -= begin;	2076	end -= begin;
2045		2077
2046	while (--end)	2078	while (--end)
2047	swap (arr [end], arr [RANDOM () % (end + 1)]);	2079	swap (arr [end], arr [rndm (end + 1)]);
2048	}	2080	}
2049		2081
2050	/* new function to make monster searching more efficient, and effective!	2082	/* new function to make monster searching more efficient, and effective!
2051	* This basically returns a randomized array (in the passed pointer) of	2083	* This basically returns a randomized array (in the passed pointer) of
2052	* the spaces to find monsters. In this way, it won't always look for	2084	* the spaces to find monsters. In this way, it won't always look for
…		…
2088	object *tmp;	2120	object *tmp;
2089	maptile *mp;	2121	maptile *mp;
2090		2122
2091	MoveType blocked, move_type;	2123	MoveType blocked, move_type;
2092		2124
2093	if (exclude && exclude->head)	2125	if (exclude && exclude->head_ () != exclude)
2094	{	2126	{
2095	exclude = exclude->head;	2127	exclude = exclude->head;
2096	move_type = exclude->move_type;	2128	move_type = exclude->move_type;
2097	}	2129	}
2098	else	2130	else
…		…
2121	max = maxfree[i];	2153	max = maxfree[i];
2122	else if (mflags & P_IS_ALIVE)	2154	else if (mflags & P_IS_ALIVE)
2123	{	2155	{
2124	for (tmp = ms.bot; tmp; tmp = tmp->above)	2156	for (tmp = ms.bot; tmp; tmp = tmp->above)
2125	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2157	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2126	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2158	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2127	break;	2159	break;
2128		2160
2129	if (tmp)	2161	if (tmp)
2130	return freedir[i];	2162	return freedir[i];
2131	}	2163	}
…		…
2186		2218
2187	return 3;	2219	return 3;
2188	}	2220	}
2189		2221
2190	/*	2222	/*
2191	* absdir(int): Returns a number between 1 and 8, which represent
2192	* the "absolute" direction of a number (it actually takes care of
2193	* "overflow" in previous calculations of a direction).
2194	*/
2195
2196	int
2197	absdir (int d)
2198	{
2199	while (d < 1)
2200	d += 8;
2201
2202	while (d > 8)
2203	d -= 8;
2204
2205	return d;
2206	}
2207
2208	/*
2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2223	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2210	* between two directions (which are expected to be absolute (see absdir())	2224	* between two directions (which are expected to be absolute (see absdir())
2211	*/	2225	*/
2212
2213	int	2226	int
2214	dirdiff (int dir1, int dir2)	2227	dirdiff (int dir1, int dir2)
2215	{	2228	{
2216	int d;	2229	int d;
2217		2230
…		…
2345	* create clone from object to another	2358	* create clone from object to another
2346	*/	2359	*/
2347	object *	2360	object *
2348	object_create_clone (object *asrc)	2361	object_create_clone (object *asrc)
2349	{	2362	{
2350	object *dst = 0, *tmp, *src, *part, *prev, *item;	2363	object *dst = 0, *tmp, *src, *prev, *item;
2351		2364
2352	if (!asrc)	2365	if (!asrc)
2353	return 0;	2366	return 0;
2354		2367
2355	src = asrc;
2356	if (src->head)
2357	src = src->head;	2368	src = asrc->head_ ();
2358		2369
2359	prev = 0;	2370	prev = 0;
2360	for (part = src; part; part = part->more)	2371	for (object *part = src; part; part = part->more)
2361	{	2372	{
2362	tmp = part->clone ();	2373	tmp = part->clone ();
2363	tmp->x -= src->x;	2374	tmp->x -= src->x;
2364	tmp->y -= src->y;	2375	tmp->y -= src->y;
2365		2376
…		…
2383	insert_ob_in_ob (object_create_clone (item), dst);	2394	insert_ob_in_ob (object_create_clone (item), dst);
2384		2395
2385	return dst;	2396	return dst;
2386	}	2397	}
2387		2398
2388	/* GROS - Creates an object using a string representing its content. */
2389	/* Basically, we save the content of the string to a temp file, then call */
2390	/* load_object on it. I admit it is a highly inefficient way to make things, */
2391	/* but it was simple to make and allows reusing the load_object function. */
2392	/* Remember not to use load_object_str in a time-critical situation. */
2393	/* Also remember that multiparts objects are not supported for now. */
2394	object *
2395	load_object_str (const char *obstr)
2396	{
2397	object *op;
2398	char filename[MAX_BUF];
2399
2400	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2401
2402	FILE *tempfile = fopen (filename, "w");
2403
2404	if (tempfile == NULL)
2405	{
2406	LOG (llevError, "Error - Unable to access load object temp file\n");
2407	return NULL;
2408	}
2409
2410	fprintf (tempfile, obstr);
2411	fclose (tempfile);
2412
2413	op = object::create ();
2414
2415	object_thawer thawer (filename);
2416
2417	if (thawer)
2418	load_object (thawer, op, 0);
2419
2420	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2421	CLEAR_FLAG (op, FLAG_REMOVED);
2422
2423	return op;
2424	}
2425
2426	/* This returns the first object in who's inventory that	2399	/* This returns the first object in who's inventory that
2427	* has the same type and subtype match.	2400	* has the same type and subtype match.
2428	* returns NULL if no match.	2401	* returns NULL if no match.
2429	*/	2402	*/
2430	object *	2403	object *
…		…
2483	if (link->key == canonical_key)	2456	if (link->key == canonical_key)
2484	return link->value;	2457	return link->value;
2485		2458
2486	return 0;	2459	return 0;
2487	}	2460	}
2488
2489		2461
2490	/*	2462	/*
2491	* Updates the canonical_key in op to value.	2463	* Updates the canonical_key in op to value.
2492	*	2464	*
2493	* canonical_key is a shared string (value doesn't have to be).	2465	* canonical_key is a shared string (value doesn't have to be).
…		…
2517	/* Basically, if the archetype has this key set,	2489	/* Basically, if the archetype has this key set,
2518	* we need to store the null value so when we save	2490	* we need to store the null value so when we save
2519	* it, we save the empty value so that when we load,	2491	* it, we save the empty value so that when we load,
2520	* we get this value back again.	2492	* we get this value back again.
2521	*/	2493	*/
2522	if (get_ob_key_link (&op->arch->clone, canonical_key))	2494	if (get_ob_key_link (op->arch, canonical_key))
2523	field->value = 0;	2495	field->value = 0;
2524	else	2496	else
2525	{	2497	{
2526	if (last)	2498	if (last)
2527	last->next = field->next;	2499	last->next = field->next;
…		…
2596	}	2568	}
2597	else	2569	else
2598	item = item->env;	2570	item = item->env;
2599	}	2571	}
2600		2572
		2573	const char *
		2574	object::flag_desc (char *desc, int len) const
		2575	{
		2576	char *p = desc;
		2577	bool first = true;
		2578
		2579	*p = 0;
		2580
		2581	for (int i = 0; i < NUM_FLAGS; i++)
		2582	{
		2583	if (len <= 10) // magic constant!
		2584	{
		2585	snprintf (p, len, ",...");
		2586	break;
		2587	}
		2588
		2589	if (flag [i])
		2590	{
		2591	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2592	len -= cnt;
		2593	p += cnt;
		2594	first = false;
		2595	}
		2596	}
		2597
		2598	return desc;
		2599	}
		2600
2601	// return a suitable string describing an objetc in enough detail to find it	2601	// return a suitable string describing an object in enough detail to find it
2602	const char *	2602	const char *
2603	object::debug_desc (char *info) const	2603	object::debug_desc (char *info) const
2604	{	2604	{
		2605	char flagdesc[512];
2605	char info2[256 * 3];	2606	char info2[256 * 4];
2606	char *p = info;	2607	char *p = info;
2607		2608
2608	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2609	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2609	count,	2610	count, uuid.seq,
2610	&name,	2611	&name,
2611	title ? " " : "",	2612	title ? "\",title:\"" : "",
2612	title ? (const char *)title : "");	2613	title ? (const char *)title : "",
		2614	flag_desc (flagdesc, 512), type);
2613		2615
2614	if (env)	2616	if (env)
2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2617	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616		2618
2617	if (map)	2619	if (map)
2618	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2620	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619		2621
2620	return info;	2622	return info;
2621	}	2623	}
2622		2624
2623	const char *	2625	const char *
2624	object::debug_desc () const	2626	object::debug_desc () const
2625	{	2627	{
2626	static char info[256 * 3];	2628	static char info[3][256 * 4];
		2629	static int info_idx;
		2630
2627	return debug_desc (info);	2631	return debug_desc (info [++info_idx % 3]);
2628	}	2632	}
2629		2633
		2634	struct region *
		2635	object::region () const
		2636	{
		2637	return map ? map->region (x, y)
		2638	: region::default_region ();
		2639	}
		2640
		2641	const materialtype_t *
		2642	object::dominant_material () const
		2643	{
		2644	if (materialtype_t *mt = name_to_material (materialname))
		2645	return mt;
		2646
		2647	return name_to_material (shstr_unknown);
		2648	}
		2649
		2650	void
		2651	object::open_container (object *new_container)
		2652	{
		2653	if (container == new_container)
		2654	return;
		2655
		2656	if (object *old_container = container)
		2657	{
		2658	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2659	return;
		2660
		2661	#if 0
		2662	// remove the "Close old_container" object.
		2663	if (object *closer = old_container->inv)
		2664	if (closer->type == CLOSE_CON)
		2665	closer->destroy ();
		2666	#endif
		2667
		2668	old_container->flag [FLAG_APPLIED] = 0;
		2669	container = 0;
		2670
		2671	esrv_update_item (UPD_FLAGS, this, old_container);
		2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2673	}
		2674
		2675	if (new_container)
		2676	{
		2677	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2678	return;
		2679
		2680	// TODO: this does not seem to serve any purpose anymore?
		2681	#if 0
		2682	// insert the "Close Container" object.
		2683	if (archetype *closer = new_container->other_arch)
		2684	{
		2685	object *closer = arch_to_object (new_container->other_arch);
		2686	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2687	new_container->insert (closer);
		2688	}
		2689	#endif
		2690
		2691	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2692
		2693	new_container->flag [FLAG_APPLIED] = 1;
		2694	container = new_container;
		2695
		2696	esrv_update_item (UPD_FLAGS, this, new_container);
		2697	esrv_send_inventory (this, new_container);
		2698	}
		2699	}
		2700
		2701	object *
		2702	object::force_find (const shstr name)
		2703	{
		2704	/* cycle through his inventory to look for the MARK we want to
		2705	* place
		2706	*/
		2707	for (object *tmp = inv; tmp; tmp = tmp->below)
		2708	if (tmp->type == FORCE && tmp->slaying == name)
		2709	return splay (tmp);
		2710
		2711	return 0;
		2712	}
		2713
		2714	void
		2715	object::force_add (const shstr name, int duration)
		2716	{
		2717	if (object *force = force_find (name))
		2718	force->destroy ();
		2719
		2720	object *force = get_archetype (FORCE_NAME);
		2721
		2722	force->slaying = name;
		2723	force->stats.food = 1;
		2724	force->speed_left = -1.f;
		2725
		2726	force->set_speed (duration ? 1.f / duration : 0.f);
		2727	force->flag [FLAG_IS_USED_UP] = true;
		2728	force->flag [FLAG_APPLIED] = true;
		2729
		2730	insert (force);
		2731	}
		2732
		2733

Diff Legend

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