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.112 by root, Mon Jan 8 14:11:04 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
…		…
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
482	{	481	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
485		484
486	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
487
488	if (self || cb)
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
490		486
491	if (is_freed)	487	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
493		489
494	if (is_removed)	490	if (is_removed)
…		…
525	tail = new_link;	521	tail = new_link;
526	}	522	}
527	}	523	}
528	}	524	}
529		525
530	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
531	}	527	}
532		528
533	object *	529	object *
534	object::clone ()	530	object::clone ()
535	{	531	{
…		…
541	/*	537	/*
542	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* 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	539	* 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.	540	* be called to update the face variable, _and_ how it looks on the map.
545	*/	541	*/
546
547	void	542	void
548	update_turn_face (object *op)	543	update_turn_face (object *op)
549	{	544	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	546	return;
		547
552	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
554	}	550	}
555		551
556	/*	552	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	553	* 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.	554	* 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.	555	* This function needs to be called whenever the speed of an object changes.
560	*/	556	*/
561	void	557	void
562	update_ob_speed (object *op)	558	object::set_speed (float speed)
563	{	559	{
564	extern int arch_init;	560	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	{	561	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	563	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	564	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		565
589	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		567
593	if (op->active_next != NULL)	568	if (has_active_speed ())
594	op->active_next->active_prev = op;	569	activate ();
595
596	active_objects = op;
597	}
598	else	570	else
599	{	571	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	}	572	}
654		573
655	/*	574	/*
656	* update_object() updates the the map.	575	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
694	*/	613	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	615	return;
697		616
698	/* make sure the object is within map boundaries */	617	/* 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))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	619	{
701	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	621	#ifdef MANY_CORES
703	abort ();	622	abort ();
704	#endif	623	#endif
705	return;	624	return;
706	}	625	}
707		626
708	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
709		628
710	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	630	/* nop */;
712	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
713	{	632	{
714	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	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	643	/* This isn't perfect, but I don't expect a lot of objects to
725	* to have move_allow right now.	644	* to have move_allow right now.
726	*/	645	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	646	|| ((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)	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
730	}	649	}
731	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	652	* that is being removed.
734	*/	653	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
739	else	658	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		660
742	if (op->more)	661	if (op->more)
743	update_object (op->more, action);	662	update_object (op->more, action);
744	}	663	}
745		664
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;	665	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		666
762	object::object ()	667	object::object ()
763	{	668	{
764	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
765		670
…		…
770	object::~object ()	675	object::~object ()
771	{	676	{
772	free_key_values (this);	677	free_key_values (this);
773	}	678	}
774		679
		680	static int object_count;
		681
775	void object::link ()	682	void object::link ()
776	{	683	{
777	count = ++ob_count;	684	assert (!index);//D
778	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
779		687
780	prev = 0;	688	refcnt_inc ();
781	next = object::first;	689	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	690	}
788		691
789	void object::unlink ()	692	void object::unlink ()
790	{	693	{
791	if (this == object::first)	694	assert (index);//D
792	object::first = next;	695	objects.erase (this);
		696	refcnt_dec ();
		697	}
793		698
794	/* Remove this object from the list of used objects */	699	void
795	if (prev) prev->next = next;	700	object::activate ()
796	if (next) next->prev = prev;	701	{
		702	/* If already on active list, don't do anything */
		703	if (active)
		704	return;
797		705
798	prev = 0;	706	if (has_active_speed ())
799	next = 0;	707	actives.insert (this);
		708	}
		709
		710	void
		711	object::activate_recursive ()
		712	{
		713	activate ();
		714
		715	for (object *op = inv; op; op = op->below)
		716	op->activate_recursive ();
		717	}
		718
		719	/* This function removes object 'op' from the list of active
		720	* objects.
		721	* This should only be used for style maps or other such
		722	* reference maps where you don't want an object that isn't
		723	* in play chewing up cpu time getting processed.
		724	* The reverse of this is to call update_ob_speed, which
		725	* will do the right thing based on the speed of the object.
		726	*/
		727	void
		728	object::deactivate ()
		729	{
		730	/* If not on the active list, nothing needs to be done */
		731	if (!active)
		732	return;
		733
		734	actives.erase (this);
		735	}
		736
		737	void
		738	object::deactivate_recursive ()
		739	{
		740	for (object *op = inv; op; op = op->below)
		741	op->deactivate_recursive ();
		742
		743	deactivate ();
		744	}
		745
		746	void
		747	object::set_flag_inv (int flag, int value)
		748	{
		749	for (object *op = inv; op; op = op->below)
		750	{
		751	op->flag [flag] = value;
		752	op->set_flag_inv (flag, value);
		753	}
		754	}
		755
		756	/*
		757	* Remove and free all objects in the inventory of the given object.
		758	* object.c ?
		759	*/
		760	void
		761	object::destroy_inv (bool drop_to_ground)
		762	{
		763	// need to check first, because the checks below might segfault
		764	// as we might be on an invalid mapspace and crossfire code
		765	// is too buggy to ensure that the inventory is empty.
		766	// corollary: if you create arrows etc. with stuff in tis inventory,
		767	// cf will crash below with off-map x and y
		768	if (!inv)
		769	return;
		770
		771	/* Only if the space blocks everything do we not process -
		772	* if some form of movement is allowed, let objects
		773	* drop on that space.
		774	*/
		775	if (!drop_to_ground
		776	|| !map
		777	|| map->in_memory != MAP_IN_MEMORY
		778	|| ms ().move_block == MOVE_ALL)
		779	{
		780	while (inv)
		781	{
		782	inv->destroy_inv (drop_to_ground);
		783	inv->destroy ();
		784	}
		785	}
		786	else
		787	{ /* Put objects in inventory onto this space */
		788	while (inv)
		789	{
		790	object *op = inv;
		791
		792	if (op->flag [FLAG_STARTEQUIP]
		793	|| op->flag [FLAG_NO_DROP]
		794	|| op->type == RUNE
		795	|| op->type == TRAP
		796	|| op->flag [FLAG_IS_A_TEMPLATE]
		797	|| op->flag [FLAG_DESTROY_ON_DEATH])
		798	op->destroy ();
		799	else
		800	map->insert (op, x, y);
		801	}
		802	}
800	}	803	}
801		804
802	object *object::create ()	805	object *object::create ()
803	{	806	{
804	object *op = new object;	807	object *op = new object;
805	op->link ();	808	op->link ();
806	return op;	809	return op;
807	}	810	}
808		811
809	/*	812	void
810	* free_object() frees everything allocated by an object, removes	813	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	{	814	{
821	if (QUERY_FLAG (this, FLAG_FREED))	815	attachable::do_destroy ();
822	return;
823		816
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	817	if (flag [FLAG_IS_LINKED])
		818	remove_button_link (this);
		819
		820	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	821	remove_friendly_object (this);
826		822
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	823	if (!flag [FLAG_REMOVED])
828	remove ();	824	remove ();
829		825
830	SET_FLAG (this, FLAG_FREED);	826	destroy_inv (true);
831		827
832	if (more)	828	deactivate ();
833	{	829	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		830
838	if (inv)	831	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		832
880	// hack to ensure that freed objects still have a valid map	833	// hack to ensure that freed objects still have a valid map
881	{	834	{
882	static maptile *freed_map; // freed objects are moved here to avoid crashes	835	static maptile *freed_map; // freed objects are moved here to avoid crashes
883		836
…		…
887		840
888	freed_map->name = "/internal/freed_objects_map";	841	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	842	freed_map->width = 3;
890	freed_map->height = 3;	843	freed_map->height = 3;
891		844
892	freed_map->allocate ();	845	freed_map->alloc ();
		846	freed_map->in_memory = MAP_IN_MEMORY;
893	}	847	}
894		848
895	map = freed_map;	849	map = freed_map;
896	x = 1;	850	x = 1;
897	y = 1;	851	y = 1;
898	}	852	}
899		853
		854	head = 0;
		855
		856	if (more)
		857	{
		858	more->destroy ();
		859	more = 0;
		860	}
		861
900	// clear those pointers that likely might have circular references to us	862	// clear those pointers that likely might have circular references to us
901	owner = 0;	863	owner = 0;
902	enemy = 0;	864	enemy = 0;
903	attacked_by = 0;	865	attacked_by = 0;
		866	}
904		867
905	// only relevant for players(?), but make sure of it anyways	868	void
906	contr = 0;	869	object::destroy (bool destroy_inventory)
		870	{
		871	if (destroyed ())
		872	return;
907		873
908	/* Remove object from the active list */	874	if (destroy_inventory)
909	speed = 0;	875	destroy_inv (false);
910	update_ob_speed (this);
911		876
912	unlink ();	877	attachable::destroy ();
913
914	mortals.push_back (this);
915	}	878	}
916		879
917	/*	880	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	881	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	882	* weight of an object (and what is carried by it's environment(s)).
…		…
943	object::remove ()	906	object::remove ()
944	{	907	{
945	object *tmp, *last = 0;	908	object *tmp, *last = 0;
946	object *otmp;	909	object *otmp;
947		910
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	911	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	912	return;
952		913
953	SET_FLAG (this, FLAG_REMOVED);	914	SET_FLAG (this, FLAG_REMOVED);
		915	INVOKE_OBJECT (REMOVE, this);
954		916
955	if (more)	917	if (more)
956	more->remove ();	918	more->remove ();
957		919
958	/*	920	/*
…		…
971	* to save cpu time.	933	* to save cpu time.
972	*/	934	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	935	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	936	otmp->update_stats ();
975		937
976	if (above != NULL)	938	if (above)
977	above->below = below;	939	above->below = below;
978	else	940	else
979	env->inv = below;	941	env->inv = below;
980		942
981	if (below != NULL)	943	if (below)
982	below->above = above;	944	below->above = above;
983		945
984	/* we set up values so that it could be inserted into	946	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	947	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	948	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	952	above = 0, below = 0;
991	env = 0;	953	env = 0;
992	}	954	}
993	else if (map)	955	else if (map)
994	{	956	{
995	/* Re did the following section of code - it looks like it had	957	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	958	{
		959	--map->players;
		960	map->touch ();
		961	}
		962
		963	map->dirty = true;
998		964
999	/* link the object above us */	965	/* link the object above us */
1000	if (above)	966	if (above)
1001	above->below = below;	967	above->below = below;
1002	else	968	else
…		…
1020	dump = dump_object (GET_MAP_OB (map, x, y));	986	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);	987	LOG (llevError, "%s\n", dump);
1022	free (dump);	988	free (dump);
1023	}	989	}
1024		990
1025	map->at (x, y).bottom = above; /* goes on above it. */	991	map->at (x, y).bot = above; /* goes on above it. */
1026	}	992	}
1027		993
1028	above = 0;	994	above = 0;
1029	below = 0;	995	below = 0;
1030		996
1031	if (map->in_memory == MAP_SAVING)	997	if (map->in_memory == MAP_SAVING)
1032	return;	998	return;
1033		999
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1000	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1001
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1002	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1037	{	1003	{
1038	/* No point updating the players look faces if he is the object	1004	/* No point updating the players look faces if he is the object
1039	* being removed.	1005	* being removed.
1040	*/	1006	*/
1041		1007
…		…
1045	* removed (most likely destroyed), update the player view	1011	* removed (most likely destroyed), update the player view
1046	* appropriately.	1012	* appropriately.
1047	*/	1013	*/
1048	if (tmp->container == this)	1014	if (tmp->container == this)
1049	{	1015	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);	1016	flag [FLAG_APPLIED] = 0;
1051	tmp->container = 0;	1017	tmp->container = 0;
1052	}	1018	}
1053		1019
		1020	if (tmp->contr->ns)
1054	tmp->contr->ns->floorbox_update ();	1021	tmp->contr->ns->floorbox_update ();
1055	}	1022	}
1056		1023
1057	/* See if player moving off should effect something */	1024	/* See if object moving off should effect something */
1058	if (check_walk_off	1025	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1026	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1027	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1028	{
1062	move_apply (tmp, this, 0);	1029	move_apply (tmp, this, 0);
…		…
1064	if (destroyed ())	1031	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1032	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1033	}
1067		1034
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1035	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069		1036	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1070	if (tmp->above == tmp)	1037	if (tmp->above == tmp)
1071	tmp->above = 0;	1038	tmp->above = 0;
1072		1039
1073	last = tmp;	1040	last = tmp;
1074	}	1041	}
1075		1042
1076	/* last == NULL of there are no objects on this space */	1043	/* last == NULL if there are no objects on this space */
		1044	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1045	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1046	map->at (x, y).flags_ = 0;
1079	else	1047	else
1080	update_object (last, UP_OBJ_REMOVE);	1048	update_object (last, UP_OBJ_REMOVE);
1081		1049
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1050	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1051	update_all_los (map, x, y);
1084	}	1052	}
1085	}	1053	}
1086		1054
1087	/*	1055	/*
…		…
1096	merge_ob (object *op, object *top)	1064	merge_ob (object *op, object *top)
1097	{	1065	{
1098	if (!op->nrof)	1066	if (!op->nrof)
1099	return 0;	1067	return 0;
1100		1068
1101	if (top == NULL)	1069	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1070	for (top = op; top && top->above; top = top->above)
		1071	;
1103		1072
1104	for (; top != NULL; top = top->below)	1073	for (; top; top = top->below)
1105	{	1074	{
1106	if (top == op)	1075	if (top == op)
1107	continue;	1076	continue;
1108		1077
1109	if (object::can_merge (op, top))	1078	if (object::can_merge (op, top))
…		…
1125	* job preparing multi-part monsters	1094	* job preparing multi-part monsters
1126	*/	1095	*/
1127	object *	1096	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1097	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1098	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1099	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1100	{
1137	tmp->x = x + tmp->arch->clone.x;	1101	tmp->x = x + tmp->arch->clone.x;
1138	tmp->y = y + tmp->arch->clone.y;	1102	tmp->y = y + tmp->arch->clone.y;
1139	}	1103	}
1140		1104
…		…
1159	* Return value:	1123	* Return value:
1160	* new object if 'op' was merged with other object	1124	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1125	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1126	* just 'op' otherwise
1163	*/	1127	*/
1164
1165	object *	1128	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1129	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1130	{
1168	object *tmp, *top, *floor = NULL;	1131	object *tmp, *top, *floor = NULL;
1169	sint16 x, y;	1132	sint16 x, y;
…		…
1172	{	1135	{
1173	LOG (llevError, "Trying to insert freed object!\n");	1136	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;	1137	return NULL;
1175	}	1138	}
1176		1139
1177	if (m == NULL)	1140	if (!m)
1178	{	1141	{
1179	char *dump = dump_object (op);	1142	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1143	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181	free (dump);	1144	free (dump);
1182	return op;	1145	return op;
…		…
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1166	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);	1167	free (dump);
1205	return op;	1168	return op;
1206	}	1169	}
1207		1170
1208	if (op->more != NULL)	1171	if (op->more)
1209	{	1172	{
1210	/* The part may be on a different map. */	1173	/* The part may be on a different map. */
1211		1174
1212	object *more = op->more;	1175	object *more = op->more;
1213		1176
1214	/* We really need the caller to normalize coordinates - if	1177	/* We really need the caller to normalise coordinates - if
1215	* we set the map, that doesn't work if the location is within	1178	* 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	1179	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.	1180	* is clear wrong do we normalise it.
1218	*/	1181	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1182	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);	1183	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)	1184	else if (!more->map)
1222	{	1185	{
…		…
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1192	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230	{	1193	{
1231	if (!op->head)	1194	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1195	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1196
1234	return NULL;	1197	return 0;
1235	}	1198	}
1236	}	1199	}
1237		1200
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1201	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1202
…		…
1246	y = op->y;	1209	y = op->y;
1247		1210
1248	/* this has to be done after we translate the coordinates.	1211	/* this has to be done after we translate the coordinates.
1249	*/	1212	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1213	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1214	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1215	if (object::can_merge (op, tmp))
1253	{	1216	{
1254	op->nrof += tmp->nrof;	1217	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1218	tmp->destroy ();
1256	}	1219	}
…		…
1273	op->below = originator->below;	1236	op->below = originator->below;
1274		1237
1275	if (op->below)	1238	if (op->below)
1276	op->below->above = op;	1239	op->below->above = op;
1277	else	1240	else
1278	op->ms ().bottom = op;	1241	op->ms ().bot = op;
1279		1242
1280	/* since *below* originator, no need to update top */	1243	/* since *below* originator, no need to update top */
1281	originator->below = op;	1244	originator->below = op;
1282	}	1245	}
1283	else	1246	else
1284	{	1247	{
1285	/* If there are other objects, then */	1248	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1249	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1287	{	1250	{
1288	object *last = NULL;	1251	object *last = 0;
1289		1252
1290	/*	1253	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1254	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1255	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1256	* 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	1260	* 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	1261	* 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	1262	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1263	* that flying non pickable objects are spell objects.
1301	*/	1264	*/
1302
1303	while (top != NULL)	1265	while (top)
1304	{	1266	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1267	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1268	floor = top;
1307		1269
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1270	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1323	op->above = GET_MAP_OB (op->map, op->x, op->y);
1362		1324
1363	if (op->above)	1325	if (op->above)
1364	op->above->below = op;	1326	op->above->below = op;
1365		1327
1366	op->below = NULL;	1328	op->below = 0;
1367	op->ms ().bottom = op;	1329	op->ms ().bot = op;
1368	}	1330	}
1369	else	1331	else
1370	{ /* get inserted into the stack above top */	1332	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1333	op->above = top->above;
1372		1334
…		…
1375		1337
1376	op->below = top;	1338	op->below = top;
1377	top->above = op;	1339	top->above = op;
1378	}	1340	}
1379		1341
1380	if (op->above == NULL)	1342	if (!op->above)
1381	op->ms ().top = op;	1343	op->ms ().top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1344	} /* else not INS_BELOW_ORIGINATOR */
1383		1345
1384	if (op->type == PLAYER)	1346	if (op->type == PLAYER)
		1347	{
1385	op->contr->do_los = 1;	1348	op->contr->do_los = 1;
		1349	++op->map->players;
		1350	op->map->touch ();
		1351	}
		1352
		1353	op->map->dirty = true;
1386		1354
1387	/* If we have a floor, we know the player, if any, will be above	1355	/* 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.	1356	* it, so save a few ticks and start from there.
1389	*/	1357	*/
1390	if (!(flag & INS_MAP_LOAD))	1358	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1359	if (object *pl = op->ms ().player ())
		1360	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1361	pl->contr->ns->floorbox_update ();
1393		1362
1394	/* If this object glows, it may affect lighting conditions that are	1363	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1364	* 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	1365	* 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	1366	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1367	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1368	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1369	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1370	* of effect may be sufficient.
1402	*/	1371	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1372	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1373	update_all_los (op->map, op->x, op->y);
1405		1374
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1375	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1376	update_object (op, UP_OBJ_INSERT);
		1377
		1378	INVOKE_OBJECT (INSERT, op);
1408		1379
1409	/* Don't know if moving this to the end will break anything. However,	1380	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1381	* we want to have floorbox_update called before calling this.
1411	*	1382	*
1412	* check_move_on() must be after this because code called from	1383	* check_move_on() must be after this because code called from
…		…
1417		1388
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1389	/* 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)	1390	if (!(flag & INS_NO_WALK_ON) && !op->head)
1420	{	1391	{
1421	if (check_move_on (op, originator))	1392	if (check_move_on (op, originator))
1422	return NULL;	1393	return 0;
1423		1394
1424	/* If we are a multi part object, lets work our way through the check	1395	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1396	* walk on's.
1426	*/	1397	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1398	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1399	if (check_move_on (tmp, originator))
1429	return NULL;	1400	return 0;
1430	}	1401	}
1431		1402
1432	return op;	1403	return op;
1433	}	1404	}
1434		1405
…		…
1441	{	1412	{
1442	object *tmp, *tmp1;	1413	object *tmp, *tmp1;
1443		1414
1444	/* first search for itself and remove any old instances */	1415	/* first search for itself and remove any old instances */
1445		1416
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1417	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1418	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1448	tmp->destroy ();	1419	tmp->destroy ();
1449		1420
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1421	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1422
1452	tmp1->x = op->x;	1423	tmp1->x = op->x;
1453	tmp1->y = op->y;	1424	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1425	insert_ob_in_map (tmp1, op->map, op, 0);
		1426	}
		1427
		1428	object *
		1429	object::insert_at (object *where, object *originator, int flags)
		1430	{
		1431	where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1432	}
1456		1433
1457	/*	1434	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1435	* 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	1436	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1437	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1438	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1439	* global static errmsg array.
1463	*/	1440	*/
1464
1465	object *	1441	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1442	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1443	{
1468	object *newob;	1444	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1445	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1505		1481
1506	object *	1482	object *
1507	decrease_ob_nr (object *op, uint32 i)	1483	decrease_ob_nr (object *op, uint32 i)
1508	{	1484	{
1509	object *tmp;	1485	object *tmp;
1510	player *pl;
1511		1486
1512	if (i == 0) /* objects with op->nrof require this check */	1487	if (i == 0) /* objects with op->nrof require this check */
1513	return op;	1488	return op;
1514		1489
1515	if (i > op->nrof)	1490	if (i > op->nrof)
…		…
1528	* IMO, searching through all the players will mostly	1503	* IMO, searching through all the players will mostly
1529	* likely be quicker than following op->env to the map,	1504	* likely be quicker than following op->env to the map,
1530	* and then searching the map for a player.	1505	* and then searching the map for a player.
1531	*/	1506	*/
1532	if (!tmp)	1507	if (!tmp)
1533	{	1508	for_all_players (pl)
1534	for (pl = first_player; pl; pl = pl->next)
1535	if (pl->ob->container == op->env)	1509	if (pl->ob->container == op->env)
1536	{	1510	{
1537	tmp = pl->ob;	1511	tmp = pl->ob;
1538	break;	1512	break;
1539	}	1513	}
1540	}
1541		1514
1542	if (i < op->nrof)	1515	if (i < op->nrof)
1543	{	1516	{
1544	sub_weight (op->env, op->weight * i);	1517	sub_weight (op->env, op->weight * i);
1545	op->nrof -= i;	1518	op->nrof -= i;
…		…
1695	if ((op->glow_radius != 0) && map)	1668	if ((op->glow_radius != 0) && map)
1696	{	1669	{
1697	#ifdef DEBUG_LIGHTS	1670	#ifdef DEBUG_LIGHTS
1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1671	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699	#endif /* DEBUG_LIGHTS */	1672	#endif /* DEBUG_LIGHTS */
1700	if (MAP_DARKNESS (map))	1673	if (map->darkness)
1701	update_all_los (map, x, y);	1674	update_all_los (map, x, y);
1702	}	1675	}
1703		1676
1704	/* Client has no idea of ordering so lets not bother ordering it here.	1677	/* Client has no idea of ordering so lets not bother ordering it here.
1705	* It sure simplifies this function...	1678	* It sure simplifies this function...
…		…
1710	{	1683	{
1711	op->below = inv;	1684	op->below = inv;
1712	op->below->above = op;	1685	op->below->above = op;
1713	inv = op;	1686	inv = op;
1714	}	1687	}
		1688
		1689	INVOKE_OBJECT (INSERT, this);
1715		1690
1716	return op;	1691	return op;
1717	}	1692	}
1718		1693
1719	/*	1694	/*
…		…
1734	*	1709	*
1735	* MSW 2001-07-08: Check all objects on space, not just those below	1710	* 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	1711	* object being inserted. insert_ob_in_map may not put new objects
1737	* on top.	1712	* on top.
1738	*/	1713	*/
1739
1740	int	1714	int
1741	check_move_on (object *op, object *originator)	1715	check_move_on (object *op, object *originator)
1742	{	1716	{
1743	object *tmp;	1717	object *tmp;
1744	maptile *m = op->map;	1718	maptile *m = op->map;
…		…
1771		1745
1772	/* The objects have to be checked from top to bottom.	1746	/* The objects have to be checked from top to bottom.
1773	* Hence, we first go to the top:	1747	* Hence, we first go to the top:
1774	*/	1748	*/
1775		1749
1776	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1750	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1777	{	1751	{
1778	/* Trim the search when we find the first other spell effect	1752	/* Trim the search when we find the first other spell effect
1779	* this helps performance so that if a space has 50 spell objects,	1753	* this helps performance so that if a space has 50 spell objects,
1780	* we don't need to check all of them.	1754	* we don't need to check all of them.
1781	*/	1755	*/
…		…
1836	/*	1810	/*
1837	* present_arch(arch, map, x, y) searches for any objects with	1811	* present_arch(arch, map, x, y) searches for any objects with
1838	* a matching archetype at the given map and coordinates.	1812	* a matching archetype at the given map and coordinates.
1839	* The first matching object is returned, or NULL if none.	1813	* The first matching object is returned, or NULL if none.
1840	*/	1814	*/
1841
1842	object *	1815	object *
1843	present_arch (const archetype *at, maptile *m, int x, int y)	1816	present_arch (const archetype *at, maptile *m, int x, int y)
1844	{	1817	{
1845	object *
1846	tmp;
1847
1848	if (m == NULL || out_of_map (m, x, y))	1818	if (!m || out_of_map (m, x, y))
1849	{	1819	{
1850	LOG (llevError, "Present_arch called outside map.\n");	1820	LOG (llevError, "Present_arch called outside map.\n");
1851	return NULL;	1821	return NULL;
1852	}	1822	}
1853	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1823
		1824	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1854	if (tmp->arch == at)	1825	if (tmp->arch == at)
1855	return tmp;	1826	return tmp;
		1827
1856	return NULL;	1828	return NULL;
1857	}	1829	}
1858		1830
1859	/*	1831	/*
1860	* present(type, map, x, y) searches for any objects with	1832	* present(type, map, x, y) searches for any objects with
1861	* a matching type variable at the given map and coordinates.	1833	* a matching type variable at the given map and coordinates.
1862	* The first matching object is returned, or NULL if none.	1834	* The first matching object is returned, or NULL if none.
1863	*/	1835	*/
1864
1865	object *	1836	object *
1866	present (unsigned char type, maptile *m, int x, int y)	1837	present (unsigned char type, maptile *m, int x, int y)
1867	{	1838	{
1868	object *
1869	tmp;
1870
1871	if (out_of_map (m, x, y))	1839	if (out_of_map (m, x, y))
1872	{	1840	{
1873	LOG (llevError, "Present called outside map.\n");	1841	LOG (llevError, "Present called outside map.\n");
1874	return NULL;	1842	return NULL;
1875	}	1843	}
1876	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1844
		1845	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1846	if (tmp->type == type)
1878	return tmp;	1847	return tmp;
		1848
1879	return NULL;	1849	return NULL;
1880	}	1850	}
1881		1851
1882	/*	1852	/*
1883	* present_in_ob(type, object) searches for any objects with	1853	* present_in_ob(type, object) searches for any objects with
1884	* a matching type variable in the inventory of the given object.	1854	* a matching type variable in the inventory of the given object.
1885	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1886	*/	1856	*/
1887
1888	object *	1857	object *
1889	present_in_ob (unsigned char type, const object *op)	1858	present_in_ob (unsigned char type, const object *op)
1890	{	1859	{
1891	object *
1892	tmp;
1893
1894	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1860	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895	if (tmp->type == type)	1861	if (tmp->type == type)
1896	return tmp;	1862	return tmp;
		1863
1897	return NULL;	1864	return NULL;
1898	}	1865	}
1899		1866
1900	/*	1867	/*
1901	* present_in_ob (type, str, object) searches for any objects with	1868	* present_in_ob (type, str, object) searches for any objects with
…		…
1909	* str is the string to match against. Note that we match against	1876	* 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	1877	* 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	1878	* spell code can use one object type (force), but change it's name
1912	* to be unique.	1879	* to be unique.
1913	*/	1880	*/
1914
1915	object *	1881	object *
1916	present_in_ob_by_name (int type, const char *str, const object *op)	1882	present_in_ob_by_name (int type, const char *str, const object *op)
1917	{	1883	{
1918	object *
1919	tmp;
1920
1921	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922	{
1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1885	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924	return tmp;	1886	return tmp;
1925	}	1887
1926	return NULL;	1888	return 0;
1927	}	1889	}
1928		1890
1929	/*	1891	/*
1930	* present_arch_in_ob(archetype, object) searches for any objects with	1892	* present_arch_in_ob(archetype, object) searches for any objects with
1931	* a matching archetype in the inventory of the given object.	1893	* a matching archetype in the inventory of the given object.
1932	* The first matching object is returned, or NULL if none.	1894	* The first matching object is returned, or NULL if none.
1933	*/	1895	*/
1934
1935	object *	1896	object *
1936	present_arch_in_ob (const archetype *at, const object *op)	1897	present_arch_in_ob (const archetype *at, const object *op)
1937	{	1898	{
1938	object *
1939	tmp;
1940
1941	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1899	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942	if (tmp->arch == at)	1900	if (tmp->arch == at)
1943	return tmp;	1901	return tmp;
		1902
1944	return NULL;	1903	return NULL;
1945	}	1904	}
1946		1905
1947	/*	1906	/*
1948	* activate recursively a flag on an object inventory	1907	* activate recursively a flag on an object inventory
1949	*/	1908	*/
1950	void	1909	void
1951	flag_inv (object *op, int flag)	1910	flag_inv (object *op, int flag)
1952	{	1911	{
1953	object *
1954	tmp;
1955
1956	if (op->inv)	1912	if (op->inv)
1957	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1913	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958	{	1914	{
1959	SET_FLAG (tmp, flag);	1915	SET_FLAG (tmp, flag);
1960	flag_inv (tmp, flag);	1916	flag_inv (tmp, flag);
1961	}	1917	}
1962	} /*	1918	}
		1919
		1920	/*
1963	* desactivate recursively a flag on an object inventory	1921	* deactivate recursively a flag on an object inventory
1964	*/	1922	*/
1965	void	1923	void
1966	unflag_inv (object *op, int flag)	1924	unflag_inv (object *op, int flag)
1967	{	1925	{
1968	object *
1969	tmp;
1970
1971	if (op->inv)	1926	if (op->inv)
1972	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1927	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973	{	1928	{
1974	CLEAR_FLAG (tmp, flag);	1929	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	1930	unflag_inv (tmp, flag);
1976	}	1931	}
1977	}	1932	}
…		…
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1935	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).	1936	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for	1937	* 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.	1938	* him/her-self and all object carried by a call to this function.
1984	*/	1939	*/
1985
1986	void	1940	void
1987	set_cheat (object *op)	1941	set_cheat (object *op)
1988	{	1942	{
1989	SET_FLAG (op, FLAG_WAS_WIZ);	1943	SET_FLAG (op, FLAG_WAS_WIZ);
1990	flag_inv (op, FLAG_WAS_WIZ);	1944	flag_inv (op, FLAG_WAS_WIZ);
…		…
2009	* because arch_blocked (now ob_blocked) needs to know the movement type	1963	* 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	1964	* 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	1965	* the archetype because that isn't correct if the monster has been
2012	* customized, changed states, etc.	1966	* customized, changed states, etc.
2013	*/	1967	*/
2014
2015	int	1968	int
2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1969	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017	{	1970	{
2018	int
2019	i,
2020	index = 0, flag;	1971	int index = 0, flag;
2021	static int
2022	altern[SIZEOFFREE];	1972	int altern[SIZEOFFREE];
2023		1973
2024	for (i = start; i < stop; i++)	1974	for (int i = start; i < stop; i++)
2025	{	1975	{
2026	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1976	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027	if (!flag)	1977	if (!flag)
2028	altern[index++] = i;	1978	altern [index++] = i;
2029		1979
2030	/* Basically, if we find a wall on a space, we cut down the search size.	1980	/* 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.	1981	* 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 -	1982	* 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	1983	* if the space being examined only has a wall to the north and empty
…		…
2049	* find_first_free_spot(archetype, maptile, x, y) works like	1999	* find_first_free_spot(archetype, maptile, x, y) works like
2050	* find_free_spot(), but it will search max number of squares.	2000	* find_free_spot(), but it will search max number of squares.
2051	* But it will return the first available spot, not a random choice.	2001	* 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.	2002	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2053	*/	2003	*/
2054
2055	int	2004	int
2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2005	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057	{	2006	{
2058	int
2059	i;
2060
2061	for (i = 0; i < SIZEOFFREE; i++)	2007	for (int i = 0; i < SIZEOFFREE; i++)
2062	{
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2008	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2009	return i;
2065	}	2010
2066	return -1;	2011	return -1;
2067	}	2012	}
2068		2013
2069	/*	2014	/*
2070	* The function permute(arr, begin, end) randomly reorders the array	2015	* The function permute(arr, begin, end) randomly reorders the array
2071	* arr[begin..end-1].	2016	* arr[begin..end-1].
		2017	* now uses a fisher-yates shuffle, old permute was broken
2072	*/	2018	*/
2073	static void	2019	static void
2074	permute (int *arr, int begin, int end)	2020	permute (int *arr, int begin, int end)
2075	{	2021	{
2076	int	2022	arr += begin;
2077	i,
2078	j,
2079	tmp,
2080	len;
2081
2082	len = end - begin;	2023	end -= begin;
2083	for (i = begin; i < end; i++)
2084	{
2085	j = begin + RANDOM () % len;
2086		2024
2087	tmp = arr[i];	2025	while (--end)
2088	arr[i] = arr[j];	2026	swap (arr [end], arr [RANDOM () % (end + 1)]);
2089	arr[j] = tmp;
2090	}
2091	}	2027	}
2092		2028
2093	/* new function to make monster searching more efficient, and effective!	2029	/* new function to make monster searching more efficient, and effective!
2094	* This basically returns a randomized array (in the passed pointer) of	2030	* 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	2031	* 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.	2034	* the 3x3 area will be searched, just not in a predictable order.
2099	*/	2035	*/
2100	void	2036	void
2101	get_search_arr (int *search_arr)	2037	get_search_arr (int *search_arr)
2102	{	2038	{
2103	int	2039	int i;
2104	i;
2105		2040
2106	for (i = 0; i < SIZEOFFREE; i++)	2041	for (i = 0; i < SIZEOFFREE; i++)
2107	{
2108	search_arr[i] = i;	2042	search_arr[i] = i;
2109	}
2110		2043
2111	permute (search_arr, 1, SIZEOFFREE1 + 1);	2044	permute (search_arr, 1, SIZEOFFREE1 + 1);
2112	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2045	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2046	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114	}	2047	}
…		…
2123	* Perhaps incorrectly, but I'm making the assumption that exclude	2056	* 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	2057	* 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	2058	* because we have to know what movement the thing looking to move
2126	* there is capable of.	2059	* there is capable of.
2127	*/	2060	*/
2128
2129	int	2061	int
2130	find_dir (maptile *m, int x, int y, object *exclude)	2062	find_dir (maptile *m, int x, int y, object *exclude)
2131	{	2063	{
2132	int
2133	i,
2134	max = SIZEOFFREE, mflags;	2064	int i, max = SIZEOFFREE, mflags;
2135		2065
2136	sint16 nx, ny;	2066	sint16 nx, ny;
2137	object *	2067	object *tmp;
2138	tmp;
2139	maptile *	2068	maptile *mp;
2140	mp;
2141		2069
2142	MoveType blocked, move_type;	2070	MoveType blocked, move_type;
2143		2071
2144	if (exclude && exclude->head)	2072	if (exclude && exclude->head)
2145	{	2073	{
…		…
2162		2090
2163	if (mflags & P_OUT_OF_MAP)	2091	if (mflags & P_OUT_OF_MAP)
2164	max = maxfree[i];	2092	max = maxfree[i];
2165	else	2093	else
2166	{	2094	{
2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2095	mapspace &ms = mp->at (nx, ny);
		2096
		2097	blocked = ms.move_block;
2168		2098
2169	if ((move_type & blocked) == move_type)	2099	if ((move_type & blocked) == move_type)
2170	max = maxfree[i];	2100	max = maxfree[i];
2171	else if (mflags & P_IS_ALIVE)	2101	else if (mflags & P_IS_ALIVE)
2172	{	2102	{
2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2103	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)))	2104	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2105	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2175	break;	2106	break;
2176		2107
2177	if (tmp)	2108	if (tmp)
2178	return freedir[i];	2109	return freedir[i];
2179	}	2110	}
…		…
2185		2116
2186	/*	2117	/*
2187	* distance(object 1, object 2) will return the square of the	2118	* distance(object 1, object 2) will return the square of the
2188	* distance between the two given objects.	2119	* distance between the two given objects.
2189	*/	2120	*/
2190
2191	int	2121	int
2192	distance (const object *ob1, const object *ob2)	2122	distance (const object *ob1, const object *ob2)
2193	{	2123	{
2194	int i;
2195
2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2124	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197	return i;
2198	}	2125	}
2199		2126
2200	/*	2127	/*
2201	* find_dir_2(delta-x,delta-y) will return a direction in which	2128	* 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	2129	* an object which has subtracted the x and y coordinates of another
2203	* object, needs to travel toward it.	2130	* object, needs to travel toward it.
2204	*/	2131	*/
2205
2206	int	2132	int
2207	find_dir_2 (int x, int y)	2133	find_dir_2 (int x, int y)
2208	{	2134	{
2209	int q;	2135	int q;
2210		2136
…		…
2249	int	2175	int
2250	absdir (int d)	2176	absdir (int d)
2251	{	2177	{
2252	while (d < 1)	2178	while (d < 1)
2253	d += 8;	2179	d += 8;
		2180
2254	while (d > 8)	2181	while (d > 8)
2255	d -= 8;	2182	d -= 8;
		2183
2256	return d;	2184	return d;
2257	}	2185	}
2258		2186
2259	/*	2187	/*
2260	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2188	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2262	*/	2190	*/
2263		2191
2264	int	2192	int
2265	dirdiff (int dir1, int dir2)	2193	dirdiff (int dir1, int dir2)
2266	{	2194	{
2267	int	2195	int d;
2268	d;
2269		2196
2270	d = abs (dir1 - dir2);	2197	d = abs (dir1 - dir2);
2271	if (d > 4)	2198	if (d > 4)
2272	d = 8 - d;	2199	d = 8 - d;
		2200
2273	return d;	2201	return d;
2274	}	2202	}
2275		2203
2276	/* peterm:	2204	/* peterm:
2277	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2205	* 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	2208	* 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.	2209	* 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	2210	* Moved from spell_util.c to object.c with the other related direction
2283	* functions.	2211	* functions.
2284	*/	2212	*/
2285
2286	int
2287	reduction_dir[SIZEOFFREE][3] = {	2213	int reduction_dir[SIZEOFFREE][3] = {
2288	{0, 0, 0}, /* 0 */	2214	{0, 0, 0}, /* 0 */
2289	{0, 0, 0}, /* 1 */	2215	{0, 0, 0}, /* 1 */
2290	{0, 0, 0}, /* 2 */	2216	{0, 0, 0}, /* 2 */
2291	{0, 0, 0}, /* 3 */	2217	{0, 0, 0}, /* 3 */
2292	{0, 0, 0}, /* 4 */	2218	{0, 0, 0}, /* 4 */
…		…
2442	/* Basically, we save the content of the string to a temp file, then call */	2368	/* 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, */	2369	/* 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. */	2370	/* 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. */	2371	/* Remember not to use load_object_str in a time-critical situation. */
2446	/* Also remember that multiparts objects are not supported for now. */	2372	/* Also remember that multiparts objects are not supported for now. */
2447
2448	object *	2373	object *
2449	load_object_str (const char *obstr)	2374	load_object_str (const char *obstr)
2450	{	2375	{
2451	object *op;	2376	object *op;
2452	char filename[MAX_BUF];	2377	char filename[MAX_BUF];
…		…
2482	* returns NULL if no match.	2407	* returns NULL if no match.
2483	*/	2408	*/
2484	object *	2409	object *
2485	find_obj_by_type_subtype (const object *who, int type, int subtype)	2410	find_obj_by_type_subtype (const object *who, int type, int subtype)
2486	{	2411	{
2487	object *tmp;
2488
2489	for (tmp = who->inv; tmp; tmp = tmp->below)	2412	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490	if (tmp->type == type && tmp->subtype == subtype)	2413	if (tmp->type == type && tmp->subtype == subtype)
2491	return tmp;	2414	return tmp;
2492		2415
2493	return NULL;	2416	return 0;
2494	}	2417	}
2495		2418
2496	/* If ob has a field named key, return the link from the list,	2419	/* If ob has a field named key, return the link from the list,
2497	* otherwise return NULL.	2420	* otherwise return NULL.
2498	*	2421	*
…		…
2500	* do the desired thing.	2423	* do the desired thing.
2501	*/	2424	*/
2502	key_value *	2425	key_value *
2503	get_ob_key_link (const object *ob, const char *key)	2426	get_ob_key_link (const object *ob, const char *key)
2504	{	2427	{
2505	key_value *link;
2506
2507	for (link = ob->key_values; link != NULL; link = link->next)	2428	for (key_value *link = ob->key_values; link; link = link->next)
2508	if (link->key == key)	2429	if (link->key == key)
2509	return link;	2430	return link;
2510		2431
2511	return NULL;	2432	return 0;
2512	}	2433	}
2513		2434
2514	/*	2435	/*
2515	* Returns the value of op has an extra_field for key, or NULL.	2436	* Returns the value of op has an extra_field for key, or NULL.
2516	*	2437	*
…		…
2556	* Returns TRUE on success.	2477	* Returns TRUE on success.
2557	*/	2478	*/
2558	int	2479	int
2559	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2480	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560	{	2481	{
2561	key_value *
2562	field = NULL, *last = NULL;	2482	key_value *field = NULL, *last = NULL;
2563		2483
2564	for (field = op->key_values; field != NULL; field = field->next)	2484	for (field = op->key_values; field != NULL; field = field->next)
2565	{	2485	{
2566	if (field->key != canonical_key)	2486	if (field->key != canonical_key)
2567	{	2487	{
…		…
2595	/* IF we get here, key doesn't exist */	2515	/* IF we get here, key doesn't exist */
2596		2516
2597	/* No field, we'll have to add it. */	2517	/* No field, we'll have to add it. */
2598		2518
2599	if (!add_key)	2519	if (!add_key)
2600	{
2601	return FALSE;	2520	return FALSE;
2602	}	2521
2603	/* There isn't any good reason to store a null	2522	/* There isn't any good reason to store a null
2604	* value in the key/value list. If the archetype has	2523	* value in the key/value list. If the archetype has
2605	* this key, then we should also have it, so shouldn't	2524	* this key, then we should also have it, so shouldn't
2606	* be here. If user wants to store empty strings,	2525	* be here. If user wants to store empty strings,
2607	* should pass in ""	2526	* should pass in ""
…		…
2656	}	2575	}
2657	else	2576	else
2658	item = item->env;	2577	item = item->env;
2659	}	2578	}
2660		2579
		2580
		2581	const char *
		2582	object::flag_desc (char *desc, int len) const
		2583	{
		2584	char *p = desc;
		2585	bool first = true;
		2586
		2587	*p = 0;
		2588
		2589	for (int i = 0; i < NUM_FLAGS; i++)
		2590	{
		2591	if (len <= 10) // magic constant!
		2592	{
		2593	snprintf (p, len, ",...");
		2594	break;
		2595	}
		2596
		2597	if (flag [i])
		2598	{
		2599	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2600	len -= cnt;
		2601	p += cnt;
		2602	first = false;
		2603	}
		2604	}
		2605
		2606	return desc;
		2607	}
		2608
2661	// return a suitable string describing an objetc in enough detail to find it	2609	// return a suitable string describing an object in enough detail to find it
2662	const char *	2610	const char *
2663	object::debug_desc (char *info) const	2611	object::debug_desc (char *info) const
2664	{	2612	{
		2613	char flagdesc[512];
2665	char info2[256 * 3];	2614	char info2[256 * 4];
2666	char *p = info;	2615	char *p = info;
2667		2616
2668	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2617	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2669	count,	2618	count, uuid.seq,
2670	&name,	2619	&name,
2671	title ? " " : "",	2620	title ? "\",title:" : "",
2672	title ? (const char *)title : "");	2621	title ? (const char *)title : "",
		2622	flag_desc (flagdesc, 512), type);
2673		2623
2674	if (env)	2624	if (env)
2675	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2625	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2676		2626
2677	if (map)	2627	if (map)
2678	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2628	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2679		2629
2680	return info;	2630	return info;
2681	}	2631	}
2682		2632
2683	const char *	2633	const char *
2684	object::debug_desc () const	2634	object::debug_desc () const
2685	{	2635	{
2686	static char info[256 * 3];	2636	static char info[256 * 4];
2687	return debug_desc (info);	2637	return debug_desc (info);
2688	}	2638	}
2689		2639

Diff Legend

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