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.90 by root, Tue Dec 26 10:14:24 2006 UTC vs.
Revision 1.159 by root, Mon Jun 4 13:04:00 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* 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, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* 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 along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	48	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
190	* Check nrof variable *before* calling can_merge()	193	* Check nrof variable *before* calling can_merge()
191	*	194	*
192	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
193	* check weight	196	* check weight
194	*/	197	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	199	{
198	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
199	if (ob1 == ob2	201	if (ob1 == ob2
200	|| ob1->type != ob2->type	202	|| ob1->type != ob2->type
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* 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	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	359	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	361	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
360	*/	363	*/
361
362	char *	364	char *
363	dump_object (object *op)	365	dump_object (object *op)
364	{	366	{
365	if (!op)	367	if (!op)
366	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
367		369
368	object_freezer freezer;	370	object_freezer freezer;
369	save_object (freezer, op, 1);	371	op->write (freezer);
370	return freezer.as_string ();	372	return freezer.as_string ();
371	}	373	}
372		374
373	/*	375	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	393	}
392		394
393	/*	395	/*
394	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
395	*/	397	*/
396
397	object *	398	object *
398	find_object (tag_t i)	399	find_object (tag_t i)
399	{	400	{
400	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
401	if (op->count == i)	402	if (op->count == i)
402	return op;	403	return op;
403		404
404	return 0;	405	return 0;
405	}	406	}
406		407
407	/*	408	/*
408	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
411	*/	412	*/
412
413	object *	413	object *
414	find_object_name (const char *str)	414	find_object_name (const char *str)
415	{	415	{
416	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
417	object *op;	417	object *op;
418		418
419	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
420	if (op->name == str_)	420	if (op->name == str_)
421	break;	421	break;
422		422
423	return op;	423	return op;
424	}	424	}
…		…
450	owner = owner->owner;	450	owner = owner->owner;
451		451
452	this->owner = owner;	452	this->owner = owner;
453	}	453	}
454		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance all your items at once, "
		501	"but the %s is just too much for your body. "
		502	"[You need to unapply some items first.]", &ob->name);
		503	return false;
		504	}
		505
		506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		507	}
		508	else
		509	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		510
		511	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		512	{
		513	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		514	&name, ob->debug_desc ());
		515	return false;
		516	}
		517
		518	return true;
		519	}
		520
455	/* Zero the key_values on op, decrementing the shared-string	521	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	522	* refcounts and freeing the links.
457	*/	523	*/
458	static void	524	static void
459	free_key_values (object *op)	525	free_key_values (object *op)
460	{	526	{
461	for (key_value *i = op->key_values; i != 0;)	527	for (key_value *i = op->key_values; i; )
462	{	528	{
463	key_value *next = i->next;	529	key_value *next = i->next;
464	delete i;	530	delete i;
465		531
466	i = next;	532	i = next;
467	}	533	}
468		534
469	op->key_values = 0;	535	op->key_values = 0;
470	}	536	}
471		537
472	/*	538	object &
473	* copy_to first frees everything allocated by the dst object,	539	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	{	540	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	541	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	542	bool is_removed = flag [FLAG_REMOVED];
485		543
486	*(object_copy *)dst = *this;	544	*(object_copy *)this = src;
487		545
488	if (is_freed)	546	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	547	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		548
497	/* Copy over key_values, if any. */	549	/* Copy over key_values, if any. */
498	if (key_values)	550	if (src.key_values)
499	{	551	{
500	key_value *tail = 0;	552	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	553	key_values = 0;
504		554
505	for (i = key_values; i; i = i->next)	555	for (key_value *i = src.key_values; i; i = i->next)
506	{	556	{
507	key_value *new_link = new key_value;	557	key_value *new_link = new key_value;
508		558
509	new_link->next = 0;	559	new_link->next = 0;
510	new_link->key = i->key;	560	new_link->key = i->key;
511	new_link->value = i->value;	561	new_link->value = i->value;
512		562
513	/* Try and be clever here, too. */	563	/* Try and be clever here, too. */
514	if (!dst->key_values)	564	if (!key_values)
515	{	565	{
516	dst->key_values = new_link;	566	key_values = new_link;
517	tail = new_link;	567	tail = new_link;
518	}	568	}
519	else	569	else
520	{	570	{
521	tail->next = new_link;	571	tail->next = new_link;
522	tail = new_link;	572	tail = new_link;
523	}	573	}
524	}	574	}
525	}	575	}
		576	}
		577
		578	/*
		579	* copy_to first frees everything allocated by the dst object,
		580	* and then copies the contents of itself into the second
		581	* object, allocating what needs to be allocated. Basically, any
		582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		583	* if the first object is freed, the pointers in the new object
		584	* will point at garbage.
		585	*/
		586	void
		587	object::copy_to (object *dst)
		588	{
		589	*dst = *this;
		590
		591	if (speed < 0)
		592	dst->speed_left = speed_left - rndm ();
526		593
527	dst->set_speed (dst->speed);	594	dst->set_speed (dst->speed);
		595	}
		596
		597	void
		598	object::instantiate ()
		599	{
		600	if (!uuid.seq) // HACK
		601	uuid = gen_uuid ();
		602
		603	speed_left = -0.1f;
		604	/* copy the body_info to the body_used - this is only really
		605	* need for monsters, but doesn't hurt to do it for everything.
		606	* by doing so, when a monster is created, it has good starting
		607	* values for the body_used info, so when items are created
		608	* for it, they can be properly equipped.
		609	*/
		610	for (int i = NUM_BODY_LOCATIONS; i--; )
		611	slot[i].used = slot[i].info;
		612
		613	attachable::instantiate ();
528	}	614	}
529		615
530	object *	616	object *
531	object::clone ()	617	object::clone ()
532	{	618	{
…		…
538	/*	624	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	625	* 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	626	* 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.	627	* be called to update the face variable, _and_ how it looks on the map.
542	*/	628	*/
543
544	void	629	void
545	update_turn_face (object *op)	630	update_turn_face (object *op)
546	{	631	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	632	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	633	return;
		634
549	SET_ANIMATION (op, op->direction);	635	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	636	update_object (op, UP_OBJ_FACE);
551	}	637	}
552		638
553	/*	639	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	642	* This function needs to be called whenever the speed of an object changes.
557	*/	643	*/
558	void	644	void
559	object::set_speed (float speed)	645	object::set_speed (float speed)
560	{	646	{
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)	647	if (flag [FLAG_FREED] && speed)
567	{	648	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	649	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	650	speed = 0;
570	}	651	}
571		652
572	this->speed = speed;	653	this->speed = speed;
573		654
574	if (arch_init)	655	if (has_active_speed ())
575	return;	656	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	657	else
593	{	658	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	}	659	}
648		660
649	/*	661	/*
650	* update_object() updates the the map.	662	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	663	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	676	* UP_OBJ_FACE: only the objects face has changed.
665	*/	677	*/
666	void	678	void
667	update_object (object *op, int action)	679	update_object (object *op, int action)
668	{	680	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	681	if (op == NULL)
672	{	682	{
673	/* this should never happen */	683	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	684	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	685	return;
…		…
699	return;	709	return;
700	}	710	}
701		711
702	mapspace &m = op->ms ();	712	mapspace &m = op->ms ();
703		713
704	if (m.flags_ & P_NEED_UPDATE)	714	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	715	/* nop */;
706	else if (action == UP_OBJ_INSERT)	716	else if (action == UP_OBJ_INSERT)
707	{	717	{
708	// this is likely overkill, TODO: revisit (schmorp)	718	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	719	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	728	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	729	* to have move_allow right now.
720	*/	730	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	731	|| ((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)	732	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	733	m.flags_ = 0;
724	}	734	}
725	/* if the object is being removed, we can't make intelligent	735	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	736	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	737	* that is being removed.
728	*/	738	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	739	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	740	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	741	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	742	/* Nothing to do for that case */ ;
733	else	743	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	744	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		745
736	if (op->more)	746	if (op->more)
737	update_object (op->more, action);	747	update_object (op->more, action);
738	}	748	}
739		749
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	750	object::object ()
744	{	751	{
745	SET_FLAG (this, FLAG_REMOVED);	752	SET_FLAG (this, FLAG_REMOVED);
746		753
747	expmul = 1.0;	754	expmul = 1.0;
748	face = blank_face;	755	face = blank_face;
749	}	756	}
750		757
751	object::~object ()	758	object::~object ()
752	{	759	{
		760	unlink ();
		761
753	free_key_values (this);	762	free_key_values (this);
754	}	763	}
755		764
		765	static int object_count;
		766
756	void object::link ()	767	void object::link ()
757	{	768	{
758	count = ++ob_count;	769	assert (!index);//D
759	uuid = gen_uuid ();	770	uuid = gen_uuid ();
		771	count = ++object_count;
760		772
761	prev = 0;	773	refcnt_inc ();
762	next = object::first;	774	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	775	}
769		776
770	void object::unlink ()	777	void object::unlink ()
771	{	778	{
772	if (this == object::first)	779	if (!index)
773	object::first = next;	780	return;
774		781
775	/* Remove this object from the list of used objects */	782	objects.erase (this);
776	if (prev) prev->next = next;	783	refcnt_dec ();
777	if (next) next->prev = prev;	784	}
778		785
779	prev = 0;	786	void
780	next = 0;	787	object::activate ()
		788	{
		789	/* If already on active list, don't do anything */
		790	if (active)
		791	return;
		792
		793	if (has_active_speed ())
		794	actives.insert (this);
		795	}
		796
		797	void
		798	object::activate_recursive ()
		799	{
		800	activate ();
		801
		802	for (object *op = inv; op; op = op->below)
		803	op->activate_recursive ();
		804	}
		805
		806	/* This function removes object 'op' from the list of active
		807	* objects.
		808	* This should only be used for style maps or other such
		809	* reference maps where you don't want an object that isn't
		810	* in play chewing up cpu time getting processed.
		811	* The reverse of this is to call update_ob_speed, which
		812	* will do the right thing based on the speed of the object.
		813	*/
		814	void
		815	object::deactivate ()
		816	{
		817	/* If not on the active list, nothing needs to be done */
		818	if (!active)
		819	return;
		820
		821	actives.erase (this);
		822	}
		823
		824	void
		825	object::deactivate_recursive ()
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	op->deactivate_recursive ();
		829
		830	deactivate ();
		831	}
		832
		833	void
		834	object::set_flag_inv (int flag, int value)
		835	{
		836	for (object *op = inv; op; op = op->below)
		837	{
		838	op->flag [flag] = value;
		839	op->set_flag_inv (flag, value);
		840	}
781	}	841	}
782		842
783	/*	843	/*
784	* Remove and free all objects in the inventory of the given object.	844	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	845	* object.c ?
786	*/	846	*/
787	void	847	void
788	object::destroy_inv (bool drop_to_ground)	848	object::destroy_inv (bool drop_to_ground)
789	{	849	{
		850	// need to check first, because the checks below might segfault
		851	// as we might be on an invalid mapspace and crossfire code
		852	// is too buggy to ensure that the inventory is empty.
		853	// corollary: if you create arrows etc. with stuff in tis inventory,
		854	// cf will crash below with off-map x and y
		855	if (!inv)
		856	return;
		857
790	/* Only if the space blocks everything do we not process -	858	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	859	* if some form of movement is allowed, let objects
792	* drop on that space.	860	* drop on that space.
793	*/	861	*/
794	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	862	if (!drop_to_ground
		863	|| !map
		864	|| map->in_memory != MAP_IN_MEMORY
		865	|| map->nodrop
		866	|| ms ().move_block == MOVE_ALL)
795	{	867	{
796	while (inv)	868	while (inv)
		869	{
		870	inv->destroy_inv (drop_to_ground);
797	inv->destroy ();	871	inv->destroy ();
		872	}
798	}	873	}
799	else	874	else
800	{ /* Put objects in inventory onto this space */	875	{ /* Put objects in inventory onto this space */
801	while (inv)	876	while (inv)
802	{	877	{
…		…
804		879
805	if (op->flag [FLAG_STARTEQUIP]	880	if (op->flag [FLAG_STARTEQUIP]
806	|| op->flag [FLAG_NO_DROP]	881	|| op->flag [FLAG_NO_DROP]
807	|| op->type == RUNE	882	|| op->type == RUNE
808	|| op->type == TRAP	883	|| op->type == TRAP
809	|| op->flag [FLAG_IS_A_TEMPLATE])	884	|| op->flag [FLAG_IS_A_TEMPLATE]
		885	|| op->flag [FLAG_DESTROY_ON_DEATH])
810	op->destroy ();	886	op->destroy ();
811	else	887	else
812	{	888	map->insert (op, x, y);
813	op->remove ();
814	op->x = x;
815	op->y = y;
816	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817	}
818	}	889	}
819	}	890	}
820	}	891	}
821		892
822	object *object::create ()	893	object *object::create ()
…		…
827	}	898	}
828		899
829	void	900	void
830	object::do_destroy ()	901	object::do_destroy ()
831	{	902	{
		903	attachable::do_destroy ();
		904
832	if (flag [FLAG_IS_LINKED])	905	if (flag [FLAG_IS_LINKED])
833	remove_button_link (this);	906	remove_button_link (this);
834		907
835	if (flag [FLAG_FRIENDLY])	908	if (flag [FLAG_FRIENDLY])
836	remove_friendly_object (this);	909	remove_friendly_object (this);
837		910
838	if (!flag [FLAG_REMOVED])	911	if (!flag [FLAG_REMOVED])
839	remove ();	912	remove ();
840		913
841	if (flag [FLAG_FREED])	914	destroy_inv (true);
842	return;	915
		916	deactivate ();
		917	unlink ();
843		918
844	flag [FLAG_FREED] = 1;	919	flag [FLAG_FREED] = 1;
845
846	attachable::do_destroy ();
847
848	destroy_inv (true);
849	set_speed (0);
850	unlink ();
851		920
852	// hack to ensure that freed objects still have a valid map	921	// hack to ensure that freed objects still have a valid map
853	{	922	{
854	static maptile *freed_map; // freed objects are moved here to avoid crashes	923	static maptile *freed_map; // freed objects are moved here to avoid crashes
855		924
…		…
859		928
860	freed_map->name = "/internal/freed_objects_map";	929	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	930	freed_map->width = 3;
862	freed_map->height = 3;	931	freed_map->height = 3;
863		932
864	freed_map->allocate ();	933	freed_map->alloc ();
		934	freed_map->in_memory = MAP_IN_MEMORY;
865	}	935	}
866		936
867	map = freed_map;	937	map = freed_map;
868	x = 1;	938	x = 1;
869	y = 1;	939	y = 1;
…		…
879		949
880	// clear those pointers that likely might have circular references to us	950	// clear those pointers that likely might have circular references to us
881	owner = 0;	951	owner = 0;
882	enemy = 0;	952	enemy = 0;
883	attacked_by = 0;	953	attacked_by = 0;
884
885	// only relevant for players(?), but make sure of it anyways
886	contr = 0;
887	}	954	}
888		955
889	void	956	void
890	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
891	{	958	{
…		…
919	* 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
920	* 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
921	* object will have no environment. If the object previously had an	988	* object will have no environment. If the object previously had an
922	* environment, the x and y coordinates will be updated to	989	* environment, the x and y coordinates will be updated to
923	* the previous environment.	990	* the previous environment.
924	* Beware: This function is called from the editor as well!
925	*/	991	*/
926	void	992	void
927	object::remove ()	993	object::do_remove ()
928	{	994	{
929	object *tmp, *last = 0;	995	object *tmp, *last = 0;
930	object *otmp;	996	object *otmp;
931		997
932	if (QUERY_FLAG (this, FLAG_REMOVED))	998	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
954	* to save cpu time.	1020	* to save cpu time.
955	*/	1021	*/
956	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))
957	otmp->update_stats ();	1023	otmp->update_stats ();
958		1024
959	if (above != NULL)	1025	if (above)
960	above->below = below;	1026	above->below = below;
961	else	1027	else
962	env->inv = below;	1028	env->inv = below;
963		1029
964	if (below != NULL)	1030	if (below)
965	below->above = above;	1031	below->above = above;
966		1032
967	/* we set up values so that it could be inserted into	1033	/* we set up values so that it could be inserted into
968	* 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
969	* to the caller to decide what we want to do.	1035	* to the caller to decide what we want to do.
…		…
973	above = 0, below = 0;	1039	above = 0, below = 0;
974	env = 0;	1040	env = 0;
975	}	1041	}
976	else if (map)	1042	else if (map)
977	{	1043	{
978	/* Re did the following section of code - it looks like it had	1044	if (type == PLAYER)
979	* lots of logic for things we no longer care about
980	*/	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 ();
981		1058
982	/* link the object above us */	1059	/* link the object above us */
983	if (above)	1060	if (above)
984	above->below = below;	1061	above->below = below;
985	else	1062	else
986	map->at (x, y).top = below; /* we were top, set new top */	1063	ms.top = below; /* we were top, set new top */
987		1064
988	/* Relink the object below us, if there is one */	1065	/* Relink the object below us, if there is one */
989	if (below)	1066	if (below)
990	below->above = above;	1067	below->above = above;
991	else	1068	else
…		…
993	/* 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
994	* use translated coordinates in case some oddness with map tiling is	1071	* use translated coordinates in case some oddness with map tiling is
995	* evident	1072	* evident
996	*/	1073	*/
997	if (GET_MAP_OB (map, x, y) != this)	1074	if (GET_MAP_OB (map, x, y) != this)
998	{
999	char *dump = dump_object (this);
1000	LOG (llevError,
1001	"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 ());
1002	free (dump);
1003	dump = dump_object (GET_MAP_OB (map, x, y));
1004	LOG (llevError, "%s\n", dump);
1005	free (dump);
1006	}
1007		1076
1008	map->at (x, y).bot = above; /* goes on above it. */	1077	ms.bot = above; /* goes on above it. */
1009	}	1078	}
1010		1079
1011	above = 0;	1080	above = 0;
1012	below = 0;	1081	below = 0;
1013		1082
1014	if (map->in_memory == MAP_SAVING)	1083	if (map->in_memory == MAP_SAVING)
1015	return;	1084	return;
1016		1085
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1086	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		1087
1019	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1088	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1089	{
1021	/* 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
1022	* being removed.	1091	* being removed.
1023	*/	1092	*/
1024		1093
…		…
1036		1105
1037	if (tmp->contr->ns)	1106	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();	1107	tmp->contr->ns->floorbox_update ();
1039	}	1108	}
1040		1109
1041	/* See if player moving off should effect something */	1110	/* See if object moving off should effect something */
1042	if (check_walk_off	1111	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1112	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045	{	1114	{
1046	move_apply (tmp, this, 0);	1115	move_apply (tmp, this, 0);
1047		1116
1048	if (destroyed ())	1117	if (destroyed ())
1049	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 ());
1050	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1051	}	1119	}
1052		1120
1053	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1121	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1054		1122	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1055	if (tmp->above == tmp)	1123	if (tmp->above == tmp)
1056	tmp->above = 0;	1124	tmp->above = 0;
1057		1125
1058	last = tmp;	1126	last = tmp;
1059	}	1127	}
1060		1128
1061	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1062	if (!last)	1131	if (!last)
1063	map->at (x, y).flags_ = P_NEED_UPDATE;	1132	map->at (x, y).flags_ = 0;
1064	else	1133	else
1065	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1066		1135
1067	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1068	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
…		…
1104	}	1173	}
1105		1174
1106	return 0;	1175	return 0;
1107	}	1176	}
1108		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = arch->more; at; at = at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1109	/*	1201	/*
1110	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1111	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1112	*/	1204	*/
1113	object *	1205	object *
1114	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1115	{	1207	{
1116	object *tmp;
1117
1118	if (op->head)
1119	op = op->head;
1120
1121	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1122	{	1209	{
1123	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1124	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1125	}	1212	}
1126		1213
1127	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1128	}	1215	}
1129		1216
…		…
1148	* just 'op' otherwise	1235	* just 'op' otherwise
1149	*/	1236	*/
1150	object *	1237	object *
1151	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1152	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1153	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1154	sint16 x, y;
1155		1243
1156	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1157	{
1158	LOG (llevError, "Trying to insert freed object!\n");
1159	return NULL;
1160	}
1161		1245
1162	if (m == NULL)	1246	#if 0
1163	{	1247	if (!m->active != !op->active)
1164	char *dump = dump_object (op);	1248	if (m->active)
1165	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1249	op->activate_recursive ();
1166	free (dump);	1250	else
1167	return op;	1251	op->deactivate_recursive ();
1168	}	1252	#endif
1169		1253
1170	if (out_of_map (m, op->x, op->y))	1254	if (out_of_map (m, op->x, op->y))
1171	{	1255	{
1172	char *dump = dump_object (op);
1173	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1256	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1174	#ifdef MANY_CORES	1257	#ifdef MANY_CORES
1175	/* Better to catch this here, as otherwise the next use of this object	1258	/* Better to catch this here, as otherwise the next use of this object
1176	* is likely to cause a crash. Better to find out where it is getting	1259	* is likely to cause a crash. Better to find out where it is getting
1177	* improperly inserted.	1260	* improperly inserted.
1178	*/	1261	*/
1179	abort ();	1262	abort ();
1180	#endif	1263	#endif
1181	free (dump);
1182	return op;	1264	return op;
1183	}	1265	}
1184		1266
1185	if (!QUERY_FLAG (op, FLAG_REMOVED))	1267	if (object *more = op->more)
1186	{	1268	if (!insert_ob_in_map (more, m, originator, flag))
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1189	free (dump);
1190	return op;	1269	return 0;
1191	}
1192
1193	if (op->more)
1194	{
1195	/* The part may be on a different map. */
1196
1197	object *more = op->more;
1198
1199	/* We really need the caller to normalize coordinates - if
1200	* we set the map, that doesn't work if the location is within
1201	* a map and this is straddling an edge. So only if coordinate
1202	* is clear wrong do we normalize it.
1203	*/
1204	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1205	more->map = get_map_from_coord (m, &more->x, &more->y);
1206	else if (!more->map)
1207	{
1208	/* For backwards compatibility - when not dealing with tiled maps,
1209	* more->map should always point to the parent.
1210	*/
1211	more->map = m;
1212	}
1213
1214	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1215	{
1216	if (!op->head)
1217	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1218
1219	return 0;
1220	}
1221	}
1222		1270
1223	CLEAR_FLAG (op, FLAG_REMOVED);	1271	CLEAR_FLAG (op, FLAG_REMOVED);
1224		1272
1225	/* Ideally, the caller figures this out. However, it complicates a lot	1273	/* Ideally, the caller figures this out. However, it complicates a lot
1226	* of areas of callers (eg, anything that uses find_free_spot would now	1274	* of areas of callers (eg, anything that uses find_free_spot would now
1227	* need extra work	1275	* need extra work
1228	*/	1276	*/
1229	op->map = get_map_from_coord (m, &op->x, &op->y);	1277	if (!xy_normalise (m, op->x, op->y))
1230	x = op->x;	1278	return 0;
1231	y = op->y;	1279
		1280	op->map = m;
		1281	mapspace &ms = op->ms ();
1232		1282
1233	/* this has to be done after we translate the coordinates.	1283	/* this has to be done after we translate the coordinates.
1234	*/	1284	*/
1235	if (op->nrof && !(flag & INS_NO_MERGE))	1285	if (op->nrof && !(flag & INS_NO_MERGE))
1236	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1286	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237	if (object::can_merge (op, tmp))	1287	if (object::can_merge (op, tmp))
1238	{	1288	{
1239	op->nrof += tmp->nrof;	1289	op->nrof += tmp->nrof;
1240	tmp->destroy ();	1290	tmp->destroy ();
1241	}	1291	}
…		…
1258	op->below = originator->below;	1308	op->below = originator->below;
1259		1309
1260	if (op->below)	1310	if (op->below)
1261	op->below->above = op;	1311	op->below->above = op;
1262	else	1312	else
1263	op->ms ().bot = op;	1313	ms.bot = op;
1264		1314
1265	/* since *below* originator, no need to update top */	1315	/* since *below* originator, no need to update top */
1266	originator->below = op;	1316	originator->below = op;
1267	}	1317	}
1268	else	1318	else
1269	{	1319	{
		1320	top = ms.bot;
		1321
1270	/* If there are other objects, then */	1322	/* If there are other objects, then */
1271	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1323	if ((!(flag & INS_MAP_LOAD)) && top)
1272	{	1324	{
1273	object *last = NULL;	1325	object *last = 0;
1274		1326
1275	/*	1327	/*
1276	* If there are multiple objects on this space, we do some trickier handling.	1328	* If there are multiple objects on this space, we do some trickier handling.
1277	* We've already dealt with merging if appropriate.	1329	* We've already dealt with merging if appropriate.
1278	* Generally, we want to put the new object on top. But if	1330	* Generally, we want to put the new object on top. But if
…		…
1282	* once we get to them. This reduces the need to traverse over all of	1334	* once we get to them. This reduces the need to traverse over all of
1283	* them when adding another one - this saves quite a bit of cpu time	1335	* them when adding another one - this saves quite a bit of cpu time
1284	* when lots of spells are cast in one area. Currently, it is presumed	1336	* when lots of spells are cast in one area. Currently, it is presumed
1285	* that flying non pickable objects are spell objects.	1337	* that flying non pickable objects are spell objects.
1286	*/	1338	*/
1287		1339	for (top = ms.bot; top; top = top->above)
1288	while (top != NULL)
1289	{	1340	{
1290	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1341	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1291	floor = top;	1342	floor = top;
1292		1343
1293	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1344	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1296	top = top->below;	1347	top = top->below;
1297	break;	1348	break;
1298	}	1349	}
1299		1350
1300	last = top;	1351	last = top;
1301	top = top->above;
1302	}	1352	}
1303		1353
1304	/* Don't want top to be NULL, so set it to the last valid object */	1354	/* Don't want top to be NULL, so set it to the last valid object */
1305	top = last;	1355	top = last;
1306		1356
…		…
1308	* looks like instead of lots of conditions here.	1358	* looks like instead of lots of conditions here.
1309	* makes things faster, and effectively the same result.	1359	* makes things faster, and effectively the same result.
1310	*/	1360	*/
1311		1361
1312	/* Have object 'fall below' other objects that block view.	1362	/* Have object 'fall below' other objects that block view.
1313	* Unless those objects are exits, type 66	1363	* Unless those objects are exits.
1314	* If INS_ON_TOP is used, don't do this processing	1364	* If INS_ON_TOP is used, don't do this processing
1315	* Need to find the object that in fact blocks view, otherwise	1365	* Need to find the object that in fact blocks view, otherwise
1316	* stacking is a bit odd.	1366	* stacking is a bit odd.
1317	*/	1367	*/
1318	if (!(flag & INS_ON_TOP) &&	1368	if (!(flag & INS_ON_TOP)
1319	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1369	&& ms.flags () & P_BLOCKSVIEW
		1370	&& (op->face && !faces [op->face].visibility))
1320	{	1371	{
1321	for (last = top; last != floor; last = last->below)	1372	for (last = top; last != floor; last = last->below)
1322	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1373	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1323	break;	1374	break;
		1375
1324	/* Check to see if we found the object that blocks view,	1376	/* Check to see if we found the object that blocks view,
1325	* and make sure we have a below pointer for it so that	1377	* and make sure we have a below pointer for it so that
1326	* we can get inserted below this one, which requires we	1378	* we can get inserted below this one, which requires we
1327	* set top to the object below us.	1379	* set top to the object below us.
1328	*/	1380	*/
…		…
1330	top = last->below;	1382	top = last->below;
1331	}	1383	}
1332	} /* If objects on this space */	1384	} /* If objects on this space */
1333		1385
1334	if (flag & INS_MAP_LOAD)	1386	if (flag & INS_MAP_LOAD)
1335	top = GET_MAP_TOP (op->map, op->x, op->y);	1387	top = ms.top;
1336		1388
1337	if (flag & INS_ABOVE_FLOOR_ONLY)	1389	if (flag & INS_ABOVE_FLOOR_ONLY)
1338	top = floor;	1390	top = floor;
1339		1391
1340	/* Top is the object that our object (op) is going to get inserted above.	1392	/* Top is the object that our object (op) is going to get inserted above.
1341	*/	1393	*/
1342		1394
1343	/* First object on this space */	1395	/* First object on this space */
1344	if (!top)	1396	if (!top)
1345	{	1397	{
1346	op->above = GET_MAP_OB (op->map, op->x, op->y);	1398	op->above = ms.bot;
1347		1399
1348	if (op->above)	1400	if (op->above)
1349	op->above->below = op;	1401	op->above->below = op;
1350		1402
1351	op->below = NULL;	1403	op->below = 0;
1352	op->ms ().bot = op;	1404	ms.bot = op;
1353	}	1405	}
1354	else	1406	else
1355	{ /* get inserted into the stack above top */	1407	{ /* get inserted into the stack above top */
1356	op->above = top->above;	1408	op->above = top->above;
1357		1409
…		…
1360		1412
1361	op->below = top;	1413	op->below = top;
1362	top->above = op;	1414	top->above = op;
1363	}	1415	}
1364		1416
1365	if (op->above == NULL)	1417	if (!op->above)
1366	op->ms ().top = op;	1418	ms.top = op;
1367	} /* else not INS_BELOW_ORIGINATOR */	1419	} /* else not INS_BELOW_ORIGINATOR */
1368		1420
1369	if (op->type == PLAYER)	1421	if (op->type == PLAYER)
		1422	{
1370	op->contr->do_los = 1;	1423	op->contr->do_los = 1;
		1424	++op->map->players;
		1425	op->map->touch ();
		1426	}
		1427
		1428	op->map->dirty = true;
1371		1429
1372	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1373	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1374	*/	1432	*/
1375	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1376	if (object *pl = op->ms ().player ())	1434	if (object *pl = ms.player ())
1377	if (pl->contr->ns)	1435	if (pl->contr->ns)
1378	pl->contr->ns->floorbox_update ();	1436	pl->contr->ns->floorbox_update ();
1379		1437
1380	/* If this object glows, it may affect lighting conditions that are	1438	/* If this object glows, it may affect lighting conditions that are
1381	* visible to others on this map. But update_all_los is really	1439	* visible to others on this map. But update_all_los is really
1382	* an inefficient way to do this, as it means los for all players	1440	* an inefficient way to do this, as it means los for all players
1383	* on the map will get recalculated. The players could very well	1441	* on the map will get recalculated. The players could very well
1384	* be far away from this change and not affected in any way -	1442	* be far away from this change and not affected in any way -
1385	* this should get redone to only look for players within range,	1443	* this should get redone to only look for players within range,
1386	* or just updating the P_NEED_UPDATE for spaces within this area	1444	* or just updating the P_UPTODATE for spaces within this area
1387	* of effect may be sufficient.	1445	* of effect may be sufficient.
1388	*/	1446	*/
1389	if (op->map->darkness && (op->glow_radius != 0))	1447	if (op->map->darkness && (op->glow_radius != 0))
1390	update_all_los (op->map, op->x, op->y);	1448	update_all_los (op->map, op->x, op->y);
1391		1449
…		…
1402	* blocked() and wall() work properly), and these flags are updated by	1460	* blocked() and wall() work properly), and these flags are updated by
1403	* update_object().	1461	* update_object().
1404	*/	1462	*/
1405		1463
1406	/* if this is not the head or flag has been passed, don't check walk on status */	1464	/* if this is not the head or flag has been passed, don't check walk on status */
1407	if (!(flag & INS_NO_WALK_ON) && !op->head)	1465	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1408	{	1466	{
1409	if (check_move_on (op, originator))	1467	if (check_move_on (op, originator))
1410	return 0;	1468	return 0;
1411		1469
1412	/* If we are a multi part object, lets work our way through the check	1470	/* If we are a multi part object, lets work our way through the check
1413	* walk on's.	1471	* walk on's.
1414	*/	1472	*/
1415	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1473	for (object *tmp = op->more; tmp; tmp = tmp->more)
1416	if (check_move_on (tmp, originator))	1474	if (check_move_on (tmp, originator))
1417	return 0;	1475	return 0;
1418	}	1476	}
1419		1477
1420	return op;	1478	return op;
…		…
1429	{	1487	{
1430	object *tmp, *tmp1;	1488	object *tmp, *tmp1;
1431		1489
1432	/* first search for itself and remove any old instances */	1490	/* first search for itself and remove any old instances */
1433		1491
1434	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1492	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1435	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1436	tmp->destroy ();	1494	tmp->destroy ();
1437		1495
1438	tmp1 = arch_to_object (archetype::find (arch_string));	1496	tmp1 = arch_to_object (archetype::find (arch_string));
1439		1497
1440	tmp1->x = op->x;	1498	tmp1->x = op->x;
1441	tmp1->y = op->y;	1499	tmp1->y = op->y;
1442	insert_ob_in_map (tmp1, op->map, op, 0);	1500	insert_ob_in_map (tmp1, op->map, op, 0);
		1501	}
		1502
		1503	object *
		1504	object::insert_at (object *where, object *originator, int flags)
		1505	{
		1506	return where->map->insert (this, where->x, where->y, originator, flags);
1443	}	1507	}
1444		1508
1445	/*	1509	/*
1446	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1510	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1447	* is returned contains nr objects, and the remaining parts contains	1511	* is returned contains nr objects, and the remaining parts contains
1448	* the rest (or is removed and freed if that number is 0).	1512	* the rest (or is removed and freed if that number is 0).
1449	* On failure, NULL is returned, and the reason put into the	1513	* On failure, NULL is returned, and the reason put into the
1450	* global static errmsg array.	1514	* global static errmsg array.
1451	*/	1515	*/
1452
1453	object *	1516	object *
1454	get_split_ob (object *orig_ob, uint32 nr)	1517	get_split_ob (object *orig_ob, uint32 nr)
1455	{	1518	{
1456	object *newob;	1519	object *newob;
1457	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1520	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1488	* the amount of an object. If the amount reaches 0, the object	1551	* the amount of an object. If the amount reaches 0, the object
1489	* is subsequently removed and freed.	1552	* is subsequently removed and freed.
1490	*	1553	*
1491	* Return value: 'op' if something is left, NULL if the amount reached 0	1554	* Return value: 'op' if something is left, NULL if the amount reached 0
1492	*/	1555	*/
1493
1494	object *	1556	object *
1495	decrease_ob_nr (object *op, uint32 i)	1557	decrease_ob_nr (object *op, uint32 i)
1496	{	1558	{
1497	object *tmp;	1559	object *tmp;
1498		1560
…		…
1573		1635
1574	/*	1636	/*
1575	* add_weight(object, weight) adds the specified weight to an object,	1637	* add_weight(object, weight) adds the specified weight to an object,
1576	* and also updates how much the environment(s) is/are carrying.	1638	* and also updates how much the environment(s) is/are carrying.
1577	*/	1639	*/
1578
1579	void	1640	void
1580	add_weight (object *op, signed long weight)	1641	add_weight (object *op, signed long weight)
1581	{	1642	{
1582	while (op != NULL)	1643	while (op != NULL)
1583	{	1644	{
…		…
1598	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1659	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1599	free (dump);	1660	free (dump);
1600	return op;	1661	return op;
1601	}	1662	}
1602		1663
1603	if (where->head)	1664	if (where->head_ () != where)
1604	{	1665	{
1605	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1666	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1606	where = where->head;	1667	where = where->head;
1607	}	1668	}
1608		1669
1609	return where->insert (op);	1670	return where->insert (op);
1610	}	1671	}
…		…
1615	* inside the object environment.	1676	* inside the object environment.
1616	*	1677	*
1617	* The function returns now pointer to inserted item, and return value can	1678	* The function returns now pointer to inserted item, and return value can
1618	* be != op, if items are merged. -Tero	1679	* be != op, if items are merged. -Tero
1619	*/	1680	*/
1620
1621	object *	1681	object *
1622	object::insert (object *op)	1682	object::insert (object *op)
1623	{	1683	{
1624	object *tmp, *otmp;	1684	object *tmp, *otmp;
1625		1685
…		…
1721	*	1781	*
1722	* MSW 2001-07-08: Check all objects on space, not just those below	1782	* MSW 2001-07-08: Check all objects on space, not just those below
1723	* object being inserted. insert_ob_in_map may not put new objects	1783	* object being inserted. insert_ob_in_map may not put new objects
1724	* on top.	1784	* on top.
1725	*/	1785	*/
1726
1727	int	1786	int
1728	check_move_on (object *op, object *originator)	1787	check_move_on (object *op, object *originator)
1729	{	1788	{
1730	object *tmp;	1789	object *tmp;
1731	maptile *m = op->map;	1790	maptile *m = op->map;
…		…
1758		1817
1759	/* The objects have to be checked from top to bottom.	1818	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1819	* Hence, we first go to the top:
1761	*/	1820	*/
1762		1821
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1822	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1823	{
1765	/* Trim the search when we find the first other spell effect	1824	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1825	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1826	* we don't need to check all of them.
1768	*/	1827	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1845	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1846	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1847	{
1789		1848
1790	float	1849	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1850	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1851
1793	if (op->type == PLAYER)	1852	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1853	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1854	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1855	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1827	*/	1886	*/
1828	object *	1887	object *
1829	present_arch (const archetype *at, maptile *m, int x, int y)	1888	present_arch (const archetype *at, maptile *m, int x, int y)
1830	{	1889	{
1831	if (m == NULL || out_of_map (m, x, y))	1890	if (!m || out_of_map (m, x, y))
1832	{	1891	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1892	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1893	return NULL;
1835	}	1894	}
1836		1895
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1896	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1897	if (tmp->arch == at)
1839	return tmp;	1898	return tmp;
1840		1899
1841	return NULL;	1900	return NULL;
1842	}	1901	}
…		…
1853	{	1912	{
1854	LOG (llevError, "Present called outside map.\n");	1913	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1914	return NULL;
1856	}	1915	}
1857		1916
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1917	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1918	if (tmp->type == type)
1860	return tmp;	1919	return tmp;
1861		1920
1862	return NULL;	1921	return NULL;
1863	}	1922	}
…		…
1940	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1999	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1941	{	2000	{
1942	CLEAR_FLAG (tmp, flag);	2001	CLEAR_FLAG (tmp, flag);
1943	unflag_inv (tmp, flag);	2002	unflag_inv (tmp, flag);
1944	}	2003	}
1945	}
1946
1947	/*
1948	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949	* all it's inventory (recursively).
1950	* If checksums are used, a player will get set_cheat called for
1951	* him/her-self and all object carried by a call to this function.
1952	*/
1953	void
1954	set_cheat (object *op)
1955	{
1956	SET_FLAG (op, FLAG_WAS_WIZ);
1957	flag_inv (op, FLAG_WAS_WIZ);
1958	}	2004	}
1959		2005
1960	/*	2006	/*
1961	* find_free_spot(object, map, x, y, start, stop) will search for	2007	* find_free_spot(object, map, x, y, start, stop) will search for
1962	* a spot at the given map and coordinates which will be able to contain	2008	* a spot at the given map and coordinates which will be able to contain
…		…
2003	}	2049	}
2004		2050
2005	if (!index)	2051	if (!index)
2006	return -1;	2052	return -1;
2007		2053
2008	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
2009	}	2055	}
2010		2056
2011	/*	2057	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
…		…
2034	{	2080	{
2035	arr += begin;	2081	arr += begin;
2036	end -= begin;	2082	end -= begin;
2037		2083
2038	while (--end)	2084	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2085	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2086	}
2041		2087
2042	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2044	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2126	object *tmp;
2081	maptile *mp;	2127	maptile *mp;
2082		2128
2083	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2084		2130
2085	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2086	{	2132	{
2087	exclude = exclude->head;	2133	exclude = exclude->head;
2088	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2089	}	2135	}
2090	else	2136	else
…		…
2113	max = maxfree[i];	2159	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2115	{	2161	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2165	break;
2120		2166
2121	if (tmp)	2167	if (tmp)
2122	return freedir[i];	2168	return freedir[i];
2123	}	2169	}
…		…
2178		2224
2179	return 3;	2225	return 3;
2180	}	2226	}
2181		2227
2182	/*	2228	/*
2183	* absdir(int): Returns a number between 1 and 8, which represent
2184	* the "absolute" direction of a number (it actually takes care of
2185	* "overflow" in previous calculations of a direction).
2186	*/
2187
2188	int
2189	absdir (int d)
2190	{
2191	while (d < 1)
2192	d += 8;
2193
2194	while (d > 8)
2195	d -= 8;
2196
2197	return d;
2198	}
2199
2200	/*
2201	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2231	*/
2204
2205	int	2232	int
2206	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2207	{	2234	{
2208	int d;	2235	int d;
2209		2236
…		…
2337	* create clone from object to another	2364	* create clone from object to another
2338	*/	2365	*/
2339	object *	2366	object *
2340	object_create_clone (object *asrc)	2367	object_create_clone (object *asrc)
2341	{	2368	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2369	object *dst = 0, *tmp, *src, *prev, *item;
2343		2370
2344	if (!asrc)	2371	if (!asrc)
2345	return 0;	2372	return 0;
2346		2373
2347	src = asrc;
2348	if (src->head)
2349	src = src->head;	2374	src = asrc->head_ ();
2350		2375
2351	prev = 0;	2376	prev = 0;
2352	for (part = src; part; part = part->more)	2377	for (object *part = src; part; part = part->more)
2353	{	2378	{
2354	tmp = part->clone ();	2379	tmp = part->clone ();
2355	tmp->x -= src->x;	2380	tmp->x -= src->x;
2356	tmp->y -= src->y;	2381	tmp->y -= src->y;
2357		2382
…		…
2375	insert_ob_in_ob (object_create_clone (item), dst);	2400	insert_ob_in_ob (object_create_clone (item), dst);
2376		2401
2377	return dst;	2402	return dst;
2378	}	2403	}
2379		2404
2380	/* GROS - Creates an object using a string representing its content. */
2381	/* Basically, we save the content of the string to a temp file, then call */
2382	/* load_object on it. I admit it is a highly inefficient way to make things, */
2383	/* but it was simple to make and allows reusing the load_object function. */
2384	/* Remember not to use load_object_str in a time-critical situation. */
2385	/* Also remember that multiparts objects are not supported for now. */
2386	object *
2387	load_object_str (const char *obstr)
2388	{
2389	object *op;
2390	char filename[MAX_BUF];
2391
2392	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394	FILE *tempfile = fopen (filename, "w");
2395
2396	if (tempfile == NULL)
2397	{
2398	LOG (llevError, "Error - Unable to access load object temp file\n");
2399	return NULL;
2400	}
2401
2402	fprintf (tempfile, obstr);
2403	fclose (tempfile);
2404
2405	op = object::create ();
2406
2407	object_thawer thawer (filename);
2408
2409	if (thawer)
2410	load_object (thawer, op, 0);
2411
2412	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413	CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415	return op;
2416	}
2417
2418	/* This returns the first object in who's inventory that	2405	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2406	* has the same type and subtype match.
2420	* returns NULL if no match.	2407	* returns NULL if no match.
2421	*/	2408	*/
2422	object *	2409	object *
…		…
2475	if (link->key == canonical_key)	2462	if (link->key == canonical_key)
2476	return link->value;	2463	return link->value;
2477		2464
2478	return 0;	2465	return 0;
2479	}	2466	}
2480
2481		2467
2482	/*	2468	/*
2483	* Updates the canonical_key in op to value.	2469	* Updates the canonical_key in op to value.
2484	*	2470	*
2485	* canonical_key is a shared string (value doesn't have to be).	2471	* canonical_key is a shared string (value doesn't have to be).
…		…
2509	/* Basically, if the archetype has this key set,	2495	/* Basically, if the archetype has this key set,
2510	* we need to store the null value so when we save	2496	* we need to store the null value so when we save
2511	* it, we save the empty value so that when we load,	2497	* it, we save the empty value so that when we load,
2512	* we get this value back again.	2498	* we get this value back again.
2513	*/	2499	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))	2500	if (get_ob_key_link (op->arch, canonical_key))
2515	field->value = 0;	2501	field->value = 0;
2516	else	2502	else
2517	{	2503	{
2518	if (last)	2504	if (last)
2519	last->next = field->next;	2505	last->next = field->next;
…		…
2588	}	2574	}
2589	else	2575	else
2590	item = item->env;	2576	item = item->env;
2591	}	2577	}
2592		2578
		2579
		2580	const char *
		2581	object::flag_desc (char *desc, int len) const
		2582	{
		2583	char *p = desc;
		2584	bool first = true;
		2585
		2586	*p = 0;
		2587
		2588	for (int i = 0; i < NUM_FLAGS; i++)
		2589	{
		2590	if (len <= 10) // magic constant!
		2591	{
		2592	snprintf (p, len, ",...");
		2593	break;
		2594	}
		2595
		2596	if (flag [i])
		2597	{
		2598	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2599	len -= cnt;
		2600	p += cnt;
		2601	first = false;
		2602	}
		2603	}
		2604
		2605	return desc;
		2606	}
		2607
2593	// return a suitable string describing an objetc in enough detail to find it	2608	// return a suitable string describing an object in enough detail to find it
2594	const char *	2609	const char *
2595	object::debug_desc (char *info) const	2610	object::debug_desc (char *info) const
2596	{	2611	{
		2612	char flagdesc[512];
2597	char info2[256 * 3];	2613	char info2[256 * 4];
2598	char *p = info;	2614	char *p = info;
2599		2615
2600	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2616	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2601	count,	2617	count, uuid.seq,
2602	&name,	2618	&name,
2603	title ? " " : "",	2619	title ? "\",title:\"" : "",
2604	title ? (const char *)title : "");	2620	title ? (const char *)title : "",
		2621	flag_desc (flagdesc, 512), type);
2605		2622
2606	if (env)	2623	if (env)
2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2624	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2608		2625
2609	if (map)	2626	if (map)
2610	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2627	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2611		2628
2612	return info;	2629	return info;
2613	}	2630	}
2614		2631
2615	const char *	2632	const char *
2616	object::debug_desc () const	2633	object::debug_desc () const
2617	{	2634	{
2618	static char info[256 * 3];	2635	static char info[3][256 * 4];
		2636	static int info_idx;
		2637
2619	return debug_desc (info);	2638	return debug_desc (info [++info_idx % 3]);
2620	}	2639	}
2621		2640
		2641	struct region *
		2642	object::region () const
		2643	{
		2644	return map ? map->region (x, y)
		2645	: region::default_region ();
		2646	}
		2647
		2648	const materialtype_t *
		2649	object::dominant_material () const
		2650	{
		2651	if (materialtype_t *mat = name_to_material (materialname))
		2652	return mat;
		2653
		2654	// omfg this is slow, this has to be temporary :)
		2655	shstr unknown ("unknown");
		2656
		2657	return name_to_material (unknown);
		2658	}
		2659
		2660	void
		2661	object::open_container (object *new_container)
		2662	{
		2663	if (container == new_container)
		2664	return;
		2665
		2666	if (object *old_container = container)
		2667	{
		2668	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	#if 0
		2672	// remove the "Close old_container" object.
		2673	if (object *closer = old_container->inv)
		2674	if (closer->type == CLOSE_CON)
		2675	closer->destroy ();
		2676	#endif
		2677
		2678	old_container->flag [FLAG_APPLIED] = 0;
		2679	container = 0;
		2680
		2681	esrv_update_item (UPD_FLAGS, this, old_container);
		2682	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2683	}
		2684
		2685	if (new_container)
		2686	{
		2687	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2688	return;
		2689
		2690	// TODO: this does not seem to serve any purpose anymore?
		2691	#if 0
		2692	// insert the "Close Container" object.
		2693	if (archetype *closer = new_container->other_arch)
		2694	{
		2695	object *closer = arch_to_object (new_container->other_arch);
		2696	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2697	new_container->insert (closer);
		2698	}
		2699	#endif
		2700
		2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2702
		2703	new_container->flag [FLAG_APPLIED] = 1;
		2704	container = new_container;
		2705
		2706	esrv_update_item (UPD_FLAGS, this, new_container);
		2707	esrv_send_inventory (this, new_container);
		2708	}
		2709	}
		2710
		2711

Diff Legend

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