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.79 by root, Sat Dec 23 06:30:49 2006 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	48	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	144	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	145	* different structure or at least keep the lists sorted...
143	*/	146	*/
144		147
145	/* For each field in wants, */	148	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	150	{
148	key_value *has_field;	151	key_value *has_field;
149		152
150	/* Look for a field in has with the same key. */	153	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	154	has_field = get_ob_key_link (has, wants_field->key);
…		…
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
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		224
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		227
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	229	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	230	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	231	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	232	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	233	|| ob1->weight != ob2->weight
…		…
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, 3);	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 your applied items all at once, but the %s is too much. "
		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	return true;
		511	}
		512
455	/* Zero the key_values on op, decrementing the shared-string	513	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	514	* refcounts and freeing the links.
457	*/	515	*/
458	static void	516	static void
459	free_key_values (object *op)	517	free_key_values (object *op)
460	{	518	{
461	for (key_value *i = op->key_values; i != 0;)	519	for (key_value *i = op->key_values; i; )
462	{	520	{
463	key_value *next = i->next;	521	key_value *next = i->next;
464	delete i;	522	delete i;
465		523
466	i = next;	524	i = next;
467	}	525	}
468		526
469	op->key_values = 0;	527	op->key_values = 0;
470	}	528	}
471		529
472	/*	530	object &
473	* copy_to first frees everything allocated by the dst object,	531	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	{	532	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	533	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	534	bool is_removed = flag [FLAG_REMOVED];
485		535
486	*(object_copy *)dst = *this;	536	*(object_copy *)this = src;
487		537
488	if (self || cb)	538	flag [FLAG_FREED] = is_freed;
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	539	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);
493
494	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);
496
497	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499		540
500	/* Copy over key_values, if any. */	541	/* Copy over key_values, if any. */
501	if (key_values)	542	if (src.key_values)
502	{	543	{
503	key_value *tail = 0;	544	key_value *tail = 0;
504	key_value *i;
505
506	dst->key_values = 0;	545	key_values = 0;
507		546
508	for (i = key_values; i; i = i->next)	547	for (key_value *i = src.key_values; i; i = i->next)
509	{	548	{
510	key_value *new_link = new key_value;	549	key_value *new_link = new key_value;
511		550
512	new_link->next = 0;	551	new_link->next = 0;
513	new_link->key = i->key;	552	new_link->key = i->key;
514	new_link->value = i->value;	553	new_link->value = i->value;
515		554
516	/* Try and be clever here, too. */	555	/* Try and be clever here, too. */
517	if (!dst->key_values)	556	if (!key_values)
518	{	557	{
519	dst->key_values = new_link;	558	key_values = new_link;
520	tail = new_link;	559	tail = new_link;
521	}	560	}
522	else	561	else
523	{	562	{
524	tail->next = new_link;	563	tail->next = new_link;
525	tail = new_link;	564	tail = new_link;
526	}	565	}
527	}	566	}
528	}	567	}
		568	}
529		569
530	update_ob_speed (dst);	570	/*
		571	* copy_to first frees everything allocated by the dst object,
		572	* and then copies the contents of itself into the second
		573	* object, allocating what needs to be allocated. Basically, any
		574	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		575	* if the first object is freed, the pointers in the new object
		576	* will point at garbage.
		577	*/
		578	void
		579	object::copy_to (object *dst)
		580	{
		581	*dst = *this;
		582
		583	if (speed < 0)
		584	dst->speed_left = speed_left - rndm ();
		585
		586	dst->set_speed (dst->speed);
		587	}
		588
		589	void
		590	object::instantiate ()
		591	{
		592	if (!uuid.seq) // HACK
		593	uuid = gen_uuid ();
		594
		595	speed_left = -0.1f;
		596	/* copy the body_info to the body_used - this is only really
		597	* need for monsters, but doesn't hurt to do it for everything.
		598	* by doing so, when a monster is created, it has good starting
		599	* values for the body_used info, so when items are created
		600	* for it, they can be properly equipped.
		601	*/
		602	for (int i = NUM_BODY_LOCATIONS; i--; )
		603	slot[i].used = slot[i].info;
		604
		605	attachable::instantiate ();
531	}	606	}
532		607
533	object *	608	object *
534	object::clone ()	609	object::clone ()
535	{	610	{
…		…
541	/*	616	/*
542	* If an object with the IS_TURNABLE() flag needs to be turned due	617	* If an object with the IS_TURNABLE() flag needs to be turned due
543	* to the closest player being on the other side, this function can	618	* to the closest player being on the other side, this function can
544	* be called to update the face variable, _and_ how it looks on the map.	619	* be called to update the face variable, _and_ how it looks on the map.
545	*/	620	*/
546
547	void	621	void
548	update_turn_face (object *op)	622	update_turn_face (object *op)
549	{	623	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	624	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	625	return;
		626
552	SET_ANIMATION (op, op->direction);	627	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	628	update_object (op, UP_OBJ_FACE);
554	}	629	}
555		630
556	/*	631	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	632	* Updates the speed of an object. If the speed changes from 0 to another
558	* value, or vice versa, then add/remove the object from the active list.	633	* value, or vice versa, then add/remove the object from the active list.
559	* This function needs to be called whenever the speed of an object changes.	634	* This function needs to be called whenever the speed of an object changes.
560	*/	635	*/
561	void	636	void
562	update_ob_speed (object *op)	637	object::set_speed (float speed)
563	{	638	{
564	extern int arch_init;	639	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	640	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	641	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	642	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	643	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		644
589	/* process_events() expects us to insert the object at the beginning	645	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		646
593	if (op->active_next != NULL)	647	if (has_active_speed ())
594	op->active_next->active_prev = op;	648	activate ();
595
596	active_objects = op;
597	}
598	else	649	else
599	{	650	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	651	}
654		652
655	/*	653	/*
656	* update_object() updates the the map.	654	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	655	* It takes into account invisible objects (and represent squares covered
…		…
670	* UP_OBJ_FACE: only the objects face has changed.	668	* UP_OBJ_FACE: only the objects face has changed.
671	*/	669	*/
672	void	670	void
673	update_object (object *op, int action)	671	update_object (object *op, int action)
674	{	672	{
675	MoveType move_on, move_off, move_block, move_slow;
676
677	if (op == NULL)	673	if (op == NULL)
678	{	674	{
679	/* this should never happen */	675	/* this should never happen */
680	LOG (llevDebug, "update_object() called for NULL object.\n");	676	LOG (llevDebug, "update_object() called for NULL object.\n");
681	return;	677	return;
…		…
694	*/	690	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	691	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	692	return;
697		693
698	/* make sure the object is within map boundaries */	694	/* make sure the object is within map boundaries */
699	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	695	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	696	{
701	LOG (llevError, "update_object() called for object out of map!\n");	697	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	698	#ifdef MANY_CORES
703	abort ();	699	abort ();
704	#endif	700	#endif
705	return;	701	return;
706	}	702	}
707		703
708	mapspace &m = op->ms ();	704	mapspace &m = op->ms ();
709		705
710	if (m.flags_ & P_NEED_UPDATE)	706	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	707	/* nop */;
712	else if (action == UP_OBJ_INSERT)	708	else if (action == UP_OBJ_INSERT)
713	{	709	{
714	// this is likely overkill, TODO: revisit (schmorp)	710	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	711	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* This isn't perfect, but I don't expect a lot of objects to	720	/* This isn't perfect, but I don't expect a lot of objects to
725	* to have move_allow right now.	721	* to have move_allow right now.
726	*/	722	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	723	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	724	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	725	m.flags_ = 0;
730	}	726	}
731	/* if the object is being removed, we can't make intelligent	727	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	728	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	729	* that is being removed.
734	*/	730	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	731	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	733	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	734	/* Nothing to do for that case */ ;
739	else	735	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	736	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		737
742	if (op->more)	738	if (op->more)
743	update_object (op->more, action);	739	update_object (op->more, action);
744	}	740	}
745		741
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	742	object::object ()
763	{	743	{
764	SET_FLAG (this, FLAG_REMOVED);	744	SET_FLAG (this, FLAG_REMOVED);
765		745
766	expmul = 1.0;	746	expmul = 1.0;
767	face = blank_face;	747	face = blank_face;
768	}	748	}
769		749
770	object::~object ()	750	object::~object ()
771	{	751	{
		752	unlink ();
		753
772	free_key_values (this);	754	free_key_values (this);
773	}	755	}
774		756
		757	static int object_count;
		758
775	void object::link ()	759	void object::link ()
776	{	760	{
777	count = ++ob_count;	761	assert (!index);//D
778	uuid = gen_uuid ();	762	uuid = gen_uuid ();
		763	count = ++object_count;
779		764
780	prev = 0;	765	refcnt_inc ();
781	next = object::first;	766	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	767	}
788		768
789	void object::unlink ()	769	void object::unlink ()
790	{	770	{
791	if (this == object::first)	771	if (!index)
792	object::first = next;	772	return;
793		773
794	/* Remove this object from the list of used objects */	774	objects.erase (this);
795	if (prev) prev->next = next;	775	refcnt_dec ();
796	if (next) next->prev = prev;	776	}
797		777
798	prev = 0;	778	void
799	next = 0;	779	object::activate ()
		780	{
		781	/* If already on active list, don't do anything */
		782	if (active)
		783	return;
		784
		785	if (has_active_speed ())
		786	actives.insert (this);
		787	}
		788
		789	void
		790	object::activate_recursive ()
		791	{
		792	activate ();
		793
		794	for (object *op = inv; op; op = op->below)
		795	op->activate_recursive ();
		796	}
		797
		798	/* This function removes object 'op' from the list of active
		799	* objects.
		800	* This should only be used for style maps or other such
		801	* reference maps where you don't want an object that isn't
		802	* in play chewing up cpu time getting processed.
		803	* The reverse of this is to call update_ob_speed, which
		804	* will do the right thing based on the speed of the object.
		805	*/
		806	void
		807	object::deactivate ()
		808	{
		809	/* If not on the active list, nothing needs to be done */
		810	if (!active)
		811	return;
		812
		813	actives.erase (this);
		814	}
		815
		816	void
		817	object::deactivate_recursive ()
		818	{
		819	for (object *op = inv; op; op = op->below)
		820	op->deactivate_recursive ();
		821
		822	deactivate ();
		823	}
		824
		825	void
		826	object::set_flag_inv (int flag, int value)
		827	{
		828	for (object *op = inv; op; op = op->below)
		829	{
		830	op->flag [flag] = value;
		831	op->set_flag_inv (flag, value);
		832	}
		833	}
		834
		835	/*
		836	* Remove and free all objects in the inventory of the given object.
		837	* object.c ?
		838	*/
		839	void
		840	object::destroy_inv (bool drop_to_ground)
		841	{
		842	// need to check first, because the checks below might segfault
		843	// as we might be on an invalid mapspace and crossfire code
		844	// is too buggy to ensure that the inventory is empty.
		845	// corollary: if you create arrows etc. with stuff in tis inventory,
		846	// cf will crash below with off-map x and y
		847	if (!inv)
		848	return;
		849
		850	/* Only if the space blocks everything do we not process -
		851	* if some form of movement is allowed, let objects
		852	* drop on that space.
		853	*/
		854	if (!drop_to_ground
		855	|| !map
		856	|| map->in_memory != MAP_IN_MEMORY
		857	|| map->nodrop
		858	|| ms ().move_block == MOVE_ALL)
		859	{
		860	while (inv)
		861	{
		862	inv->destroy_inv (drop_to_ground);
		863	inv->destroy ();
		864	}
		865	}
		866	else
		867	{ /* Put objects in inventory onto this space */
		868	while (inv)
		869	{
		870	object *op = inv;
		871
		872	if (op->flag [FLAG_STARTEQUIP]
		873	|| op->flag [FLAG_NO_DROP]
		874	|| op->type == RUNE
		875	|| op->type == TRAP
		876	|| op->flag [FLAG_IS_A_TEMPLATE]
		877	|| op->flag [FLAG_DESTROY_ON_DEATH])
		878	op->destroy ();
		879	else
		880	map->insert (op, x, y);
		881	}
		882	}
800	}	883	}
801		884
802	object *object::create ()	885	object *object::create ()
803	{	886	{
804	object *op = new object;	887	object *op = new object;
805	op->link ();	888	op->link ();
806	return op;	889	return op;
807	}	890	}
808		891
809	/*	892	void
810	* free_object() frees everything allocated by an object, removes	893	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	894	{
821	if (QUERY_FLAG (this, FLAG_FREED))	895	attachable::do_destroy ();
822	return;
823		896
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	897	if (flag [FLAG_IS_LINKED])
		898	remove_button_link (this);
		899
		900	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	901	remove_friendly_object (this);
826		902
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	903	if (!flag [FLAG_REMOVED])
828	remove ();	904	remove ();
829		905
830	SET_FLAG (this, FLAG_FREED);	906	destroy_inv (true);
831		907
832	if (more)	908	deactivate ();
833	{	909	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		910
838	if (inv)	911	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		912
880	// hack to ensure that freed objects still have a valid map	913	// hack to ensure that freed objects still have a valid map
881	{	914	{
882	static maptile *freed_map; // freed objects are moved here to avoid crashes	915	static maptile *freed_map; // freed objects are moved here to avoid crashes
883		916
…		…
887		920
888	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	922	freed_map->width = 3;
890	freed_map->height = 3;	923	freed_map->height = 3;
891		924
892	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
893	}	927	}
894		928
895	map = freed_map;	929	map = freed_map;
896	x = 1;	930	x = 1;
897	y = 1;	931	y = 1;
898	}	932	}
899		933
		934	head = 0;
		935
		936	if (more)
		937	{
		938	more->destroy ();
		939	more = 0;
		940	}
		941
900	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might have circular references to us
901	owner = 0;	943	owner = 0;
902	enemy = 0;	944	enemy = 0;
903	attacked_by = 0;	945	attacked_by = 0;
		946	}
904		947
905	// only relevant for players(?), but make sure of it anyways	948	void
906	contr = 0;	949	object::destroy (bool destroy_inventory)
		950	{
		951	if (destroyed ())
		952	return;
907		953
908	/* Remove object from the active list */	954	if (destroy_inventory)
909	speed = 0;	955	destroy_inv (false);
910	update_ob_speed (this);
911		956
912	unlink ();	957	attachable::destroy ();
913
914	mortals.push_back (this);
915	}	958	}
916		959
917	/*	960	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	962	* weight of an object (and what is carried by it's environment(s)).
…		…
935	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
936	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
937	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
939	* the previous environment.	982	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	983	*/
942	void	984	void
943	object::remove ()	985	object::do_remove ()
944	{	986	{
945	object *tmp, *last = 0;	987	object *tmp, *last = 0;
946	object *otmp;	988	object *otmp;
947		989
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	990	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	991	return;
952		992
953	SET_FLAG (this, FLAG_REMOVED);	993	SET_FLAG (this, FLAG_REMOVED);
		994	INVOKE_OBJECT (REMOVE, this);
954		995
955	if (more)	996	if (more)
956	more->remove ();	997	more->remove ();
957		998
958	/*	999	/*
…		…
971	* to save cpu time.	1012	* to save cpu time.
972	*/	1013	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1014	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	1015	otmp->update_stats ();
975		1016
976	if (above != NULL)	1017	if (above)
977	above->below = below;	1018	above->below = below;
978	else	1019	else
979	env->inv = below;	1020	env->inv = below;
980		1021
981	if (below != NULL)	1022	if (below)
982	below->above = above;	1023	below->above = above;
983		1024
984	/* we set up values so that it could be inserted into	1025	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	1026	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	1027	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	1031	above = 0, below = 0;
991	env = 0;	1032	env = 0;
992	}	1033	}
993	else if (map)	1034	else if (map)
994	{	1035	{
995	/* Re did the following section of code - it looks like it had	1036	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	1037	{
		1038	// leaving a spot always closes any open container on the ground
		1039	if (container && !container->env)
		1040	// this causes spurious floorbox updates, but it ensures
		1041	// that the CLOSE event is being sent.
		1042	close_container ();
		1043
		1044	--map->players;
		1045	map->touch ();
		1046	}
		1047
		1048	map->dirty = true;
		1049	mapspace &ms = this->ms ();
998		1050
999	/* link the object above us */	1051	/* link the object above us */
1000	if (above)	1052	if (above)
1001	above->below = below;	1053	above->below = below;
1002	else	1054	else
1003	map->at (x, y).top = below; /* we were top, set new top */	1055	ms.top = below; /* we were top, set new top */
1004		1056
1005	/* Relink the object below us, if there is one */	1057	/* Relink the object below us, if there is one */
1006	if (below)	1058	if (below)
1007	below->above = above;	1059	below->above = above;
1008	else	1060	else
…		…
1010	/* Nothing below, which means we need to relink map object for this space	1062	/* Nothing below, which means we need to relink map object for this space
1011	* use translated coordinates in case some oddness with map tiling is	1063	* use translated coordinates in case some oddness with map tiling is
1012	* evident	1064	* evident
1013	*/	1065	*/
1014	if (GET_MAP_OB (map, x, y) != this)	1066	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"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);	1067	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 ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		1068
1025	map->at (x, y).bottom = above; /* goes on above it. */	1069	ms.bot = above; /* goes on above it. */
1026	}	1070	}
1027		1071
1028	above = 0;	1072	above = 0;
1029	below = 0;	1073	below = 0;
1030		1074
1031	if (map->in_memory == MAP_SAVING)	1075	if (map->in_memory == MAP_SAVING)
1032	return;	1076	return;
1033		1077
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1078	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1079
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1080	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1081	{
1038	/* No point updating the players look faces if he is the object	1082	/* No point updating the players look faces if he is the object
1039	* being removed.	1083	* being removed.
1040	*/	1084	*/
1041		1085
…		…
1045	* removed (most likely destroyed), update the player view	1089	* removed (most likely destroyed), update the player view
1046	* appropriately.	1090	* appropriately.
1047	*/	1091	*/
1048	if (tmp->container == this)	1092	if (tmp->container == this)
1049	{	1093	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);	1094	flag [FLAG_APPLIED] = 0;
1051	tmp->container = 0;	1095	tmp->container = 0;
1052	}	1096	}
1053		1097
		1098	if (tmp->contr->ns)
1054	tmp->contr->ns->floorbox_update ();	1099	tmp->contr->ns->floorbox_update ();
1055	}	1100	}
1056		1101
1057	/* See if player moving off should effect something */	1102	/* See if object moving off should effect something */
1058	if (check_walk_off	1103	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1104	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1105	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1106	{
1062	move_apply (tmp, this, 0);	1107	move_apply (tmp, this, 0);
…		…
1064	if (destroyed ())	1109	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1110	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1111	}
1067		1112
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1113	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069		1114	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1070	if (tmp->above == tmp)	1115	if (tmp->above == tmp)
1071	tmp->above = 0;	1116	tmp->above = 0;
1072		1117
1073	last = tmp;	1118	last = tmp;
1074	}	1119	}
1075		1120
1076	/* last == NULL of there are no objects on this space */	1121	/* last == NULL if there are no objects on this space */
		1122	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1123	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1124	map->at (x, y).flags_ = 0;
1079	else	1125	else
1080	update_object (last, UP_OBJ_REMOVE);	1126	update_object (last, UP_OBJ_REMOVE);
1081		1127
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1128	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1129	update_all_los (map, x, y);
1084	}	1130	}
1085	}	1131	}
1086		1132
1087	/*	1133	/*
…		…
1096	merge_ob (object *op, object *top)	1142	merge_ob (object *op, object *top)
1097	{	1143	{
1098	if (!op->nrof)	1144	if (!op->nrof)
1099	return 0;	1145	return 0;
1100		1146
1101	if (top == NULL)	1147	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1148	for (top = op; top && top->above; top = top->above)
		1149	;
1103		1150
1104	for (; top != NULL; top = top->below)	1151	for (; top; top = top->below)
1105	{	1152	{
1106	if (top == op)	1153	if (top == op)
1107	continue;	1154	continue;
1108		1155
1109	if (object::can_merge (op, top))	1156	if (object::can_merge (op, top))
…		…
1118	}	1165	}
1119		1166
1120	return 0;	1167	return 0;
1121	}	1168	}
1122		1169
		1170	void
		1171	object::expand_tail ()
		1172	{
		1173	if (more)
		1174	return;
		1175
		1176	object *prev = this;
		1177
		1178	for (archetype *at = arch->more; at; at = at->more)
		1179	{
		1180	object *op = arch_to_object (at);
		1181
		1182	op->name = name;
		1183	op->name_pl = name_pl;
		1184	op->title = title;
		1185
		1186	op->head = this;
		1187	prev->more = op;
		1188
		1189	prev = op;
		1190	}
		1191	}
		1192
1123	/*	1193	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1194	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1195	* job preparing multi-part monsters.
1126	*/	1196	*/
1127	object *	1197	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1198	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1199	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1200	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1201	{
1137	tmp->x = x + tmp->arch->clone.x;	1202	tmp->x = x + tmp->arch->clone.x;
1138	tmp->y = y + tmp->arch->clone.y;	1203	tmp->y = y + tmp->arch->clone.y;
1139	}	1204	}
1140		1205
…		…
1159	* Return value:	1224	* Return value:
1160	* new object if 'op' was merged with other object	1225	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1226	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1227	* just 'op' otherwise
1163	*/	1228	*/
1164
1165	object *	1229	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1230	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1231	{
		1232	assert (!op->flag [FLAG_FREED]);
		1233
1168	object *tmp, *top, *floor = NULL;	1234	object *tmp, *top, *floor = NULL;
1169	sint16 x, y;
1170		1235
1171	if (QUERY_FLAG (op, FLAG_FREED))	1236	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176		1237
1177	if (m == NULL)	1238	#if 0
1178	{	1239	if (!m->active != !op->active)
1179	char *dump = dump_object (op);	1240	if (m->active)
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1241	op->activate_recursive ();
1181	free (dump);	1242	else
1182	return op;	1243	op->deactivate_recursive ();
1183	}	1244	#endif
1184		1245
1185	if (out_of_map (m, op->x, op->y))	1246	if (out_of_map (m, op->x, op->y))
1186	{	1247	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1248	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES	1249	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object	1250	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting	1251	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.	1252	* improperly inserted.
1193	*/	1253	*/
1194	abort ();	1254	abort ();
1195	#endif	1255	#endif
1196	free (dump);
1197	return op;	1256	return op;
1198	}	1257	}
1199		1258
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;	1259	if (object *more = op->more)
1213		1260	{
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1261	if (!insert_ob_in_map (more, m, originator, flag))
1230	{	1262	{
1231	if (!op->head)	1263	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1264	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1265
1234	return NULL;	1266	return 0;
1235	}	1267	}
1236	}	1268	}
1237		1269
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1270	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1271
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1272	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1273	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1274	* need extra work
1243	*/	1275	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1276	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1277	return 0;
1246	y = op->y;	1278
		1279	op->map = m;
		1280	mapspace &ms = op->ms ();
1247		1281
1248	/* this has to be done after we translate the coordinates.	1282	/* this has to be done after we translate the coordinates.
1249	*/	1283	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1284	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1285	for (tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1286	if (object::can_merge (op, tmp))
1253	{	1287	{
1254	op->nrof += tmp->nrof;	1288	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1289	tmp->destroy ();
1256	}	1290	}
…		…
1273	op->below = originator->below;	1307	op->below = originator->below;
1274		1308
1275	if (op->below)	1309	if (op->below)
1276	op->below->above = op;	1310	op->below->above = op;
1277	else	1311	else
1278	op->ms ().bottom = op;	1312	ms.bot = op;
1279		1313
1280	/* since *below* originator, no need to update top */	1314	/* since *below* originator, no need to update top */
1281	originator->below = op;	1315	originator->below = op;
1282	}	1316	}
1283	else	1317	else
1284	{	1318	{
		1319	top = ms.bot;
		1320
1285	/* If there are other objects, then */	1321	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1322	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1323	{
1288	object *last = NULL;	1324	object *last = 0;
1289		1325
1290	/*	1326	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1327	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1328	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1329	* Generally, we want to put the new object on top. But if
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1333	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1334	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1335	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1336	* that flying non pickable objects are spell objects.
1301	*/	1337	*/
1302		1338	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1339	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1340	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1341	floor = top;
1307		1342
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1343	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1311	top = top->below;	1346	top = top->below;
1312	break;	1347	break;
1313	}	1348	}
1314		1349
1315	last = top;	1350	last = top;
1316	top = top->above;
1317	}	1351	}
1318		1352
1319	/* Don't want top to be NULL, so set it to the last valid object */	1353	/* Don't want top to be NULL, so set it to the last valid object */
1320	top = last;	1354	top = last;
1321		1355
…		…
1323	* looks like instead of lots of conditions here.	1357	* looks like instead of lots of conditions here.
1324	* makes things faster, and effectively the same result.	1358	* makes things faster, and effectively the same result.
1325	*/	1359	*/
1326		1360
1327	/* Have object 'fall below' other objects that block view.	1361	/* Have object 'fall below' other objects that block view.
1328	* Unless those objects are exits, type 66	1362	* Unless those objects are exits.
1329	* If INS_ON_TOP is used, don't do this processing	1363	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1364	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1365	* stacking is a bit odd.
1332	*/	1366	*/
1333	if (!(flag & INS_ON_TOP) &&	1367	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1368	&& ms.flags () & P_BLOCKSVIEW
		1369	&& (op->face && !faces [op->face].visibility))
1335	{	1370	{
1336	for (last = top; last != floor; last = last->below)	1371	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1372	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1373	break;
		1374
1339	/* Check to see if we found the object that blocks view,	1375	/* Check to see if we found the object that blocks view,
1340	* and make sure we have a below pointer for it so that	1376	* and make sure we have a below pointer for it so that
1341	* we can get inserted below this one, which requires we	1377	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1378	* set top to the object below us.
1343	*/	1379	*/
…		…
1345	top = last->below;	1381	top = last->below;
1346	}	1382	}
1347	} /* If objects on this space */	1383	} /* If objects on this space */
1348		1384
1349	if (flag & INS_MAP_LOAD)	1385	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);	1386	top = ms.top;
1351		1387
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1388	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1389	top = floor;
1354		1390
1355	/* Top is the object that our object (op) is going to get inserted above.	1391	/* Top is the object that our object (op) is going to get inserted above.
1356	*/	1392	*/
1357		1393
1358	/* First object on this space */	1394	/* First object on this space */
1359	if (!top)	1395	if (!top)
1360	{	1396	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1397	op->above = ms.bot;
1362		1398
1363	if (op->above)	1399	if (op->above)
1364	op->above->below = op;	1400	op->above->below = op;
1365		1401
1366	op->below = NULL;	1402	op->below = 0;
1367	op->ms ().bottom = op;	1403	ms.bot = op;
1368	}	1404	}
1369	else	1405	else
1370	{ /* get inserted into the stack above top */	1406	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1407	op->above = top->above;
1372		1408
…		…
1375		1411
1376	op->below = top;	1412	op->below = top;
1377	top->above = op;	1413	top->above = op;
1378	}	1414	}
1379		1415
1380	if (op->above == NULL)	1416	if (!op->above)
1381	op->ms ().top = op;	1417	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1418	} /* else not INS_BELOW_ORIGINATOR */
1383		1419
1384	if (op->type == PLAYER)	1420	if (op->type == PLAYER)
		1421	{
1385	op->contr->do_los = 1;	1422	op->contr->do_los = 1;
		1423	++op->map->players;
		1424	op->map->touch ();
		1425	}
		1426
		1427	op->map->dirty = true;
1386		1428
1387	/* If we have a floor, we know the player, if any, will be above	1429	/* If we have a floor, we know the player, if any, will be above
1388	* it, so save a few ticks and start from there.	1430	* it, so save a few ticks and start from there.
1389	*/	1431	*/
1390	if (!(flag & INS_MAP_LOAD))	1432	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1433	if (object *pl = ms.player ())
		1434	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1435	pl->contr->ns->floorbox_update ();
1393		1436
1394	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1441	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1442	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1443	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1444	* of effect may be sufficient.
1402	*/	1445	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1446	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1447	update_all_los (op->map, op->x, op->y);
1405		1448
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
		1451
		1452	INVOKE_OBJECT (INSERT, op);
1408		1453
1409	/* Don't know if moving this to the end will break anything. However,	1454	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1455	* we want to have floorbox_update called before calling this.
1411	*	1456	*
1412	* check_move_on() must be after this because code called from	1457	* check_move_on() must be after this because code called from
…		…
1417		1462
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1464	if (!(flag & INS_NO_WALK_ON) && !op->head)
1420	{	1465	{
1421	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1422	return NULL;	1467	return 0;
1423		1468
1424	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1470	* walk on's.
1426	*/	1471	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1472	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1473	if (check_move_on (tmp, originator))
1429	return NULL;	1474	return 0;
1430	}	1475	}
1431		1476
1432	return op;	1477	return op;
1433	}	1478	}
1434		1479
…		…
1441	{	1486	{
1442	object *tmp, *tmp1;	1487	object *tmp, *tmp1;
1443		1488
1444	/* first search for itself and remove any old instances */	1489	/* first search for itself and remove any old instances */
1445		1490
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1491	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1492	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1448	tmp->destroy ();	1493	tmp->destroy ();
1449		1494
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1495	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1496
1452	tmp1->x = op->x;	1497	tmp1->x = op->x;
1453	tmp1->y = op->y;	1498	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1499	insert_ob_in_map (tmp1, op->map, op, 0);
		1500	}
		1501
		1502	object *
		1503	object::insert_at (object *where, object *originator, int flags)
		1504	{
		1505	return where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1506	}
1456		1507
1457	/*	1508	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1509	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1459	* is returned contains nr objects, and the remaining parts contains	1510	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1511	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1512	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1513	* global static errmsg array.
1463	*/	1514	*/
1464
1465	object *	1515	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1516	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1517	{
1468	object *newob;	1518	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1519	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1500	* the amount of an object. If the amount reaches 0, the object	1550	* the amount of an object. If the amount reaches 0, the object
1501	* is subsequently removed and freed.	1551	* is subsequently removed and freed.
1502	*	1552	*
1503	* Return value: 'op' if something is left, NULL if the amount reached 0	1553	* Return value: 'op' if something is left, NULL if the amount reached 0
1504	*/	1554	*/
1505
1506	object *	1555	object *
1507	decrease_ob_nr (object *op, uint32 i)	1556	decrease_ob_nr (object *op, uint32 i)
1508	{	1557	{
1509	object *tmp;	1558	object *tmp;
1510	player *pl;
1511		1559
1512	if (i == 0) /* objects with op->nrof require this check */	1560	if (i == 0) /* objects with op->nrof require this check */
1513	return op;	1561	return op;
1514		1562
1515	if (i > op->nrof)	1563	if (i > op->nrof)
…		…
1528	* IMO, searching through all the players will mostly	1576	* IMO, searching through all the players will mostly
1529	* likely be quicker than following op->env to the map,	1577	* likely be quicker than following op->env to the map,
1530	* and then searching the map for a player.	1578	* and then searching the map for a player.
1531	*/	1579	*/
1532	if (!tmp)	1580	if (!tmp)
1533	{	1581	for_all_players (pl)
1534	for (pl = first_player; pl; pl = pl->next)
1535	if (pl->ob->container == op->env)	1582	if (pl->ob->container == op->env)
1536	{	1583	{
1537	tmp = pl->ob;	1584	tmp = pl->ob;
1538	break;	1585	break;
1539	}	1586	}
1540	}
1541		1587
1542	if (i < op->nrof)	1588	if (i < op->nrof)
1543	{	1589	{
1544	sub_weight (op->env, op->weight * i);	1590	sub_weight (op->env, op->weight * i);
1545	op->nrof -= i;	1591	op->nrof -= i;
…		…
1588		1634
1589	/*	1635	/*
1590	* add_weight(object, weight) adds the specified weight to an object,	1636	* add_weight(object, weight) adds the specified weight to an object,
1591	* and also updates how much the environment(s) is/are carrying.	1637	* and also updates how much the environment(s) is/are carrying.
1592	*/	1638	*/
1593
1594	void	1639	void
1595	add_weight (object *op, signed long weight)	1640	add_weight (object *op, signed long weight)
1596	{	1641	{
1597	while (op != NULL)	1642	while (op != NULL)
1598	{	1643	{
…		…
1630	* inside the object environment.	1675	* inside the object environment.
1631	*	1676	*
1632	* The function returns now pointer to inserted item, and return value can	1677	* The function returns now pointer to inserted item, and return value can
1633	* be != op, if items are merged. -Tero	1678	* be != op, if items are merged. -Tero
1634	*/	1679	*/
1635
1636	object *	1680	object *
1637	object::insert (object *op)	1681	object::insert (object *op)
1638	{	1682	{
1639	object *tmp, *otmp;	1683	object *tmp, *otmp;
1640		1684
…		…
1695	if ((op->glow_radius != 0) && map)	1739	if ((op->glow_radius != 0) && map)
1696	{	1740	{
1697	#ifdef DEBUG_LIGHTS	1741	#ifdef DEBUG_LIGHTS
1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1742	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699	#endif /* DEBUG_LIGHTS */	1743	#endif /* DEBUG_LIGHTS */
1700	if (MAP_DARKNESS (map))	1744	if (map->darkness)
1701	update_all_los (map, x, y);	1745	update_all_los (map, x, y);
1702	}	1746	}
1703		1747
1704	/* Client has no idea of ordering so lets not bother ordering it here.	1748	/* Client has no idea of ordering so lets not bother ordering it here.
1705	* It sure simplifies this function...	1749	* It sure simplifies this function...
…		…
1710	{	1754	{
1711	op->below = inv;	1755	op->below = inv;
1712	op->below->above = op;	1756	op->below->above = op;
1713	inv = op;	1757	inv = op;
1714	}	1758	}
		1759
		1760	INVOKE_OBJECT (INSERT, this);
1715		1761
1716	return op;	1762	return op;
1717	}	1763	}
1718		1764
1719	/*	1765	/*
…		…
1734	*	1780	*
1735	* MSW 2001-07-08: Check all objects on space, not just those below	1781	* MSW 2001-07-08: Check all objects on space, not just those below
1736	* object being inserted. insert_ob_in_map may not put new objects	1782	* object being inserted. insert_ob_in_map may not put new objects
1737	* on top.	1783	* on top.
1738	*/	1784	*/
1739
1740	int	1785	int
1741	check_move_on (object *op, object *originator)	1786	check_move_on (object *op, object *originator)
1742	{	1787	{
1743	object *tmp;	1788	object *tmp;
1744	maptile *m = op->map;	1789	maptile *m = op->map;
…		…
1771		1816
1772	/* The objects have to be checked from top to bottom.	1817	/* The objects have to be checked from top to bottom.
1773	* Hence, we first go to the top:	1818	* Hence, we first go to the top:
1774	*/	1819	*/
1775		1820
1776	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1821	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1777	{	1822	{
1778	/* Trim the search when we find the first other spell effect	1823	/* Trim the search when we find the first other spell effect
1779	* this helps performance so that if a space has 50 spell objects,	1824	* this helps performance so that if a space has 50 spell objects,
1780	* we don't need to check all of them.	1825	* we don't need to check all of them.
1781	*/	1826	*/
…		…
1799	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1844	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1800	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1845	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1801	{	1846	{
1802		1847
1803	float	1848	float
1804	diff = tmp->move_slow_penalty * FABS (op->speed);	1849	diff = tmp->move_slow_penalty * fabs (op->speed);
1805		1850
1806	if (op->type == PLAYER)	1851	if (op->type == PLAYER)
1807	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1852	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1808	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1853	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1809	diff /= 4.0;	1854	diff /= 4.0;
…		…
1836	/*	1881	/*
1837	* present_arch(arch, map, x, y) searches for any objects with	1882	* present_arch(arch, map, x, y) searches for any objects with
1838	* a matching archetype at the given map and coordinates.	1883	* a matching archetype at the given map and coordinates.
1839	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1840	*/	1885	*/
1841
1842	object *	1886	object *
1843	present_arch (const archetype *at, maptile *m, int x, int y)	1887	present_arch (const archetype *at, maptile *m, int x, int y)
1844	{	1888	{
1845	object *
1846	tmp;
1847
1848	if (m == NULL || out_of_map (m, x, y))	1889	if (!m || out_of_map (m, x, y))
1849	{	1890	{
1850	LOG (llevError, "Present_arch called outside map.\n");	1891	LOG (llevError, "Present_arch called outside map.\n");
1851	return NULL;	1892	return NULL;
1852	}	1893	}
1853	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1894
		1895	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1854	if (tmp->arch == at)	1896	if (tmp->arch == at)
1855	return tmp;	1897	return tmp;
		1898
1856	return NULL;	1899	return NULL;
1857	}	1900	}
1858		1901
1859	/*	1902	/*
1860	* present(type, map, x, y) searches for any objects with	1903	* present(type, map, x, y) searches for any objects with
1861	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
1862	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
1863	*/	1906	*/
1864
1865	object *	1907	object *
1866	present (unsigned char type, maptile *m, int x, int y)	1908	present (unsigned char type, maptile *m, int x, int y)
1867	{	1909	{
1868	object *
1869	tmp;
1870
1871	if (out_of_map (m, x, y))	1910	if (out_of_map (m, x, y))
1872	{	1911	{
1873	LOG (llevError, "Present called outside map.\n");	1912	LOG (llevError, "Present called outside map.\n");
1874	return NULL;	1913	return NULL;
1875	}	1914	}
1876	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1915
		1916	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1917	if (tmp->type == type)
1878	return tmp;	1918	return tmp;
		1919
1879	return NULL;	1920	return NULL;
1880	}	1921	}
1881		1922
1882	/*	1923	/*
1883	* present_in_ob(type, object) searches for any objects with	1924	* present_in_ob(type, object) searches for any objects with
1884	* a matching type variable in the inventory of the given object.	1925	* a matching type variable in the inventory of the given object.
1885	* The first matching object is returned, or NULL if none.	1926	* The first matching object is returned, or NULL if none.
1886	*/	1927	*/
1887
1888	object *	1928	object *
1889	present_in_ob (unsigned char type, const object *op)	1929	present_in_ob (unsigned char type, const object *op)
1890	{	1930	{
1891	object *
1892	tmp;
1893
1894	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1931	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895	if (tmp->type == type)	1932	if (tmp->type == type)
1896	return tmp;	1933	return tmp;
		1934
1897	return NULL;	1935	return NULL;
1898	}	1936	}
1899		1937
1900	/*	1938	/*
1901	* present_in_ob (type, str, object) searches for any objects with	1939	* present_in_ob (type, str, object) searches for any objects with
…		…
1909	* str is the string to match against. Note that we match against	1947	* str is the string to match against. Note that we match against
1910	* the object name, not the archetype name. this is so that the	1948	* the object name, not the archetype name. this is so that the
1911	* spell code can use one object type (force), but change it's name	1949	* spell code can use one object type (force), but change it's name
1912	* to be unique.	1950	* to be unique.
1913	*/	1951	*/
1914
1915	object *	1952	object *
1916	present_in_ob_by_name (int type, const char *str, const object *op)	1953	present_in_ob_by_name (int type, const char *str, const object *op)
1917	{	1954	{
1918	object *
1919	tmp;
1920
1921	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1955	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922	{
1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1956	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924	return tmp;	1957	return tmp;
1925	}	1958
1926	return NULL;	1959	return 0;
1927	}	1960	}
1928		1961
1929	/*	1962	/*
1930	* present_arch_in_ob(archetype, object) searches for any objects with	1963	* present_arch_in_ob(archetype, object) searches for any objects with
1931	* a matching archetype in the inventory of the given object.	1964	* a matching archetype in the inventory of the given object.
1932	* The first matching object is returned, or NULL if none.	1965	* The first matching object is returned, or NULL if none.
1933	*/	1966	*/
1934
1935	object *	1967	object *
1936	present_arch_in_ob (const archetype *at, const object *op)	1968	present_arch_in_ob (const archetype *at, const object *op)
1937	{	1969	{
1938	object *
1939	tmp;
1940
1941	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942	if (tmp->arch == at)	1971	if (tmp->arch == at)
1943	return tmp;	1972	return tmp;
		1973
1944	return NULL;	1974	return NULL;
1945	}	1975	}
1946		1976
1947	/*	1977	/*
1948	* activate recursively a flag on an object inventory	1978	* activate recursively a flag on an object inventory
1949	*/	1979	*/
1950	void	1980	void
1951	flag_inv (object *op, int flag)	1981	flag_inv (object *op, int flag)
1952	{	1982	{
1953	object *
1954	tmp;
1955
1956	if (op->inv)	1983	if (op->inv)
1957	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1984	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958	{	1985	{
1959	SET_FLAG (tmp, flag);	1986	SET_FLAG (tmp, flag);
1960	flag_inv (tmp, flag);	1987	flag_inv (tmp, flag);
1961	}	1988	}
1962	} /*	1989	}
		1990
		1991	/*
1963	* desactivate recursively a flag on an object inventory	1992	* deactivate recursively a flag on an object inventory
1964	*/	1993	*/
1965	void	1994	void
1966	unflag_inv (object *op, int flag)	1995	unflag_inv (object *op, int flag)
1967	{	1996	{
1968	object *
1969	tmp;
1970
1971	if (op->inv)	1997	if (op->inv)
1972	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1998	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973	{	1999	{
1974	CLEAR_FLAG (tmp, flag);	2000	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	2001	unflag_inv (tmp, flag);
1976	}	2002	}
1977	}	2003	}
…		…
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	2006	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).	2007	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for	2008	* If checksums are used, a player will get set_cheat called for
1983	* him/her-self and all object carried by a call to this function.	2009	* him/her-self and all object carried by a call to this function.
1984	*/	2010	*/
1985
1986	void	2011	void
1987	set_cheat (object *op)	2012	set_cheat (object *op)
1988	{	2013	{
1989	SET_FLAG (op, FLAG_WAS_WIZ);	2014	SET_FLAG (op, FLAG_WAS_WIZ);
1990	flag_inv (op, FLAG_WAS_WIZ);	2015	flag_inv (op, FLAG_WAS_WIZ);
…		…
2009	* because arch_blocked (now ob_blocked) needs to know the movement type	2034	* because arch_blocked (now ob_blocked) needs to know the movement type
2010	* to know if the space in question will block the object. We can't use	2035	* to know if the space in question will block the object. We can't use
2011	* the archetype because that isn't correct if the monster has been	2036	* the archetype because that isn't correct if the monster has been
2012	* customized, changed states, etc.	2037	* customized, changed states, etc.
2013	*/	2038	*/
2014
2015	int	2039	int
2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2040	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017	{	2041	{
2018	int
2019	i,
2020	index = 0, flag;	2042	int index = 0, flag;
2021	static int
2022	altern[SIZEOFFREE];	2043	int altern[SIZEOFFREE];
2023		2044
2024	for (i = start; i < stop; i++)	2045	for (int i = start; i < stop; i++)
2025	{	2046	{
2026	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2047	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027	if (!flag)	2048	if (!flag)
2028	altern[index++] = i;	2049	altern [index++] = i;
2029		2050
2030	/* Basically, if we find a wall on a space, we cut down the search size.	2051	/* Basically, if we find a wall on a space, we cut down the search size.
2031	* In this way, we won't return spaces that are on another side of a wall.	2052	* In this way, we won't return spaces that are on another side of a wall.
2032	* This mostly work, but it cuts down the search size in all directions -	2053	* This mostly work, but it cuts down the search size in all directions -
2033	* if the space being examined only has a wall to the north and empty	2054	* if the space being examined only has a wall to the north and empty
…		…
2040	}	2061	}
2041		2062
2042	if (!index)	2063	if (!index)
2043	return -1;	2064	return -1;
2044		2065
2045	return altern[RANDOM () % index];	2066	return altern [rndm (index)];
2046	}	2067	}
2047		2068
2048	/*	2069	/*
2049	* find_first_free_spot(archetype, maptile, x, y) works like	2070	* find_first_free_spot(archetype, maptile, x, y) works like
2050	* find_free_spot(), but it will search max number of squares.	2071	* find_free_spot(), but it will search max number of squares.
2051	* But it will return the first available spot, not a random choice.	2072	* But it will return the first available spot, not a random choice.
2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2073	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2053	*/	2074	*/
2054
2055	int	2075	int
2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2076	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057	{	2077	{
2058	int
2059	i;
2060
2061	for (i = 0; i < SIZEOFFREE; i++)	2078	for (int i = 0; i < SIZEOFFREE; i++)
2062	{
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2079	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2080	return i;
2065	}	2081
2066	return -1;	2082	return -1;
2067	}	2083	}
2068		2084
2069	/*	2085	/*
2070	* The function permute(arr, begin, end) randomly reorders the array	2086	* The function permute(arr, begin, end) randomly reorders the array
2071	* arr[begin..end-1].	2087	* arr[begin..end-1].
		2088	* now uses a fisher-yates shuffle, old permute was broken
2072	*/	2089	*/
2073	static void	2090	static void
2074	permute (int *arr, int begin, int end)	2091	permute (int *arr, int begin, int end)
2075	{	2092	{
2076	int	2093	arr += begin;
2077	i,
2078	j,
2079	tmp,
2080	len;
2081
2082	len = end - begin;	2094	end -= begin;
2083	for (i = begin; i < end; i++)
2084	{
2085	j = begin + RANDOM () % len;
2086		2095
2087	tmp = arr[i];	2096	while (--end)
2088	arr[i] = arr[j];	2097	swap (arr [end], arr [rndm (end + 1)]);
2089	arr[j] = tmp;
2090	}
2091	}	2098	}
2092		2099
2093	/* new function to make monster searching more efficient, and effective!	2100	/* new function to make monster searching more efficient, and effective!
2094	* This basically returns a randomized array (in the passed pointer) of	2101	* This basically returns a randomized array (in the passed pointer) of
2095	* the spaces to find monsters. In this way, it won't always look for	2102	* the spaces to find monsters. In this way, it won't always look for
…		…
2098	* the 3x3 area will be searched, just not in a predictable order.	2105	* the 3x3 area will be searched, just not in a predictable order.
2099	*/	2106	*/
2100	void	2107	void
2101	get_search_arr (int *search_arr)	2108	get_search_arr (int *search_arr)
2102	{	2109	{
2103	int	2110	int i;
2104	i;
2105		2111
2106	for (i = 0; i < SIZEOFFREE; i++)	2112	for (i = 0; i < SIZEOFFREE; i++)
2107	{
2108	search_arr[i] = i;	2113	search_arr[i] = i;
2109	}
2110		2114
2111	permute (search_arr, 1, SIZEOFFREE1 + 1);	2115	permute (search_arr, 1, SIZEOFFREE1 + 1);
2112	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2116	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2117	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114	}	2118	}
…		…
2123	* Perhaps incorrectly, but I'm making the assumption that exclude	2127	* Perhaps incorrectly, but I'm making the assumption that exclude
2124	* is actually want is going to try and move there. We need this info	2128	* is actually want is going to try and move there. We need this info
2125	* because we have to know what movement the thing looking to move	2129	* because we have to know what movement the thing looking to move
2126	* there is capable of.	2130	* there is capable of.
2127	*/	2131	*/
2128
2129	int	2132	int
2130	find_dir (maptile *m, int x, int y, object *exclude)	2133	find_dir (maptile *m, int x, int y, object *exclude)
2131	{	2134	{
2132	int
2133	i,
2134	max = SIZEOFFREE, mflags;	2135	int i, max = SIZEOFFREE, mflags;
2135		2136
2136	sint16 nx, ny;	2137	sint16 nx, ny;
2137	object *	2138	object *tmp;
2138	tmp;
2139	maptile *	2139	maptile *mp;
2140	mp;
2141		2140
2142	MoveType blocked, move_type;	2141	MoveType blocked, move_type;
2143		2142
2144	if (exclude && exclude->head)	2143	if (exclude && exclude->head)
2145	{	2144	{
…		…
2162		2161
2163	if (mflags & P_OUT_OF_MAP)	2162	if (mflags & P_OUT_OF_MAP)
2164	max = maxfree[i];	2163	max = maxfree[i];
2165	else	2164	else
2166	{	2165	{
2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2166	mapspace &ms = mp->at (nx, ny);
		2167
		2168	blocked = ms.move_block;
2168		2169
2169	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2170	max = maxfree[i];	2171	max = maxfree[i];
2171	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2172	{	2173	{
2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2174	for (tmp = ms.bot; tmp; tmp = tmp->above)
2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2175	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2176	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2175	break;	2177	break;
2176		2178
2177	if (tmp)	2179	if (tmp)
2178	return freedir[i];	2180	return freedir[i];
2179	}	2181	}
…		…
2185		2187
2186	/*	2188	/*
2187	* distance(object 1, object 2) will return the square of the	2189	* distance(object 1, object 2) will return the square of the
2188	* distance between the two given objects.	2190	* distance between the two given objects.
2189	*/	2191	*/
2190
2191	int	2192	int
2192	distance (const object *ob1, const object *ob2)	2193	distance (const object *ob1, const object *ob2)
2193	{	2194	{
2194	int i;
2195
2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2195	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197	return i;
2198	}	2196	}
2199		2197
2200	/*	2198	/*
2201	* find_dir_2(delta-x,delta-y) will return a direction in which	2199	* find_dir_2(delta-x,delta-y) will return a direction in which
2202	* an object which has subtracted the x and y coordinates of another	2200	* an object which has subtracted the x and y coordinates of another
2203	* object, needs to travel toward it.	2201	* object, needs to travel toward it.
2204	*/	2202	*/
2205
2206	int	2203	int
2207	find_dir_2 (int x, int y)	2204	find_dir_2 (int x, int y)
2208	{	2205	{
2209	int q;	2206	int q;
2210		2207
…		…
2239		2236
2240	return 3;	2237	return 3;
2241	}	2238	}
2242		2239
2243	/*	2240	/*
2244	* absdir(int): Returns a number between 1 and 8, which represent
2245	* the "absolute" direction of a number (it actually takes care of
2246	* "overflow" in previous calculations of a direction).
2247	*/
2248
2249	int
2250	absdir (int d)
2251	{
2252	while (d < 1)
2253	d += 8;
2254	while (d > 8)
2255	d -= 8;
2256	return d;
2257	}
2258
2259	/*
2260	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2241	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2261	* between two directions (which are expected to be absolute (see absdir())	2242	* between two directions (which are expected to be absolute (see absdir())
2262	*/	2243	*/
2263
2264	int	2244	int
2265	dirdiff (int dir1, int dir2)	2245	dirdiff (int dir1, int dir2)
2266	{	2246	{
2267	int	2247	int d;
2268	d;
2269		2248
2270	d = abs (dir1 - dir2);	2249	d = abs (dir1 - dir2);
2271	if (d > 4)	2250	if (d > 4)
2272	d = 8 - d;	2251	d = 8 - d;
		2252
2273	return d;	2253	return d;
2274	}	2254	}
2275		2255
2276	/* peterm:	2256	/* peterm:
2277	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2257	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2280	* This basically means that if direction is 15, then it could either go	2260	* This basically means that if direction is 15, then it could either go
2281	* direction 4, 14, or 16 to get back to where we are.	2261	* direction 4, 14, or 16 to get back to where we are.
2282	* Moved from spell_util.c to object.c with the other related direction	2262	* Moved from spell_util.c to object.c with the other related direction
2283	* functions.	2263	* functions.
2284	*/	2264	*/
2285
2286	int
2287	reduction_dir[SIZEOFFREE][3] = {	2265	int reduction_dir[SIZEOFFREE][3] = {
2288	{0, 0, 0}, /* 0 */	2266	{0, 0, 0}, /* 0 */
2289	{0, 0, 0}, /* 1 */	2267	{0, 0, 0}, /* 1 */
2290	{0, 0, 0}, /* 2 */	2268	{0, 0, 0}, /* 2 */
2291	{0, 0, 0}, /* 3 */	2269	{0, 0, 0}, /* 3 */
2292	{0, 0, 0}, /* 4 */	2270	{0, 0, 0}, /* 4 */
…		…
2436	insert_ob_in_ob (object_create_clone (item), dst);	2414	insert_ob_in_ob (object_create_clone (item), dst);
2437		2415
2438	return dst;	2416	return dst;
2439	}	2417	}
2440		2418
2441	/* GROS - Creates an object using a string representing its content. */
2442	/* Basically, we save the content of the string to a temp file, then call */
2443	/* load_object on it. I admit it is a highly inefficient way to make things, */
2444	/* but it was simple to make and allows reusing the load_object function. */
2445	/* Remember not to use load_object_str in a time-critical situation. */
2446	/* Also remember that multiparts objects are not supported for now. */
2447
2448	object *
2449	load_object_str (const char *obstr)
2450	{
2451	object *op;
2452	char filename[MAX_BUF];
2453
2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2455
2456	FILE *tempfile = fopen (filename, "w");
2457
2458	if (tempfile == NULL)
2459	{
2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2461	return NULL;
2462	}
2463
2464	fprintf (tempfile, obstr);
2465	fclose (tempfile);
2466
2467	op = object::create ();
2468
2469	object_thawer thawer (filename);
2470
2471	if (thawer)
2472	load_object (thawer, op, 0);
2473
2474	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2475	CLEAR_FLAG (op, FLAG_REMOVED);
2476
2477	return op;
2478	}
2479
2480	/* This returns the first object in who's inventory that	2419	/* This returns the first object in who's inventory that
2481	* has the same type and subtype match.	2420	* has the same type and subtype match.
2482	* returns NULL if no match.	2421	* returns NULL if no match.
2483	*/	2422	*/
2484	object *	2423	object *
2485	find_obj_by_type_subtype (const object *who, int type, int subtype)	2424	find_obj_by_type_subtype (const object *who, int type, int subtype)
2486	{	2425	{
2487	object *tmp;
2488
2489	for (tmp = who->inv; tmp; tmp = tmp->below)	2426	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490	if (tmp->type == type && tmp->subtype == subtype)	2427	if (tmp->type == type && tmp->subtype == subtype)
2491	return tmp;	2428	return tmp;
2492		2429
2493	return NULL;	2430	return 0;
2494	}	2431	}
2495		2432
2496	/* If ob has a field named key, return the link from the list,	2433	/* If ob has a field named key, return the link from the list,
2497	* otherwise return NULL.	2434	* otherwise return NULL.
2498	*	2435	*
…		…
2500	* do the desired thing.	2437	* do the desired thing.
2501	*/	2438	*/
2502	key_value *	2439	key_value *
2503	get_ob_key_link (const object *ob, const char *key)	2440	get_ob_key_link (const object *ob, const char *key)
2504	{	2441	{
2505	key_value *link;
2506
2507	for (link = ob->key_values; link != NULL; link = link->next)	2442	for (key_value *link = ob->key_values; link; link = link->next)
2508	if (link->key == key)	2443	if (link->key == key)
2509	return link;	2444	return link;
2510		2445
2511	return NULL;	2446	return 0;
2512	}	2447	}
2513		2448
2514	/*	2449	/*
2515	* Returns the value of op has an extra_field for key, or NULL.	2450	* Returns the value of op has an extra_field for key, or NULL.
2516	*	2451	*
…		…
2541	if (link->key == canonical_key)	2476	if (link->key == canonical_key)
2542	return link->value;	2477	return link->value;
2543		2478
2544	return 0;	2479	return 0;
2545	}	2480	}
2546
2547		2481
2548	/*	2482	/*
2549	* Updates the canonical_key in op to value.	2483	* Updates the canonical_key in op to value.
2550	*	2484	*
2551	* canonical_key is a shared string (value doesn't have to be).	2485	* canonical_key is a shared string (value doesn't have to be).
…		…
2556	* Returns TRUE on success.	2490	* Returns TRUE on success.
2557	*/	2491	*/
2558	int	2492	int
2559	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2493	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560	{	2494	{
2561	key_value *
2562	field = NULL, *last = NULL;	2495	key_value *field = NULL, *last = NULL;
2563		2496
2564	for (field = op->key_values; field != NULL; field = field->next)	2497	for (field = op->key_values; field != NULL; field = field->next)
2565	{	2498	{
2566	if (field->key != canonical_key)	2499	if (field->key != canonical_key)
2567	{	2500	{
…		…
2595	/* IF we get here, key doesn't exist */	2528	/* IF we get here, key doesn't exist */
2596		2529
2597	/* No field, we'll have to add it. */	2530	/* No field, we'll have to add it. */
2598		2531
2599	if (!add_key)	2532	if (!add_key)
2600	{
2601	return FALSE;	2533	return FALSE;
2602	}	2534
2603	/* There isn't any good reason to store a null	2535	/* There isn't any good reason to store a null
2604	* value in the key/value list. If the archetype has	2536	* value in the key/value list. If the archetype has
2605	* this key, then we should also have it, so shouldn't	2537	* this key, then we should also have it, so shouldn't
2606	* be here. If user wants to store empty strings,	2538	* be here. If user wants to store empty strings,
2607	* should pass in ""	2539	* should pass in ""
…		…
2656	}	2588	}
2657	else	2589	else
2658	item = item->env;	2590	item = item->env;
2659	}	2591	}
2660		2592
		2593
		2594	const char *
		2595	object::flag_desc (char *desc, int len) const
		2596	{
		2597	char *p = desc;
		2598	bool first = true;
		2599
		2600	*p = 0;
		2601
		2602	for (int i = 0; i < NUM_FLAGS; i++)
		2603	{
		2604	if (len <= 10) // magic constant!
		2605	{
		2606	snprintf (p, len, ",...");
		2607	break;
		2608	}
		2609
		2610	if (flag [i])
		2611	{
		2612	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2613	len -= cnt;
		2614	p += cnt;
		2615	first = false;
		2616	}
		2617	}
		2618
		2619	return desc;
		2620	}
		2621
2661	// return a suitable string describing an objetc in enough detail to find it	2622	// return a suitable string describing an object in enough detail to find it
2662	const char *	2623	const char *
2663	object::debug_desc (char *info) const	2624	object::debug_desc (char *info) const
2664	{	2625	{
		2626	char flagdesc[512];
2665	char info2[256 * 3];	2627	char info2[256 * 4];
2666	char *p = info;	2628	char *p = info;
2667		2629
2668	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2630	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2669	count,	2631	count, uuid.seq,
2670	&name,	2632	&name,
2671	title ? " " : "",	2633	title ? "\",title:\"" : "",
2672	title ? (const char *)title : "");	2634	title ? (const char *)title : "",
		2635	flag_desc (flagdesc, 512), type);
2673		2636
2674	if (env)	2637	if (env)
2675	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2638	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2676		2639
2677	if (map)	2640	if (map)
2678	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2641	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2679		2642
2680	return info;	2643	return info;
2681	}	2644	}
2682		2645
2683	const char *	2646	const char *
2684	object::debug_desc () const	2647	object::debug_desc () const
2685	{	2648	{
2686	static char info[256 * 3];	2649	static char info[3][256 * 4];
		2650	static int info_idx;
		2651
2687	return debug_desc (info);	2652	return debug_desc (info [++info_idx % 3]);
2688	}	2653	}
2689		2654
		2655	struct region *
		2656	object::region () const
		2657	{
		2658	return map ? map->region (x, y)
		2659	: region::default_region ();
		2660	}
		2661
		2662	const materialtype_t *
		2663	object::dominant_material () const
		2664	{
		2665	if (materialtype_t *mat = name_to_material (materialname))
		2666	return mat;
		2667
		2668	// omfg this is slow, this has to be temporary :)
		2669	shstr unknown ("unknown");
		2670
		2671	return name_to_material (unknown);
		2672	}
		2673
		2674	void
		2675	object::open_container (object *new_container)
		2676	{
		2677	if (container == new_container)
		2678	return;
		2679
		2680	if (object *old_container = container)
		2681	{
		2682	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2683	return;
		2684
		2685	#if 0
		2686	// remove the "Close old_container" object.
		2687	if (object *closer = old_container->inv)
		2688	if (closer->type == CLOSE_CON)
		2689	closer->destroy ();
		2690	#endif
		2691
		2692	old_container->flag [FLAG_APPLIED] = 0;
		2693	container = 0;
		2694
		2695	esrv_update_item (UPD_FLAGS, this, old_container);
		2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2697	}
		2698
		2699	if (new_container)
		2700	{
		2701	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2702	return;
		2703
		2704	// TODO: this does not seem to serve any purpose anymore?
		2705	#if 0
		2706	// insert the "Close Container" object.
		2707	if (archetype *closer = new_container->other_arch)
		2708	{
		2709	object *closer = arch_to_object (new_container->other_arch);
		2710	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2711	new_container->insert (closer);
		2712	}
		2713	#endif
		2714
		2715	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2716
		2717	new_container->flag [FLAG_APPLIED] = 1;
		2718	container = new_container;
		2719
		2720	esrv_update_item (UPD_FLAGS, this, new_container);
		2721	esrv_send_inventory (this, new_container);
		2722	}
		2723	}
		2724
		2725

Diff Legend

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