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.76 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.106 by root, Wed Jan 3 20:08:04 2007 UTC

…		…
141	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
143	*/	143	*/
144		144
145	/* For each field in wants, */	145	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	147	{
148	key_value *has_field;	148	key_value *has_field;
149		149
150	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	190	* Check nrof variable *before* calling can_merge()
191	*	191	*
192	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
193	* check weight	193	* check weight
194	*/	194	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	195	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	196	{
198	/* A couple quicksanity checks */	197	/* A couple quicksanity checks */
199	if (ob1 == ob2	198	if (ob1 == ob2
200	|| ob1->type != ob2->type	199	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		221
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		224
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	226	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	227	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	228	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	229	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	230	|| ob1->weight != ob2->weight
…		…
277		276
278	/* Note sure why the following is the case - either the object has to	277	/* 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	278	* be animated or have a very low speed. Is this an attempted monster
280	* check?	279	* check?
281	*/	280	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	281	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	282	return 0;
284		283
285	switch (ob1->type)	284	switch (ob1->type)
286	{	285	{
287	case SCROLL:	286	case SCROLL:
…		…
364	{	363	{
365	if (!op)	364	if (!op)
366	return strdup ("[NULLOBJ]");	365	return strdup ("[NULLOBJ]");
367		366
368	object_freezer freezer;	367	object_freezer freezer;
369	save_object (freezer, op, 3);	368	save_object (freezer, op, 1);
370	return freezer.as_string ();	369	return freezer.as_string ();
371	}	370	}
372		371
373	/*	372	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	373	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
467	}	466	}
468		467
469	op->key_values = 0;	468	op->key_values = 0;
470	}	469	}
471		470
472	void object::clear ()
473	{
474	attachable_base::clear ();
475
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*	471	/*
515	* copy_to first frees everything allocated by the dst object,	472	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second	473	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
524	{	481	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527		484
528	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
529	*(object_pod *)dst = *this;
530
531	if (self || cb)
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533		486
534	if (is_freed)	487	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
536		489
537	if (is_removed)	490	if (is_removed)
…		…
568	tail = new_link;	521	tail = new_link;
569	}	522	}
570	}	523	}
571	}	524	}
572		525
573	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
574	}	527	}
575		528
576	object *	529	object *
577	object::clone ()	530	object::clone ()
578	{	531	{
…		…
584	/*	537	/*
585	* 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
586	* 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
587	* 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.
588	*/	541	*/
589
590	void	542	void
591	update_turn_face (object *op)	543	update_turn_face (object *op)
592	{	544	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	546	return;
		547
595	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
597	}	550	}
598		551
599	/*	552	/*
600	* 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
601	* 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.
602	* 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.
603	*/	556	*/
604	void	557	void
605	update_ob_speed (object *op)	558	object::set_speed (float speed)
606	{	559	{
607	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	561	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	563	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	564	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		565
632	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		567
636	if (op->active_next != NULL)	568	if (has_active_speed ())
637	op->active_next->active_prev = op;	569	activate ();
638
639	active_objects = op;
640	}
641	else	570	else
642	{	571	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}
666
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}	572	}
697		573
698	/*	574	/*
699	* update_object() updates the the map.	575	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
737	*/	613	*/
738	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
739	return;	615	return;
740		616
741	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
742	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743	{	619	{
744	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	621	#ifdef MANY_CORES
746	abort ();	622	abort ();
747	#endif	623	#endif
748	return;	624	return;
749	}	625	}
750		626
751	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
752		628
753	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
754	/* nop */;	630	/* nop */;
755	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
756	{	632	{
757	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
767	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
768	* to have move_allow right now.	644	* to have move_allow right now.
769	*/	645	*/
770	|| ((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
771	|| 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)
772	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
773	}	649	}
774	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
775	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
776	* that is being removed.	652	* that is being removed.
777	*/	653	*/
778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
780	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
781	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
782	else	658	else
783	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
784		660
785	if (op->more)	661	if (op->more)
786	update_object (op->more, action);	662	update_object (op->more, action);
787	}	663	}
788		664
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used
791	object *object::first;	665	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804		666
805	object::object ()	667	object::object ()
806	{	668	{
807	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
808		670
…		…
840		702
841	prev = 0;	703	prev = 0;
842	next = 0;	704	next = 0;
843	}	705	}
844		706
		707	bool
		708	object::active () const
		709	{
		710	return active_next || active_prev || this == active_objects;
		711	}
		712
		713	void
		714	object::activate ()
		715	{
		716	/* If already on active list, don't do anything */
		717	if (active ())
		718	return;
		719
		720	if (has_active_speed ())
		721	{
		722	/* process_events() expects us to insert the object at the beginning
		723	* of the list. */
		724	active_next = active_objects;
		725
		726	if (active_next)
		727	active_next->active_prev = this;
		728
		729	active_objects = this;
		730	}
		731	}
		732
		733	void
		734	object::activate_recursive ()
		735	{
		736	activate ();
		737
		738	for (object *op = inv; op; op = op->below)
		739	op->activate_recursive ();
		740	}
		741
		742	/* This function removes object 'op' from the list of active
		743	* objects.
		744	* This should only be used for style maps or other such
		745	* reference maps where you don't want an object that isn't
		746	* in play chewing up cpu time getting processed.
		747	* The reverse of this is to call update_ob_speed, which
		748	* will do the right thing based on the speed of the object.
		749	*/
		750	void
		751	object::deactivate ()
		752	{
		753	/* If not on the active list, nothing needs to be done */
		754	if (!active ())
		755	return;
		756
		757	if (active_prev == 0)
		758	{
		759	active_objects = active_next;
		760	if (active_next)
		761	active_next->active_prev = 0;
		762	}
		763	else
		764	{
		765	active_prev->active_next = active_next;
		766	if (active_next)
		767	active_next->active_prev = active_prev;
		768	}
		769
		770	active_next = 0;
		771	active_prev = 0;
		772	}
		773
		774	void
		775	object::deactivate_recursive ()
		776	{
		777	for (object *op = inv; op; op = op->below)
		778	op->deactivate_recursive ();
		779
		780	deactivate ();
		781	}
		782
		783	void
		784	object::set_flag_inv (int flag, int value)
		785	{
		786	for (object *op = inv; op; op = op->below)
		787	{
		788	op->flag [flag] = value;
		789	op->set_flag_inv (flag, value);
		790	}
		791	}
		792
		793	/*
		794	* Remove and free all objects in the inventory of the given object.
		795	* object.c ?
		796	*/
		797	void
		798	object::destroy_inv (bool drop_to_ground)
		799	{
		800	// need to check first, because the checks below might segfault
		801	// as we might be on an invalid mapspace and crossfire code
		802	// is too buggy to ensure that the inventory is empty.
		803	// corollary: if you create arrows etc. with stuff in tis inventory,
		804	// cf will crash below with off-map x and y
		805	if (!inv)
		806	return;
		807
		808	/* Only if the space blocks everything do we not process -
		809	* if some form of movement is allowed, let objects
		810	* drop on that space.
		811	*/
		812	if (!drop_to_ground
		813	|| !map
		814	|| map->in_memory != MAP_IN_MEMORY
		815	|| ms ().move_block == MOVE_ALL)
		816	{
		817	while (inv)
		818	{
		819	inv->destroy_inv (drop_to_ground);
		820	inv->destroy ();
		821	}
		822	}
		823	else
		824	{ /* Put objects in inventory onto this space */
		825	while (inv)
		826	{
		827	object *op = inv;
		828
		829	if (op->flag [FLAG_STARTEQUIP]
		830	|| op->flag [FLAG_NO_DROP]
		831	|| op->type == RUNE
		832	|| op->type == TRAP
		833	|| op->flag [FLAG_IS_A_TEMPLATE])
		834	op->destroy ();
		835	else
		836	map->insert (op, x, y);
		837	}
		838	}
		839	}
		840
845	object *object::create ()	841	object *object::create ()
846	{	842	{
847	object *op = new object;	843	object *op = new object;
848	op->link ();	844	op->link ();
849	return op;	845	return op;
850	}	846	}
851		847
852	/*	848	void
853	* free_object() frees everything allocated by an object, removes	849	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	850	{
864	if (QUERY_FLAG (this, FLAG_FREED))	851	if (flag [FLAG_IS_LINKED])
		852	remove_button_link (this);
		853
		854	if (flag [FLAG_FRIENDLY])
		855	remove_friendly_object (this);
		856
		857	if (!flag [FLAG_REMOVED])
		858	remove ();
		859
		860	if (flag [FLAG_FREED])
865	return;	861	return;
866		862
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	863	set_speed (0);
868	remove_friendly_object (this);
869		864
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	865	flag [FLAG_FREED] = 1;
871	remove ();
872		866
873	SET_FLAG (this, FLAG_FREED);	867	attachable::do_destroy ();
874		868
875	if (more)	869	destroy_inv (true);
876	{	870	unlink ();
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880
881	if (inv)
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		871
923	// hack to ensure that freed objects still have a valid map	872	// hack to ensure that freed objects still have a valid map
924	{	873	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes	874	static maptile *freed_map; // freed objects are moved here to avoid crashes
926		875
…		…
930		879
931	freed_map->name = "/internal/freed_objects_map";	880	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	881	freed_map->width = 3;
933	freed_map->height = 3;	882	freed_map->height = 3;
934		883
935	freed_map->allocate ();	884	freed_map->alloc ();
		885	freed_map->in_memory = MAP_IN_MEMORY;
936	}	886	}
937		887
938	map = freed_map;	888	map = freed_map;
939	x = 1;	889	x = 1;
940	y = 1;	890	y = 1;
941	}	891	}
942		892
		893	head = 0;
		894
		895	if (more)
		896	{
		897	more->destroy ();
		898	more = 0;
		899	}
		900
943	// clear those pointers that likely might have circular references to us	901	// clear those pointers that likely might have circular references to us
944	owner = 0;	902	owner = 0;
945	enemy = 0;	903	enemy = 0;
946	attacked_by = 0;	904	attacked_by = 0;
947		905
948	// only relevant for players(?), but make sure of it anyways	906	// only relevant for players(?), but make sure of it anyways
949	contr = 0;	907	contr = 0;
		908	}
950		909
951	/* Remove object from the active list */	910	void
952	speed = 0;	911	object::destroy (bool destroy_inventory)
953	update_ob_speed (this);	912	{
		913	if (destroyed ())
		914	return;
954		915
955	unlink ();	916	if (destroy_inventory)
		917	destroy_inv (false);
956		918
957	mortals.push_back (this);	919	attachable::destroy ();
958	}	920	}
959		921
960	/*	922	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	923	* sub_weight() recursively (outwards) subtracts a number from the
962	* weight of an object (and what is carried by it's environment(s)).	924	* weight of an object (and what is carried by it's environment(s)).
…		…
986	object::remove ()	948	object::remove ()
987	{	949	{
988	object *tmp, *last = 0;	950	object *tmp, *last = 0;
989	object *otmp;	951	object *otmp;
990		952
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	953	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	954	return;
995		955
996	SET_FLAG (this, FLAG_REMOVED);	956	SET_FLAG (this, FLAG_REMOVED);
		957	INVOKE_OBJECT (REMOVE, this);
997		958
998	if (more)	959	if (more)
999	more->remove ();	960	more->remove ();
1000		961
1001	/*	962	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	973	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	974	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	975	* to save cpu time.
1015	*/	976	*/
1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	977	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017	fix_player (otmp);	978	otmp->update_stats ();
1018		979
1019	if (above != NULL)	980	if (above)
1020	above->below = below;	981	above->below = below;
1021	else	982	else
1022	env->inv = below;	983	env->inv = below;
1023		984
1024	if (below != NULL)	985	if (below)
1025	below->above = above;	986	below->above = above;
1026		987
1027	/* we set up values so that it could be inserted into	988	/* we set up values so that it could be inserted into
1028	* the map, but we don't actually do that - it is up	989	* the map, but we don't actually do that - it is up
1029	* to the caller to decide what we want to do.	990	* to the caller to decide what we want to do.
…		…
1033	above = 0, below = 0;	994	above = 0, below = 0;
1034	env = 0;	995	env = 0;
1035	}	996	}
1036	else if (map)	997	else if (map)
1037	{	998	{
1038	/* Re did the following section of code - it looks like it had	999	if (type == PLAYER)
1039	* lots of logic for things we no longer care about
1040	*/	1000	{
		1001	--map->players;
		1002	map->touch ();
		1003	}
		1004
		1005	map->dirty = true;
1041		1006
1042	/* link the object above us */	1007	/* link the object above us */
1043	if (above)	1008	if (above)
1044	above->below = below;	1009	above->below = below;
1045	else	1010	else
…		…
1063	dump = dump_object (GET_MAP_OB (map, x, y));	1028	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);	1029	LOG (llevError, "%s\n", dump);
1065	free (dump);	1030	free (dump);
1066	}	1031	}
1067		1032
1068	map->at (x, y).bottom = above; /* goes on above it. */	1033	map->at (x, y).bot = above; /* goes on above it. */
1069	}	1034	}
1070		1035
1071	above = 0;	1036	above = 0;
1072	below = 0;	1037	below = 0;
1073		1038
1074	if (map->in_memory == MAP_SAVING)	1039	if (map->in_memory == MAP_SAVING)
1075	return;	1040	return;
1076		1041
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1042	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		1043
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1044	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1080	{	1045	{
1081	/* No point updating the players look faces if he is the object	1046	/* No point updating the players look faces if he is the object
1082	* being removed.	1047	* being removed.
1083	*/	1048	*/
1084		1049
…		…
1088	* removed (most likely destroyed), update the player view	1053	* removed (most likely destroyed), update the player view
1089	* appropriately.	1054	* appropriately.
1090	*/	1055	*/
1091	if (tmp->container == this)	1056	if (tmp->container == this)
1092	{	1057	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);	1058	flag [FLAG_APPLIED] = 0;
1094	tmp->container = 0;	1059	tmp->container = 0;
1095	}	1060	}
1096		1061
		1062	if (tmp->contr->ns)
1097	tmp->contr->socket->floorbox_update ();	1063	tmp->contr->ns->floorbox_update ();
1098	}	1064	}
1099		1065
1100	/* See if player moving off should effect something */	1066	/* See if object moving off should effect something */
1101	if (check_walk_off	1067	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1068	&& ((move_type & tmp->move_off)
1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1069	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104	{	1070	{
1105	move_apply (tmp, this, 0);	1071	move_apply (tmp, this, 0);
…		…
1107	if (destroyed ())	1073	if (destroyed ())
1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1074	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1109	}	1075	}
1110		1076
1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1077	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112		1078	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1113	if (tmp->above == tmp)	1079	if (tmp->above == tmp)
1114	tmp->above = 0;	1080	tmp->above = 0;
1115		1081
1116	last = tmp;	1082	last = tmp;
1117	}	1083	}
1118		1084
1119	/* last == NULL of there are no objects on this space */	1085	/* last == NULL if there are no objects on this space */
		1086	//TODO: this makes little sense, why only update the topmost object?
1120	if (!last)	1087	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1088	map->at (x, y).flags_ = 0;
1122	else	1089	else
1123	update_object (last, UP_OBJ_REMOVE);	1090	update_object (last, UP_OBJ_REMOVE);
1124		1091
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1092	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126	update_all_los (map, x, y);	1093	update_all_los (map, x, y);
1127	}	1094	}
1128	}	1095	}
1129		1096
1130	/*	1097	/*
…		…
1139	merge_ob (object *op, object *top)	1106	merge_ob (object *op, object *top)
1140	{	1107	{
1141	if (!op->nrof)	1108	if (!op->nrof)
1142	return 0;	1109	return 0;
1143		1110
1144	if (top == NULL)	1111	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1112	for (top = op; top && top->above; top = top->above)
		1113	;
1146		1114
1147	for (; top != NULL; top = top->below)	1115	for (; top; top = top->below)
1148	{	1116	{
1149	if (top == op)	1117	if (top == op)
1150	continue;	1118	continue;
1151		1119
1152	if (object::can_merge (op, top))	1120	if (object::can_merge (op, top))
…		…
1168	* job preparing multi-part monsters	1136	* job preparing multi-part monsters
1169	*/	1137	*/
1170	object *	1138	object *
1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1139	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172	{	1140	{
1173	object *tmp;
1174
1175	if (op->head)
1176	op = op->head;
1177
1178	for (tmp = op; tmp; tmp = tmp->more)	1141	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179	{	1142	{
1180	tmp->x = x + tmp->arch->clone.x;	1143	tmp->x = x + tmp->arch->clone.x;
1181	tmp->y = y + tmp->arch->clone.y;	1144	tmp->y = y + tmp->arch->clone.y;
1182	}	1145	}
1183		1146
…		…
1202	* Return value:	1165	* Return value:
1203	* new object if 'op' was merged with other object	1166	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1167	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1168	* just 'op' otherwise
1206	*/	1169	*/
1207
1208	object *	1170	object *
1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1171	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210	{	1172	{
1211	object *tmp, *top, *floor = NULL;	1173	object *tmp, *top, *floor = NULL;
1212	sint16 x, y;	1174	sint16 x, y;
…		…
1215	{	1177	{
1216	LOG (llevError, "Trying to insert freed object!\n");	1178	LOG (llevError, "Trying to insert freed object!\n");
1217	return NULL;	1179	return NULL;
1218	}	1180	}
1219		1181
1220	if (m == NULL)	1182	if (!m)
1221	{	1183	{
1222	char *dump = dump_object (op);	1184	char *dump = dump_object (op);
1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1185	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1224	free (dump);	1186	free (dump);
1225	return op;	1187	return op;
…		…
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1208	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);	1209	free (dump);
1248	return op;	1210	return op;
1249	}	1211	}
1250		1212
1251	if (op->more != NULL)	1213	if (op->more)
1252	{	1214	{
1253	/* The part may be on a different map. */	1215	/* The part may be on a different map. */
1254		1216
1255	object *more = op->more;	1217	object *more = op->more;
1256		1218
1257	/* We really need the caller to normalize coordinates - if	1219	/* We really need the caller to normalise coordinates - if
1258	* we set the map, that doesn't work if the location is within	1220	* we set the map, that doesn't work if the location is within
1259	* a map and this is straddling an edge. So only if coordinate	1221	* a map and this is straddling an edge. So only if coordinate
1260	* is clear wrong do we normalize it.	1222	* is clear wrong do we normalise it.
1261	*/	1223	*/
1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1224	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263	more->map = get_map_from_coord (m, &more->x, &more->y);	1225	more->map = get_map_from_coord (m, &more->x, &more->y);
1264	else if (!more->map)	1226	else if (!more->map)
1265	{	1227	{
…		…
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1234	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273	{	1235	{
1274	if (!op->head)	1236	if (!op->head)
1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1237	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276		1238
1277	return NULL;	1239	return 0;
1278	}	1240	}
1279	}	1241	}
1280		1242
1281	CLEAR_FLAG (op, FLAG_REMOVED);	1243	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1244
…		…
1289	y = op->y;	1251	y = op->y;
1290		1252
1291	/* this has to be done after we translate the coordinates.	1253	/* this has to be done after we translate the coordinates.
1292	*/	1254	*/
1293	if (op->nrof && !(flag & INS_NO_MERGE))	1255	if (op->nrof && !(flag & INS_NO_MERGE))
1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1256	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1295	if (object::can_merge (op, tmp))	1257	if (object::can_merge (op, tmp))
1296	{	1258	{
1297	op->nrof += tmp->nrof;	1259	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1260	tmp->destroy ();
1299	}	1261	}
…		…
1316	op->below = originator->below;	1278	op->below = originator->below;
1317		1279
1318	if (op->below)	1280	if (op->below)
1319	op->below->above = op;	1281	op->below->above = op;
1320	else	1282	else
1321	op->ms ().bottom = op;	1283	op->ms ().bot = op;
1322		1284
1323	/* since *below* originator, no need to update top */	1285	/* since *below* originator, no need to update top */
1324	originator->below = op;	1286	originator->below = op;
1325	}	1287	}
1326	else	1288	else
1327	{	1289	{
1328	/* If there are other objects, then */	1290	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1291	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1330	{	1292	{
1331	object *last = NULL;	1293	object *last = 0;
1332		1294
1333	/*	1295	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1296	* If there are multiple objects on this space, we do some trickier handling.
1335	* We've already dealt with merging if appropriate.	1297	* We've already dealt with merging if appropriate.
1336	* Generally, we want to put the new object on top. But if	1298	* Generally, we want to put the new object on top. But if
…		…
1340	* once we get to them. This reduces the need to traverse over all of	1302	* once we get to them. This reduces the need to traverse over all of
1341	* them when adding another one - this saves quite a bit of cpu time	1303	* them when adding another one - this saves quite a bit of cpu time
1342	* when lots of spells are cast in one area. Currently, it is presumed	1304	* when lots of spells are cast in one area. Currently, it is presumed
1343	* that flying non pickable objects are spell objects.	1305	* that flying non pickable objects are spell objects.
1344	*/	1306	*/
1345
1346	while (top != NULL)	1307	while (top)
1347	{	1308	{
1348	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1309	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1349	floor = top;	1310	floor = top;
1350		1311
1351	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1312	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1404	op->above = GET_MAP_OB (op->map, op->x, op->y);	1365	op->above = GET_MAP_OB (op->map, op->x, op->y);
1405		1366
1406	if (op->above)	1367	if (op->above)
1407	op->above->below = op;	1368	op->above->below = op;
1408		1369
1409	op->below = NULL;	1370	op->below = 0;
1410	op->ms ().bottom = op;	1371	op->ms ().bot = op;
1411	}	1372	}
1412	else	1373	else
1413	{ /* get inserted into the stack above top */	1374	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1375	op->above = top->above;
1415		1376
…		…
1418		1379
1419	op->below = top;	1380	op->below = top;
1420	top->above = op;	1381	top->above = op;
1421	}	1382	}
1422		1383
1423	if (op->above == NULL)	1384	if (!op->above)
1424	op->ms ().top = op;	1385	op->ms ().top = op;
1425	} /* else not INS_BELOW_ORIGINATOR */	1386	} /* else not INS_BELOW_ORIGINATOR */
1426		1387
1427	if (op->type == PLAYER)	1388	if (op->type == PLAYER)
		1389	{
1428	op->contr->do_los = 1;	1390	op->contr->do_los = 1;
		1391	++op->map->players;
		1392	op->map->touch ();
		1393	}
		1394
		1395	op->map->dirty = true;
1429		1396
1430	/* If we have a floor, we know the player, if any, will be above	1397	/* If we have a floor, we know the player, if any, will be above
1431	* it, so save a few ticks and start from there.	1398	* it, so save a few ticks and start from there.
1432	*/	1399	*/
1433	if (!(flag & INS_MAP_LOAD))	1400	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->ms ().player ())	1401	if (object *pl = op->ms ().player ())
		1402	if (pl->contr->ns)
1435	pl->contr->socket->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1436		1404
1437	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1438	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1439	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1409	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1444	* of effect may be sufficient.	1412	* of effect may be sufficient.
1445	*/	1413	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1448		1416
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1417	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1418	update_object (op, UP_OBJ_INSERT);
		1419
		1420	INVOKE_OBJECT (INSERT, op);
1451		1421
1452	/* Don't know if moving this to the end will break anything. However,	1422	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1423	* we want to have floorbox_update called before calling this.
1454	*	1424	*
1455	* check_move_on() must be after this because code called from	1425	* check_move_on() must be after this because code called from
…		…
1460		1430
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1431	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && !op->head)
1463	{	1433	{
1464	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1465	return NULL;	1435	return 0;
1466		1436
1467	/* If we are a multi part object, lets work our way through the check	1437	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1438	* walk on's.
1469	*/	1439	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1472	return NULL;	1442	return 0;
1473	}	1443	}
1474		1444
1475	return op;	1445	return op;
1476	}	1446	}
1477		1447
…		…
1484	{	1454	{
1485	object *tmp, *tmp1;	1455	object *tmp, *tmp1;
1486		1456
1487	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1488		1458
1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1491	tmp->destroy ();	1461	tmp->destroy ();
1492		1462
1493	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1494		1464
1495	tmp1->x = op->x;	1465	tmp1->x = op->x;
1496	tmp1->y = op->y;	1466	tmp1->y = op->y;
1497	insert_ob_in_map (tmp1, op->map, op, 0);	1467	insert_ob_in_map (tmp1, op->map, op, 0);
		1468	}
		1469
		1470	object *
		1471	object::insert_at (object *where, object *originator, int flags)
		1472	{
		1473	where->map->insert (this, where->x, where->y, originator, flags);
1498	}	1474	}
1499		1475
1500	/*	1476	/*
1501	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1502	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
1503	* the rest (or is removed and freed if that number is 0).	1479	* the rest (or is removed and freed if that number is 0).
1504	* On failure, NULL is returned, and the reason put into the	1480	* On failure, NULL is returned, and the reason put into the
1505	* global static errmsg array.	1481	* global static errmsg array.
1506	*/	1482	*/
1507
1508	object *	1483	object *
1509	get_split_ob (object *orig_ob, uint32 nr)	1484	get_split_ob (object *orig_ob, uint32 nr)
1510	{	1485	{
1511	object *newob;	1486	object *newob;
1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1548		1523
1549	object *	1524	object *
1550	decrease_ob_nr (object *op, uint32 i)	1525	decrease_ob_nr (object *op, uint32 i)
1551	{	1526	{
1552	object *tmp;	1527	object *tmp;
1553	player *pl;
1554		1528
1555	if (i == 0) /* objects with op->nrof require this check */	1529	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1530	return op;
1557		1531
1558	if (i > op->nrof)	1532	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1545	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1546	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1547	* and then searching the map for a player.
1574	*/	1548	*/
1575	if (!tmp)	1549	if (!tmp)
1576	{	1550	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1551	if (pl->ob->container == op->env)
1579	{	1552	{
1580	tmp = pl->ob;	1553	tmp = pl->ob;
1581	break;	1554	break;
1582	}	1555	}
1583	}
1584		1556
1585	if (i < op->nrof)	1557	if (i < op->nrof)
1586	{	1558	{
1587	sub_weight (op->env, op->weight * i);	1559	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1560	op->nrof -= i;
…		…
1724	add_weight (this, (op->weight + op->carrying));	1696	add_weight (this, (op->weight + op->carrying));
1725		1697
1726	otmp = this->in_player ();	1698	otmp = this->in_player ();
1727	if (otmp && otmp->contr)	1699	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1700	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1701	otmp->update_stats ();
1730		1702
1731	op->map = 0;	1703	op->map = 0;
1732	op->env = this;	1704	op->env = this;
1733	op->above = 0;	1705	op->above = 0;
1734	op->below = 0;	1706	op->below = 0;
…		…
1738	if ((op->glow_radius != 0) && map)	1710	if ((op->glow_radius != 0) && map)
1739	{	1711	{
1740	#ifdef DEBUG_LIGHTS	1712	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1713	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1714	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1715	if (map->darkness)
1744	update_all_los (map, x, y);	1716	update_all_los (map, x, y);
1745	}	1717	}
1746		1718
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1719	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1720	* It sure simplifies this function...
…		…
1753	{	1725	{
1754	op->below = inv;	1726	op->below = inv;
1755	op->below->above = op;	1727	op->below->above = op;
1756	inv = op;	1728	inv = op;
1757	}	1729	}
		1730
		1731	INVOKE_OBJECT (INSERT, this);
1758		1732
1759	return op;	1733	return op;
1760	}	1734	}
1761		1735
1762	/*	1736	/*
…		…
1777	*	1751	*
1778	* MSW 2001-07-08: Check all objects on space, not just those below	1752	* MSW 2001-07-08: Check all objects on space, not just those below
1779	* object being inserted. insert_ob_in_map may not put new objects	1753	* object being inserted. insert_ob_in_map may not put new objects
1780	* on top.	1754	* on top.
1781	*/	1755	*/
1782
1783	int	1756	int
1784	check_move_on (object *op, object *originator)	1757	check_move_on (object *op, object *originator)
1785	{	1758	{
1786	object *tmp;	1759	object *tmp;
1787	maptile *m = op->map;	1760	maptile *m = op->map;
…		…
1814		1787
1815	/* The objects have to be checked from top to bottom.	1788	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1789	* Hence, we first go to the top:
1817	*/	1790	*/
1818		1791
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1792	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820	{	1793	{
1821	/* Trim the search when we find the first other spell effect	1794	/* Trim the search when we find the first other spell effect
1822	* this helps performance so that if a space has 50 spell objects,	1795	* this helps performance so that if a space has 50 spell objects,
1823	* we don't need to check all of them.	1796	* we don't need to check all of them.
1824	*/	1797	*/
…		…
1879	/*	1852	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1853	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1854	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1883	*/	1856	*/
1884
1885	object *	1857	object *
1886	present_arch (const archetype *at, maptile *m, int x, int y)	1858	present_arch (const archetype *at, maptile *m, int x, int y)
1887	{	1859	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL || out_of_map (m, x, y))	1860	if (!m || out_of_map (m, x, y))
1892	{	1861	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1862	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1863	return NULL;
1895	}	1864	}
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1865
		1866	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897	if (tmp->arch == at)	1867	if (tmp->arch == at)
1898	return tmp;	1868	return tmp;
		1869
1899	return NULL;	1870	return NULL;
1900	}	1871	}
1901		1872
1902	/*	1873	/*
1903	* present(type, map, x, y) searches for any objects with	1874	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1875	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1876	* The first matching object is returned, or NULL if none.
1906	*/	1877	*/
1907
1908	object *	1878	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1879	present (unsigned char type, maptile *m, int x, int y)
1910	{	1880	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1881	if (out_of_map (m, x, y))
1915	{	1882	{
1916	LOG (llevError, "Present called outside map.\n");	1883	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1884	return NULL;
1918	}	1885	}
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1886
		1887	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920	if (tmp->type == type)	1888	if (tmp->type == type)
1921	return tmp;	1889	return tmp;
		1890
1922	return NULL;	1891	return NULL;
1923	}	1892	}
1924		1893
1925	/*	1894	/*
1926	* present_in_ob(type, object) searches for any objects with	1895	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1896	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1897	* The first matching object is returned, or NULL if none.
1929	*/	1898	*/
1930
1931	object *	1899	object *
1932	present_in_ob (unsigned char type, const object *op)	1900	present_in_ob (unsigned char type, const object *op)
1933	{	1901	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1902	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1903	if (tmp->type == type)
1939	return tmp;	1904	return tmp;
		1905
1940	return NULL;	1906	return NULL;
1941	}	1907	}
1942		1908
1943	/*	1909	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1910	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1918	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1919	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1920	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1921	* to be unique.
1956	*/	1922	*/
1957
1958	object *	1923	object *
1959	present_in_ob_by_name (int type, const char *str, const object *op)	1924	present_in_ob_by_name (int type, const char *str, const object *op)
1960	{	1925	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1926	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1927	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1928	return tmp;
1968	}	1929
1969	return NULL;	1930	return 0;
1970	}	1931	}
1971		1932
1972	/*	1933	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1934	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1935	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
1976	*/	1937	*/
1977
1978	object *	1938	object *
1979	present_arch_in_ob (const archetype *at, const object *op)	1939	present_arch_in_ob (const archetype *at, const object *op)
1980	{	1940	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1941	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1942	if (tmp->arch == at)
1986	return tmp;	1943	return tmp;
		1944
1987	return NULL;	1945	return NULL;
1988	}	1946	}
1989		1947
1990	/*	1948	/*
1991	* activate recursively a flag on an object inventory	1949	* activate recursively a flag on an object inventory
1992	*/	1950	*/
1993	void	1951	void
1994	flag_inv (object *op, int flag)	1952	flag_inv (object *op, int flag)
1995	{	1953	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1954	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1955	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1956	{
2002	SET_FLAG (tmp, flag);	1957	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1958	flag_inv (tmp, flag);
2004	}	1959	}
2005	} /*	1960	}
		1961
		1962	/*
2006	* desactivate recursively a flag on an object inventory	1963	* deactivate recursively a flag on an object inventory
2007	*/	1964	*/
2008	void	1965	void
2009	unflag_inv (object *op, int flag)	1966	unflag_inv (object *op, int flag)
2010	{	1967	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1968	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1969	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	1970	{
2017	CLEAR_FLAG (tmp, flag);	1971	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	1972	unflag_inv (tmp, flag);
2019	}	1973	}
2020	}	1974	}
…		…
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).	1978	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for	1979	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.	1980	* him/her-self and all object carried by a call to this function.
2027	*/	1981	*/
2028
2029	void	1982	void
2030	set_cheat (object *op)	1983	set_cheat (object *op)
2031	{	1984	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);	1985	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);	1986	flag_inv (op, FLAG_WAS_WIZ);
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	2005	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	2006	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	2007	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	2008	* customized, changed states, etc.
2056	*/	2009	*/
2057
2058	int	2010	int
2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2011	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060	{	2012	{
2061	int
2062	i,
2063	index = 0, flag;	2013	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	2014	int altern[SIZEOFFREE];
2066		2015
2067	for (i = start; i < stop; i++)	2016	for (int i = start; i < stop; i++)
2068	{	2017	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2018	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070	if (!flag)	2019	if (!flag)
2071	altern[index++] = i;	2020	altern [index++] = i;
2072		2021
2073	/* Basically, if we find a wall on a space, we cut down the search size.	2022	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	2023	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	2024	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	2025	* if the space being examined only has a wall to the north and empty
…		…
2092	* find_first_free_spot(archetype, maptile, x, y) works like	2041	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	2042	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	2043	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2044	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	2045	*/
2097
2098	int	2046	int
2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2047	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100	{	2048	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2049	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2050	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2051	return i;
2108	}	2052
2109	return -1;	2053	return -1;
2110	}	2054	}
2111		2055
2112	/*	2056	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2057	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2058	* arr[begin..end-1].
		2059	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2060	*/
2116	static void	2061	static void
2117	permute (int *arr, int begin, int end)	2062	permute (int *arr, int begin, int end)
2118	{	2063	{
2119	int	2064	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2065	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2066
2130	tmp = arr[i];	2067	while (--end)
2131	arr[i] = arr[j];	2068	swap (arr [end], arr [RANDOM () % (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2069	}
2135		2070
2136	/* new function to make monster searching more efficient, and effective!	2071	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2072	* This basically returns a randomized array (in the passed pointer) of
2138	* the spaces to find monsters. In this way, it won't always look for	2073	* the spaces to find monsters. In this way, it won't always look for
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2076	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2077	*/
2143	void	2078	void
2144	get_search_arr (int *search_arr)	2079	get_search_arr (int *search_arr)
2145	{	2080	{
2146	int	2081	int i;
2147	i;
2148		2082
2149	for (i = 0; i < SIZEOFFREE; i++)	2083	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2084	search_arr[i] = i;
2152	}
2153		2085
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2086	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2087	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2088	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2089	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2098	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2099	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2100	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2101	* there is capable of.
2170	*/	2102	*/
2171
2172	int	2103	int
2173	find_dir (maptile *m, int x, int y, object *exclude)	2104	find_dir (maptile *m, int x, int y, object *exclude)
2174	{	2105	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2106	int i, max = SIZEOFFREE, mflags;
2178		2107
2179	sint16 nx, ny;	2108	sint16 nx, ny;
2180	object *	2109	object *tmp;
2181	tmp;
2182	maptile *	2110	maptile *mp;
2183	mp;
2184		2111
2185	MoveType blocked, move_type;	2112	MoveType blocked, move_type;
2186		2113
2187	if (exclude && exclude->head)	2114	if (exclude && exclude->head)
2188	{	2115	{
…		…
2205		2132
2206	if (mflags & P_OUT_OF_MAP)	2133	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2134	max = maxfree[i];
2208	else	2135	else
2209	{	2136	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2137	mapspace &ms = mp->at (nx, ny);
		2138
		2139	blocked = ms.move_block;
2211		2140
2212	if ((move_type & blocked) == move_type)	2141	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2142	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2143	else if (mflags & P_IS_ALIVE)
2215	{	2144	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2145	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2146	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2147	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218	break;	2148	break;
2219		2149
2220	if (tmp)	2150	if (tmp)
2221	return freedir[i];	2151	return freedir[i];
2222	}	2152	}
…		…
2228		2158
2229	/*	2159	/*
2230	* distance(object 1, object 2) will return the square of the	2160	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2161	* distance between the two given objects.
2232	*/	2162	*/
2233
2234	int	2163	int
2235	distance (const object *ob1, const object *ob2)	2164	distance (const object *ob1, const object *ob2)
2236	{	2165	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2166	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2167	}
2242		2168
2243	/*	2169	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2170	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2171	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2172	* object, needs to travel toward it.
2247	*/	2173	*/
2248
2249	int	2174	int
2250	find_dir_2 (int x, int y)	2175	find_dir_2 (int x, int y)
2251	{	2176	{
2252	int q;	2177	int q;
2253		2178
…		…
2292	int	2217	int
2293	absdir (int d)	2218	absdir (int d)
2294	{	2219	{
2295	while (d < 1)	2220	while (d < 1)
2296	d += 8;	2221	d += 8;
		2222
2297	while (d > 8)	2223	while (d > 8)
2298	d -= 8;	2224	d -= 8;
		2225
2299	return d;	2226	return d;
2300	}	2227	}
2301		2228
2302	/*	2229	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2305	*/	2232	*/
2306		2233
2307	int	2234	int
2308	dirdiff (int dir1, int dir2)	2235	dirdiff (int dir1, int dir2)
2309	{	2236	{
2310	int	2237	int d;
2311	d;
2312		2238
2313	d = abs (dir1 - dir2);	2239	d = abs (dir1 - dir2);
2314	if (d > 4)	2240	if (d > 4)
2315	d = 8 - d;	2241	d = 8 - d;
		2242
2316	return d;	2243	return d;
2317	}	2244	}
2318		2245
2319	/* peterm:	2246	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2247	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2250	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2251	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2252	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2253	* functions.
2327	*/	2254	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2255	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2256	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2257	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2258	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2259	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2260	{0, 0, 0}, /* 4 */
…		…
2485	/* Basically, we save the content of the string to a temp file, then call */	2410	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */	2411	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */	2412	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */	2413	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */	2414	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *	2415	object *
2492	load_object_str (const char *obstr)	2416	load_object_str (const char *obstr)
2493	{	2417	{
2494	object *op;	2418	object *op;
2495	char filename[MAX_BUF];	2419	char filename[MAX_BUF];
…		…
2525	* returns NULL if no match.	2449	* returns NULL if no match.
2526	*/	2450	*/
2527	object *	2451	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2452	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2453	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2454	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2455	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2456	return tmp;
2535		2457
2536	return NULL;	2458	return 0;
2537	}	2459	}
2538		2460
2539	/* If ob has a field named key, return the link from the list,	2461	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2462	* otherwise return NULL.
2541	*	2463	*
…		…
2543	* do the desired thing.	2465	* do the desired thing.
2544	*/	2466	*/
2545	key_value *	2467	key_value *
2546	get_ob_key_link (const object *ob, const char *key)	2468	get_ob_key_link (const object *ob, const char *key)
2547	{	2469	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2470	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2471	if (link->key == key)
2552	return link;	2472	return link;
2553		2473
2554	return NULL;	2474	return 0;
2555	}	2475	}
2556		2476
2557	/*	2477	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2478	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2479	*
…		…
2599	* Returns TRUE on success.	2519	* Returns TRUE on success.
2600	*/	2520	*/
2601	int	2521	int
2602	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2522	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603	{	2523	{
2604	key_value *
2605	field = NULL, *last = NULL;	2524	key_value *field = NULL, *last = NULL;
2606		2525
2607	for (field = op->key_values; field != NULL; field = field->next)	2526	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2527	{
2609	if (field->key != canonical_key)	2528	if (field->key != canonical_key)
2610	{	2529	{
…		…
2638	/* IF we get here, key doesn't exist */	2557	/* IF we get here, key doesn't exist */
2639		2558
2640	/* No field, we'll have to add it. */	2559	/* No field, we'll have to add it. */
2641		2560
2642	if (!add_key)	2561	if (!add_key)
2643	{
2644	return FALSE;	2562	return FALSE;
2645	}	2563
2646	/* There isn't any good reason to store a null	2564	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2565	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2566	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2567	* be here. If user wants to store empty strings,
2650	* should pass in ""	2568	* should pass in ""
…		…
2699	}	2617	}
2700	else	2618	else
2701	item = item->env;	2619	item = item->env;
2702	}	2620	}
2703		2621
		2622
		2623	const char *
		2624	object::flag_desc (char *desc, int len) const
		2625	{
		2626	char *p = desc;
		2627	bool first = true;
		2628
		2629	*p = 0;
		2630
		2631	for (int i = 0; i < NUM_FLAGS; i++)
		2632	{
		2633	if (len <= 10) // magic constant!
		2634	{
		2635	snprintf (p, len, ",...");
		2636	break;
		2637	}
		2638
		2639	if (flag [i])
		2640	{
		2641	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2642	len -= cnt;
		2643	p += cnt;
		2644	first = false;
		2645	}
		2646	}
		2647
		2648	return desc;
		2649	}
		2650
2704	// return a suitable string describing an objetc in enough detail to find it	2651	// return a suitable string describing an object in enough detail to find it
2705	const char *	2652	const char *
2706	object::debug_desc (char *info) const	2653	object::debug_desc (char *info) const
2707	{	2654	{
		2655	char flagdesc[512];
2708	char info2[256 * 3];	2656	char info2[256 * 4];
2709	char *p = info;	2657	char *p = info;
2710		2658
2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2659	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2712	count,	2660	count, uuid.seq,
2713	&name,	2661	&name,
2714	title ? " " : "",	2662	title ? "\",title:" : "",
2715	title ? (const char *)title : "");	2663	title ? (const char *)title : "",
		2664	flag_desc (flagdesc, 512), type);
2716		2665
2717	if (env)	2666	if (env)
2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2667	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719		2668
2720	if (map)	2669	if (map)
2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2670	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722		2671
2723	return info;	2672	return info;
2724	}	2673	}
2725		2674
2726	const char *	2675	const char *
2727	object::debug_desc () const	2676	object::debug_desc () const
2728	{	2677	{
2729	static char info[256 * 3];	2678	static char info[256 * 4];
2730	return debug_desc (info);	2679	return debug_desc (info);
2731	}	2680	}
2732		2681

Diff Legend

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