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.78 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.102 by root, Mon Jan 1 17:34:11 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
…		…
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	*(object_pod *)dst = *this;
488
489	if (self || cb)
490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
491		486
492	if (is_freed)	487	if (is_freed)
493	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
494		489
495	if (is_removed)	490	if (is_removed)
…		…
526	tail = new_link;	521	tail = new_link;
527	}	522	}
528	}	523	}
529	}	524	}
530		525
531	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
532	}	527	}
533		528
534	object *	529	object *
535	object::clone ()	530	object::clone ()
536	{	531	{
…		…
542	/*	537	/*
543	* 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
544	* 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
545	* 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.
546	*/	541	*/
547
548	void	542	void
549	update_turn_face (object *op)	543	update_turn_face (object *op)
550	{	544	{
551	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
552	return;	546	return;
		547
553	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
554	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
555	}	550	}
556		551
557	/*	552	/*
558	* 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
559	* 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.
560	* 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.
561	*/	556	*/
562	void	557	void
563	update_ob_speed (object *op)	558	object::set_speed (float speed)
564	{	559	{
565	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
566
567	/* No reason putting the archetypes objects on the speed list,
568	* since they never really need to be updated.
569	*/
570
571	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
572	{	561	{
573	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
574	#ifdef MANY_CORES
575	abort ();
576	#else
577	op->speed = 0;	563	speed = 0;
578	#endif
579	}
580
581	if (arch_init)
582	return;
583
584	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
585	{	564	}
586	/* If already on active list, don't do anything */
587	if (op->active_next || op->active_prev || op == active_objects)
588	return;
589		565
590	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
591	* of the list. */
592	op->active_next = active_objects;
593		567
594	if (op->active_next != NULL)	568	if (has_active_speed ())
595	op->active_next->active_prev = op;	569	activate ();
596
597	active_objects = op;
598	}
599	else	570	else
600	{	571	deactivate ();
601	/* If not on the active list, nothing needs to be done */
602	if (!op->active_next && !op->active_prev && op != active_objects)
603	return;
604
605	if (op->active_prev == NULL)
606	{
607	active_objects = op->active_next;
608
609	if (op->active_next != NULL)
610	op->active_next->active_prev = NULL;
611	}
612	else
613	{
614	op->active_prev->active_next = op->active_next;
615
616	if (op->active_next)
617	op->active_next->active_prev = op->active_prev;
618	}
619
620	op->active_next = NULL;
621	op->active_prev = NULL;
622	}
623	}
624
625	/* This function removes object 'op' from the list of active
626	* objects.
627	* This should only be used for style maps or other such
628	* reference maps where you don't want an object that isn't
629	* in play chewing up cpu time getting processed.
630	* The reverse of this is to call update_ob_speed, which
631	* will do the right thing based on the speed of the object.
632	*/
633	void
634	remove_from_active_list (object *op)
635	{
636	/* If not on the active list, nothing needs to be done */
637	if (!op->active_next && !op->active_prev && op != active_objects)
638	return;
639
640	if (op->active_prev == NULL)
641	{
642	active_objects = op->active_next;
643	if (op->active_next != NULL)
644	op->active_next->active_prev = NULL;
645	}
646	else
647	{
648	op->active_prev->active_next = op->active_next;
649	if (op->active_next)
650	op->active_next->active_prev = op->active_prev;
651	}
652	op->active_next = NULL;
653	op->active_prev = NULL;
654	}	572	}
655		573
656	/*	574	/*
657	* update_object() updates the the map.	575	* update_object() updates the the map.
658	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
695	*/	613	*/
696	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
697	return;	615	return;
698		616
699	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
700	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)
701	{	619	{
702	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
703	#ifdef MANY_CORES	621	#ifdef MANY_CORES
704	abort ();	622	abort ();
705	#endif	623	#endif
706	return;	624	return;
707	}	625	}
708		626
709	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
710		628
711	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
712	/* nop */;	630	/* nop */;
713	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
714	{	632	{
715	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
716	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
725	/* 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
726	* to have move_allow right now.	644	* to have move_allow right now.
727	*/	645	*/
728	|| ((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
729	|| 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)
730	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
731	}	649	}
732	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
733	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
734	* that is being removed.	652	* that is being removed.
735	*/	653	*/
736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
737	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
738	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
739	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
740	else	658	else
741	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
742		660
743	if (op->more)	661	if (op->more)
744	update_object (op->more, action);	662	update_object (op->more, action);
745	}	663	}
746		664
747	object::vector object::mortals;
748	object::vector object::objects; // not yet used
749	object *object::first;	665	object *object::first;
750
751	void object::free_mortals ()
752	{
753	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
754	if ((*i)->refcnt)
755	++i; // further delay freeing
756	else
757	{
758	delete *i;
759	mortals.erase (i);
760	}
761	}
762		666
763	object::object ()	667	object::object ()
764	{	668	{
765	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
766		670
…		…
798		702
799	prev = 0;	703	prev = 0;
800	next = 0;	704	next = 0;
801	}	705	}
802		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->above)
		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->above)
		778	op->deactivate_recursive ();
		779
		780	deactivate ();
		781	}
		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	// need to check first, because the checks below might segfault
		791	// as we might be on an invalid mapspace and crossfire code
		792	// is too buggy to ensure that the inventory is empty.
		793	// corollary: if you create arrows etc. with stuff in tis inventory,
		794	// cf will crash below with off-map x and y
		795	if (!inv)
		796	return;
		797
		798	/* Only if the space blocks everything do we not process -
		799	* if some form of movement is allowed, let objects
		800	* drop on that space.
		801	*/
		802	if (!drop_to_ground
		803	|| !map
		804	|| map->in_memory != MAP_IN_MEMORY
		805	|| ms ().move_block == MOVE_ALL)
		806	{
		807	while (inv)
		808	{
		809	inv->destroy_inv (drop_to_ground);
		810	inv->destroy ();
		811	}
		812	}
		813	else
		814	{ /* Put objects in inventory onto this space */
		815	while (inv)
		816	{
		817	object *op = inv;
		818
		819	if (op->flag [FLAG_STARTEQUIP]
		820	|| op->flag [FLAG_NO_DROP]
		821	|| op->type == RUNE
		822	|| op->type == TRAP
		823	|| op->flag [FLAG_IS_A_TEMPLATE])
		824	op->destroy ();
		825	else
		826	map->insert (op, x, y);
		827	}
		828	}
		829	}
		830
803	object *object::create ()	831	object *object::create ()
804	{	832	{
805	object *op = new object;	833	object *op = new object;
806	op->link ();	834	op->link ();
807	return op;	835	return op;
808	}	836	}
809		837
810	/*	838	void
811	* free_object() frees everything allocated by an object, removes	839	object::do_destroy ()
812	* it from the list of used objects, and puts it on the list of
813	* free objects. The IS_FREED() flag is set in the object.
814	* The object must have been removed by remove_ob() first for
815	* this function to succeed.
816	*
817	* If destroy_inventory is set, free inventory as well. Else drop items in
818	* inventory to the ground.
819	*/
820	void object::destroy (bool destroy_inventory)
821	{	840	{
822	if (QUERY_FLAG (this, FLAG_FREED))	841	if (flag [FLAG_IS_LINKED])
		842	remove_button_link (this);
		843
		844	if (flag [FLAG_FRIENDLY])
		845	remove_friendly_object (this);
		846
		847	if (!flag [FLAG_REMOVED])
		848	remove ();
		849
		850	if (flag [FLAG_FREED])
823	return;	851	return;
824		852
825	if (QUERY_FLAG (this, FLAG_FRIENDLY))	853	set_speed (0);
826	remove_friendly_object (this);
827		854
828	if (!QUERY_FLAG (this, FLAG_REMOVED))	855	flag [FLAG_FREED] = 1;
829	remove ();
830		856
831	SET_FLAG (this, FLAG_FREED);	857	attachable::do_destroy ();
832		858
833	if (more)	859	destroy_inv (true);
834	{	860	unlink ();
835	more->destroy (destroy_inventory);
836	more = 0;
837	}
838
839	if (inv)
840	{
841	/* Only if the space blocks everything do we not process -
842	* if some form of movement is allowed, let objects
843	* drop on that space.
844	*/
845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
846	{
847	object *op = inv;
848
849	while (op)
850	{
851	object *tmp = op->below;
852	op->destroy (destroy_inventory);
853	op = tmp;
854	}
855	}
856	else
857	{ /* Put objects in inventory onto this space */
858	object *op = inv;
859
860	while (op)
861	{
862	object *tmp = op->below;
863
864	op->remove ();
865
866	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
868	op->destroy ();
869	else
870	{
871	op->x = x;
872	op->y = y;
873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
874	}
875
876	op = tmp;
877	}
878	}
879	}
880		861
881	// hack to ensure that freed objects still have a valid map	862	// hack to ensure that freed objects still have a valid map
882	{	863	{
883	static maptile *freed_map; // freed objects are moved here to avoid crashes	864	static maptile *freed_map; // freed objects are moved here to avoid crashes
884		865
…		…
888		869
889	freed_map->name = "/internal/freed_objects_map";	870	freed_map->name = "/internal/freed_objects_map";
890	freed_map->width = 3;	871	freed_map->width = 3;
891	freed_map->height = 3;	872	freed_map->height = 3;
892		873
893	freed_map->allocate ();	874	freed_map->alloc ();
894	}	875	}
895		876
896	map = freed_map;	877	map = freed_map;
897	x = 1;	878	x = 1;
898	y = 1;	879	y = 1;
899	}	880	}
900		881
		882	head = 0;
		883
		884	if (more)
		885	{
		886	more->destroy ();
		887	more = 0;
		888	}
		889
901	// clear those pointers that likely might have circular references to us	890	// clear those pointers that likely might have circular references to us
902	owner = 0;	891	owner = 0;
903	enemy = 0;	892	enemy = 0;
904	attacked_by = 0;	893	attacked_by = 0;
905		894
906	// only relevant for players(?), but make sure of it anyways	895	// only relevant for players(?), but make sure of it anyways
907	contr = 0;	896	contr = 0;
		897	}
908		898
909	/* Remove object from the active list */	899	void
910	speed = 0;	900	object::destroy (bool destroy_inventory)
911	update_ob_speed (this);	901	{
		902	if (destroyed ())
		903	return;
912		904
913	unlink ();	905	if (destroy_inventory)
		906	destroy_inv (false);
914		907
915	mortals.push_back (this);	908	attachable::destroy ();
916	}	909	}
917		910
918	/*	911	/*
919	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
920	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
…		…
944	object::remove ()	937	object::remove ()
945	{	938	{
946	object *tmp, *last = 0;	939	object *tmp, *last = 0;
947	object *otmp;	940	object *otmp;
948		941
949	int check_walk_off;
950
951	if (QUERY_FLAG (this, FLAG_REMOVED))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
952	return;	943	return;
953		944
954	SET_FLAG (this, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
955		947
956	if (more)	948	if (more)
957	more->remove ();	949	more->remove ();
958		950
959	/*	951	/*
…		…
972	* to save cpu time.	964	* to save cpu time.
973	*/	965	*/
974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
975	otmp->update_stats ();	967	otmp->update_stats ();
976		968
977	if (above != NULL)	969	if (above)
978	above->below = below;	970	above->below = below;
979	else	971	else
980	env->inv = below;	972	env->inv = below;
981		973
982	if (below != NULL)	974	if (below)
983	below->above = above;	975	below->above = above;
984		976
985	/* we set up values so that it could be inserted into	977	/* we set up values so that it could be inserted into
986	* the map, but we don't actually do that - it is up	978	* the map, but we don't actually do that - it is up
987	* to the caller to decide what we want to do.	979	* to the caller to decide what we want to do.
…		…
991	above = 0, below = 0;	983	above = 0, below = 0;
992	env = 0;	984	env = 0;
993	}	985	}
994	else if (map)	986	else if (map)
995	{	987	{
996	/* Re did the following section of code - it looks like it had	988	if (type == PLAYER)
997	* lots of logic for things we no longer care about
998	*/	989	{
		990	--map->players;
		991	map->touch ();
		992	}
		993
		994	map->dirty = true;
999		995
1000	/* link the object above us */	996	/* link the object above us */
1001	if (above)	997	if (above)
1002	above->below = below;	998	above->below = below;
1003	else	999	else
…		…
1021	dump = dump_object (GET_MAP_OB (map, x, y));	1017	dump = dump_object (GET_MAP_OB (map, x, y));
1022	LOG (llevError, "%s\n", dump);	1018	LOG (llevError, "%s\n", dump);
1023	free (dump);	1019	free (dump);
1024	}	1020	}
1025		1021
1026	map->at (x, y).bottom = above; /* goes on above it. */	1022	map->at (x, y).bot = above; /* goes on above it. */
1027	}	1023	}
1028		1024
1029	above = 0;	1025	above = 0;
1030	below = 0;	1026	below = 0;
1031		1027
1032	if (map->in_memory == MAP_SAVING)	1028	if (map->in_memory == MAP_SAVING)
1033	return;	1029	return;
1034		1030
1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1031	int check_walk_off = !flag [FLAG_NO_APPLY];
1036		1032
1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1033	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1038	{	1034	{
1039	/* No point updating the players look faces if he is the object	1035	/* No point updating the players look faces if he is the object
1040	* being removed.	1036	* being removed.
1041	*/	1037	*/
1042		1038
…		…
1046	* removed (most likely destroyed), update the player view	1042	* removed (most likely destroyed), update the player view
1047	* appropriately.	1043	* appropriately.
1048	*/	1044	*/
1049	if (tmp->container == this)	1045	if (tmp->container == this)
1050	{	1046	{
1051	CLEAR_FLAG (this, FLAG_APPLIED);	1047	flag [FLAG_APPLIED] = 0;
1052	tmp->container = 0;	1048	tmp->container = 0;
1053	}	1049	}
1054		1050
		1051	if (tmp->contr->ns)
1055	tmp->contr->ns->floorbox_update ();	1052	tmp->contr->ns->floorbox_update ();
1056	}	1053	}
1057		1054
1058	/* See if player moving off should effect something */	1055	/* See if object moving off should effect something */
1059	if (check_walk_off	1056	if (check_walk_off
1060	&& ((move_type & tmp->move_off)	1057	&& ((move_type & tmp->move_off)
1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1058	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1062	{	1059	{
1063	move_apply (tmp, this, 0);	1060	move_apply (tmp, this, 0);
…		…
1065	if (destroyed ())	1062	if (destroyed ())
1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1063	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1067	}	1064	}
1068		1065
1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1066	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1070		1067	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1071	if (tmp->above == tmp)	1068	if (tmp->above == tmp)
1072	tmp->above = 0;	1069	tmp->above = 0;
1073		1070
1074	last = tmp;	1071	last = tmp;
1075	}	1072	}
1076		1073
1077	/* last == NULL of there are no objects on this space */	1074	/* last == NULL if there are no objects on this space */
		1075	//TODO: this makes little sense, why only update the topmost object?
1078	if (!last)	1076	if (!last)
1079	map->at (x, y).flags_ = P_NEED_UPDATE;	1077	map->at (x, y).flags_ = 0;
1080	else	1078	else
1081	update_object (last, UP_OBJ_REMOVE);	1079	update_object (last, UP_OBJ_REMOVE);
1082		1080
1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1081	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1084	update_all_los (map, x, y);	1082	update_all_los (map, x, y);
1085	}	1083	}
1086	}	1084	}
1087		1085
1088	/*	1086	/*
…		…
1097	merge_ob (object *op, object *top)	1095	merge_ob (object *op, object *top)
1098	{	1096	{
1099	if (!op->nrof)	1097	if (!op->nrof)
1100	return 0;	1098	return 0;
1101		1099
1102	if (top == NULL)	1100	if (top)
1103	for (top = op; top != NULL && top->above != NULL; top = top->above);	1101	for (top = op; top && top->above; top = top->above)
		1102	;
1104		1103
1105	for (; top != NULL; top = top->below)	1104	for (; top; top = top->below)
1106	{	1105	{
1107	if (top == op)	1106	if (top == op)
1108	continue;	1107	continue;
1109		1108
1110	if (object::can_merge (op, top))	1109	if (object::can_merge (op, top))
…		…
1126	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1127	*/	1126	*/
1128	object *	1127	object *
1129	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1130	{	1129	{
1131	object *tmp;
1132
1133	if (op->head)
1134	op = op->head;
1135
1136	for (tmp = op; tmp; tmp = tmp->more)	1130	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1137	{	1131	{
1138	tmp->x = x + tmp->arch->clone.x;	1132	tmp->x = x + tmp->arch->clone.x;
1139	tmp->y = y + tmp->arch->clone.y;	1133	tmp->y = y + tmp->arch->clone.y;
1140	}	1134	}
1141		1135
…		…
1160	* Return value:	1154	* Return value:
1161	* new object if 'op' was merged with other object	1155	* new object if 'op' was merged with other object
1162	* NULL if 'op' was destroyed	1156	* NULL if 'op' was destroyed
1163	* just 'op' otherwise	1157	* just 'op' otherwise
1164	*/	1158	*/
1165
1166	object *	1159	object *
1167	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1160	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1168	{	1161	{
1169	object *tmp, *top, *floor = NULL;	1162	object *tmp, *top, *floor = NULL;
1170	sint16 x, y;	1163	sint16 x, y;
…		…
1173	{	1166	{
1174	LOG (llevError, "Trying to insert freed object!\n");	1167	LOG (llevError, "Trying to insert freed object!\n");
1175	return NULL;	1168	return NULL;
1176	}	1169	}
1177		1170
1178	if (m == NULL)	1171	if (!m)
1179	{	1172	{
1180	char *dump = dump_object (op);	1173	char *dump = dump_object (op);
1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1182	free (dump);	1175	free (dump);
1183	return op;	1176	return op;
…		…
1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1205	free (dump);	1198	free (dump);
1206	return op;	1199	return op;
1207	}	1200	}
1208		1201
1209	if (op->more != NULL)	1202	if (op->more)
1210	{	1203	{
1211	/* The part may be on a different map. */	1204	/* The part may be on a different map. */
1212		1205
1213	object *more = op->more;	1206	object *more = op->more;
1214		1207
…		…
1230	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1231	{	1224	{
1232	if (!op->head)	1225	if (!op->head)
1233	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1234		1227
1235	return NULL;	1228	return 0;
1236	}	1229	}
1237	}	1230	}
1238		1231
1239	CLEAR_FLAG (op, FLAG_REMOVED);	1232	CLEAR_FLAG (op, FLAG_REMOVED);
1240		1233
…		…
1247	y = op->y;	1240	y = op->y;
1248		1241
1249	/* this has to be done after we translate the coordinates.	1242	/* this has to be done after we translate the coordinates.
1250	*/	1243	*/
1251	if (op->nrof && !(flag & INS_NO_MERGE))	1244	if (op->nrof && !(flag & INS_NO_MERGE))
1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1253	if (object::can_merge (op, tmp))	1246	if (object::can_merge (op, tmp))
1254	{	1247	{
1255	op->nrof += tmp->nrof;	1248	op->nrof += tmp->nrof;
1256	tmp->destroy ();	1249	tmp->destroy ();
1257	}	1250	}
…		…
1274	op->below = originator->below;	1267	op->below = originator->below;
1275		1268
1276	if (op->below)	1269	if (op->below)
1277	op->below->above = op;	1270	op->below->above = op;
1278	else	1271	else
1279	op->ms ().bottom = op;	1272	op->ms ().bot = op;
1280		1273
1281	/* since *below* originator, no need to update top */	1274	/* since *below* originator, no need to update top */
1282	originator->below = op;	1275	originator->below = op;
1283	}	1276	}
1284	else	1277	else
1285	{	1278	{
1286	/* If there are other objects, then */	1279	/* If there are other objects, then */
1287	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1280	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1288	{	1281	{
1289	object *last = NULL;	1282	object *last = 0;
1290		1283
1291	/*	1284	/*
1292	* If there are multiple objects on this space, we do some trickier handling.	1285	* If there are multiple objects on this space, we do some trickier handling.
1293	* We've already dealt with merging if appropriate.	1286	* We've already dealt with merging if appropriate.
1294	* Generally, we want to put the new object on top. But if	1287	* Generally, we want to put the new object on top. But if
…		…
1298	* once we get to them. This reduces the need to traverse over all of	1291	* once we get to them. This reduces the need to traverse over all of
1299	* them when adding another one - this saves quite a bit of cpu time	1292	* them when adding another one - this saves quite a bit of cpu time
1300	* when lots of spells are cast in one area. Currently, it is presumed	1293	* when lots of spells are cast in one area. Currently, it is presumed
1301	* that flying non pickable objects are spell objects.	1294	* that flying non pickable objects are spell objects.
1302	*/	1295	*/
1303
1304	while (top != NULL)	1296	while (top)
1305	{	1297	{
1306	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1298	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1307	floor = top;	1299	floor = top;
1308		1300
1309	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1301	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1362	op->above = GET_MAP_OB (op->map, op->x, op->y);	1354	op->above = GET_MAP_OB (op->map, op->x, op->y);
1363		1355
1364	if (op->above)	1356	if (op->above)
1365	op->above->below = op;	1357	op->above->below = op;
1366		1358
1367	op->below = NULL;	1359	op->below = 0;
1368	op->ms ().bottom = op;	1360	op->ms ().bot = op;
1369	}	1361	}
1370	else	1362	else
1371	{ /* get inserted into the stack above top */	1363	{ /* get inserted into the stack above top */
1372	op->above = top->above;	1364	op->above = top->above;
1373		1365
…		…
1376		1368
1377	op->below = top;	1369	op->below = top;
1378	top->above = op;	1370	top->above = op;
1379	}	1371	}
1380		1372
1381	if (op->above == NULL)	1373	if (!op->above)
1382	op->ms ().top = op;	1374	op->ms ().top = op;
1383	} /* else not INS_BELOW_ORIGINATOR */	1375	} /* else not INS_BELOW_ORIGINATOR */
1384		1376
1385	if (op->type == PLAYER)	1377	if (op->type == PLAYER)
		1378	{
1386	op->contr->do_los = 1;	1379	op->contr->do_los = 1;
		1380	++op->map->players;
		1381	op->map->touch ();
		1382	}
		1383
		1384	op->map->dirty = true;
1387		1385
1388	/* If we have a floor, we know the player, if any, will be above	1386	/* If we have a floor, we know the player, if any, will be above
1389	* it, so save a few ticks and start from there.	1387	* it, so save a few ticks and start from there.
1390	*/	1388	*/
1391	if (!(flag & INS_MAP_LOAD))	1389	if (!(flag & INS_MAP_LOAD))
1392	if (object *pl = op->ms ().player ())	1390	if (object *pl = op->ms ().player ())
		1391	if (pl->contr->ns)
1393	pl->contr->ns->floorbox_update ();	1392	pl->contr->ns->floorbox_update ();
1394		1393
1395	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1396	* visible to others on this map. But update_all_los is really	1395	* visible to others on this map. But update_all_los is really
1397	* an inefficient way to do this, as it means los for all players	1396	* an inefficient way to do this, as it means los for all players
1398	* on the map will get recalculated. The players could very well	1397	* on the map will get recalculated. The players could very well
1399	* be far away from this change and not affected in any way -	1398	* be far away from this change and not affected in any way -
1400	* this should get redone to only look for players within range,	1399	* this should get redone to only look for players within range,
1401	* or just updating the P_NEED_UPDATE for spaces within this area	1400	* or just updating the P_UPTODATE for spaces within this area
1402	* of effect may be sufficient.	1401	* of effect may be sufficient.
1403	*/	1402	*/
1404	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1403	if (op->map->darkness && (op->glow_radius != 0))
1405	update_all_los (op->map, op->x, op->y);	1404	update_all_los (op->map, op->x, op->y);
1406		1405
1407	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1408	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
		1408
		1409	INVOKE_OBJECT (INSERT, op);
1409		1410
1410	/* Don't know if moving this to the end will break anything. However,	1411	/* Don't know if moving this to the end will break anything. However,
1411	* we want to have floorbox_update called before calling this.	1412	* we want to have floorbox_update called before calling this.
1412	*	1413	*
1413	* check_move_on() must be after this because code called from	1414	* check_move_on() must be after this because code called from
…		…
1418		1419
1419	/* if this is not the head or flag has been passed, don't check walk on status */	1420	/* if this is not the head or flag has been passed, don't check walk on status */
1420	if (!(flag & INS_NO_WALK_ON) && !op->head)	1421	if (!(flag & INS_NO_WALK_ON) && !op->head)
1421	{	1422	{
1422	if (check_move_on (op, originator))	1423	if (check_move_on (op, originator))
1423	return NULL;	1424	return 0;
1424		1425
1425	/* If we are a multi part object, lets work our way through the check	1426	/* If we are a multi part object, lets work our way through the check
1426	* walk on's.	1427	* walk on's.
1427	*/	1428	*/
1428	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1429	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1429	if (check_move_on (tmp, originator))	1430	if (check_move_on (tmp, originator))
1430	return NULL;	1431	return 0;
1431	}	1432	}
1432		1433
1433	return op;	1434	return op;
1434	}	1435	}
1435		1436
…		…
1451	tmp1 = arch_to_object (archetype::find (arch_string));	1452	tmp1 = arch_to_object (archetype::find (arch_string));
1452		1453
1453	tmp1->x = op->x;	1454	tmp1->x = op->x;
1454	tmp1->y = op->y;	1455	tmp1->y = op->y;
1455	insert_ob_in_map (tmp1, op->map, op, 0);	1456	insert_ob_in_map (tmp1, op->map, op, 0);
		1457	}
		1458
		1459	object *
		1460	object::insert_at (object *where, object *originator, int flags)
		1461	{
		1462	where->map->insert (this, where->x, where->y, originator, flags);
1456	}	1463	}
1457		1464
1458	/*	1465	/*
1459	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1466	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1460	* is returned contains nr objects, and the remaining parts contains	1467	* is returned contains nr objects, and the remaining parts contains
1461	* the rest (or is removed and freed if that number is 0).	1468	* the rest (or is removed and freed if that number is 0).
1462	* On failure, NULL is returned, and the reason put into the	1469	* On failure, NULL is returned, and the reason put into the
1463	* global static errmsg array.	1470	* global static errmsg array.
1464	*/	1471	*/
1465
1466	object *	1472	object *
1467	get_split_ob (object *orig_ob, uint32 nr)	1473	get_split_ob (object *orig_ob, uint32 nr)
1468	{	1474	{
1469	object *newob;	1475	object *newob;
1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1476	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1506		1512
1507	object *	1513	object *
1508	decrease_ob_nr (object *op, uint32 i)	1514	decrease_ob_nr (object *op, uint32 i)
1509	{	1515	{
1510	object *tmp;	1516	object *tmp;
1511	player *pl;
1512		1517
1513	if (i == 0) /* objects with op->nrof require this check */	1518	if (i == 0) /* objects with op->nrof require this check */
1514	return op;	1519	return op;
1515		1520
1516	if (i > op->nrof)	1521	if (i > op->nrof)
…		…
1529	* IMO, searching through all the players will mostly	1534	* IMO, searching through all the players will mostly
1530	* likely be quicker than following op->env to the map,	1535	* likely be quicker than following op->env to the map,
1531	* and then searching the map for a player.	1536	* and then searching the map for a player.
1532	*/	1537	*/
1533	if (!tmp)	1538	if (!tmp)
1534	{	1539	for_all_players (pl)
1535	for (pl = first_player; pl; pl = pl->next)
1536	if (pl->ob->container == op->env)	1540	if (pl->ob->container == op->env)
1537	{	1541	{
1538	tmp = pl->ob;	1542	tmp = pl->ob;
1539	break;	1543	break;
1540	}	1544	}
1541	}
1542		1545
1543	if (i < op->nrof)	1546	if (i < op->nrof)
1544	{	1547	{
1545	sub_weight (op->env, op->weight * i);	1548	sub_weight (op->env, op->weight * i);
1546	op->nrof -= i;	1549	op->nrof -= i;
…		…
1696	if ((op->glow_radius != 0) && map)	1699	if ((op->glow_radius != 0) && map)
1697	{	1700	{
1698	#ifdef DEBUG_LIGHTS	1701	#ifdef DEBUG_LIGHTS
1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1702	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1700	#endif /* DEBUG_LIGHTS */	1703	#endif /* DEBUG_LIGHTS */
1701	if (MAP_DARKNESS (map))	1704	if (map->darkness)
1702	update_all_los (map, x, y);	1705	update_all_los (map, x, y);
1703	}	1706	}
1704		1707
1705	/* Client has no idea of ordering so lets not bother ordering it here.	1708	/* Client has no idea of ordering so lets not bother ordering it here.
1706	* It sure simplifies this function...	1709	* It sure simplifies this function...
…		…
1711	{	1714	{
1712	op->below = inv;	1715	op->below = inv;
1713	op->below->above = op;	1716	op->below->above = op;
1714	inv = op;	1717	inv = op;
1715	}	1718	}
		1719
		1720	INVOKE_OBJECT (INSERT, this);
1716		1721
1717	return op;	1722	return op;
1718	}	1723	}
1719		1724
1720	/*	1725	/*
…		…
1735	*	1740	*
1736	* MSW 2001-07-08: Check all objects on space, not just those below	1741	* MSW 2001-07-08: Check all objects on space, not just those below
1737	* object being inserted. insert_ob_in_map may not put new objects	1742	* object being inserted. insert_ob_in_map may not put new objects
1738	* on top.	1743	* on top.
1739	*/	1744	*/
1740
1741	int	1745	int
1742	check_move_on (object *op, object *originator)	1746	check_move_on (object *op, object *originator)
1743	{	1747	{
1744	object *tmp;	1748	object *tmp;
1745	maptile *m = op->map;	1749	maptile *m = op->map;
…		…
1772		1776
1773	/* The objects have to be checked from top to bottom.	1777	/* The objects have to be checked from top to bottom.
1774	* Hence, we first go to the top:	1778	* Hence, we first go to the top:
1775	*/	1779	*/
1776		1780
1777	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1778	{	1782	{
1779	/* Trim the search when we find the first other spell effect	1783	/* Trim the search when we find the first other spell effect
1780	* this helps performance so that if a space has 50 spell objects,	1784	* this helps performance so that if a space has 50 spell objects,
1781	* we don't need to check all of them.	1785	* we don't need to check all of them.
1782	*/	1786	*/
…		…
1837	/*	1841	/*
1838	* present_arch(arch, map, x, y) searches for any objects with	1842	* present_arch(arch, map, x, y) searches for any objects with
1839	* a matching archetype at the given map and coordinates.	1843	* a matching archetype at the given map and coordinates.
1840	* The first matching object is returned, or NULL if none.	1844	* The first matching object is returned, or NULL if none.
1841	*/	1845	*/
1842
1843	object *	1846	object *
1844	present_arch (const archetype *at, maptile *m, int x, int y)	1847	present_arch (const archetype *at, maptile *m, int x, int y)
1845	{	1848	{
1846	object *
1847	tmp;
1848
1849	if (m == NULL || out_of_map (m, x, y))	1849	if (m == NULL || out_of_map (m, x, y))
1850	{	1850	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1851	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1852	return NULL;
1853	}	1853	}
		1854
1854	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1855	if (tmp->arch == at)	1856	if (tmp->arch == at)
1856	return tmp;	1857	return tmp;
		1858
1857	return NULL;	1859	return NULL;
1858	}	1860	}
1859		1861
1860	/*	1862	/*
1861	* present(type, map, x, y) searches for any objects with	1863	* present(type, map, x, y) searches for any objects with
1862	* a matching type variable at the given map and coordinates.	1864	* a matching type variable at the given map and coordinates.
1863	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
1864	*/	1866	*/
1865
1866	object *	1867	object *
1867	present (unsigned char type, maptile *m, int x, int y)	1868	present (unsigned char type, maptile *m, int x, int y)
1868	{	1869	{
1869	object *
1870	tmp;
1871
1872	if (out_of_map (m, x, y))	1870	if (out_of_map (m, x, y))
1873	{	1871	{
1874	LOG (llevError, "Present called outside map.\n");	1872	LOG (llevError, "Present called outside map.\n");
1875	return NULL;	1873	return NULL;
1876	}	1874	}
		1875
1877	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1878	if (tmp->type == type)	1877	if (tmp->type == type)
1879	return tmp;	1878	return tmp;
		1879
1880	return NULL;	1880	return NULL;
1881	}	1881	}
1882		1882
1883	/*	1883	/*
1884	* present_in_ob(type, object) searches for any objects with	1884	* present_in_ob(type, object) searches for any objects with
1885	* a matching type variable in the inventory of the given object.	1885	* a matching type variable in the inventory of the given object.
1886	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
1887	*/	1887	*/
1888
1889	object *	1888	object *
1890	present_in_ob (unsigned char type, const object *op)	1889	present_in_ob (unsigned char type, const object *op)
1891	{	1890	{
1892	object *
1893	tmp;
1894
1895	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1891	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1896	if (tmp->type == type)	1892	if (tmp->type == type)
1897	return tmp;	1893	return tmp;
		1894
1898	return NULL;	1895	return NULL;
1899	}	1896	}
1900		1897
1901	/*	1898	/*
1902	* present_in_ob (type, str, object) searches for any objects with	1899	* present_in_ob (type, str, object) searches for any objects with
…		…
1910	* str is the string to match against. Note that we match against	1907	* str is the string to match against. Note that we match against
1911	* the object name, not the archetype name. this is so that the	1908	* the object name, not the archetype name. this is so that the
1912	* spell code can use one object type (force), but change it's name	1909	* spell code can use one object type (force), but change it's name
1913	* to be unique.	1910	* to be unique.
1914	*/	1911	*/
1915
1916	object *	1912	object *
1917	present_in_ob_by_name (int type, const char *str, const object *op)	1913	present_in_ob_by_name (int type, const char *str, const object *op)
1918	{	1914	{
1919	object *
1920	tmp;
1921
1922	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1915	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923	{
1924	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1916	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1925	return tmp;	1917	return tmp;
1926	}	1918
1927	return NULL;	1919	return 0;
1928	}	1920	}
1929		1921
1930	/*	1922	/*
1931	* present_arch_in_ob(archetype, object) searches for any objects with	1923	* present_arch_in_ob(archetype, object) searches for any objects with
1932	* a matching archetype in the inventory of the given object.	1924	* a matching archetype in the inventory of the given object.
1933	* The first matching object is returned, or NULL if none.	1925	* The first matching object is returned, or NULL if none.
1934	*/	1926	*/
1935
1936	object *	1927	object *
1937	present_arch_in_ob (const archetype *at, const object *op)	1928	present_arch_in_ob (const archetype *at, const object *op)
1938	{	1929	{
1939	object *
1940	tmp;
1941
1942	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1943	if (tmp->arch == at)	1931	if (tmp->arch == at)
1944	return tmp;	1932	return tmp;
		1933
1945	return NULL;	1934	return NULL;
1946	}	1935	}
1947		1936
1948	/*	1937	/*
1949	* activate recursively a flag on an object inventory	1938	* activate recursively a flag on an object inventory
1950	*/	1939	*/
1951	void	1940	void
1952	flag_inv (object *op, int flag)	1941	flag_inv (object *op, int flag)
1953	{	1942	{
1954	object *
1955	tmp;
1956
1957	if (op->inv)	1943	if (op->inv)
1958	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1959	{	1945	{
1960	SET_FLAG (tmp, flag);	1946	SET_FLAG (tmp, flag);
1961	flag_inv (tmp, flag);	1947	flag_inv (tmp, flag);
1962	}	1948	}
1963	} /*	1949	}
		1950
		1951	/*
1964	* desactivate recursively a flag on an object inventory	1952	* deactivate recursively a flag on an object inventory
1965	*/	1953	*/
1966	void	1954	void
1967	unflag_inv (object *op, int flag)	1955	unflag_inv (object *op, int flag)
1968	{	1956	{
1969	object *
1970	tmp;
1971
1972	if (op->inv)	1957	if (op->inv)
1973	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1974	{	1959	{
1975	CLEAR_FLAG (tmp, flag);	1960	CLEAR_FLAG (tmp, flag);
1976	unflag_inv (tmp, flag);	1961	unflag_inv (tmp, flag);
1977	}	1962	}
1978	}	1963	}
…		…
1981	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1966	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1982	* all it's inventory (recursively).	1967	* all it's inventory (recursively).
1983	* If checksums are used, a player will get set_cheat called for	1968	* If checksums are used, a player will get set_cheat called for
1984	* him/her-self and all object carried by a call to this function.	1969	* him/her-self and all object carried by a call to this function.
1985	*/	1970	*/
1986
1987	void	1971	void
1988	set_cheat (object *op)	1972	set_cheat (object *op)
1989	{	1973	{
1990	SET_FLAG (op, FLAG_WAS_WIZ);	1974	SET_FLAG (op, FLAG_WAS_WIZ);
1991	flag_inv (op, FLAG_WAS_WIZ);	1975	flag_inv (op, FLAG_WAS_WIZ);
…		…
2010	* because arch_blocked (now ob_blocked) needs to know the movement type	1994	* because arch_blocked (now ob_blocked) needs to know the movement type
2011	* to know if the space in question will block the object. We can't use	1995	* to know if the space in question will block the object. We can't use
2012	* the archetype because that isn't correct if the monster has been	1996	* the archetype because that isn't correct if the monster has been
2013	* customized, changed states, etc.	1997	* customized, changed states, etc.
2014	*/	1998	*/
2015
2016	int	1999	int
2017	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2000	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2018	{	2001	{
2019	int
2020	i,
2021	index = 0, flag;	2002	int index = 0, flag;
2022	static int
2023	altern[SIZEOFFREE];	2003	int altern[SIZEOFFREE];
2024		2004
2025	for (i = start; i < stop; i++)	2005	for (int i = start; i < stop; i++)
2026	{	2006	{
2027	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2007	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2028	if (!flag)	2008	if (!flag)
2029	altern[index++] = i;	2009	altern [index++] = i;
2030		2010
2031	/* Basically, if we find a wall on a space, we cut down the search size.	2011	/* Basically, if we find a wall on a space, we cut down the search size.
2032	* In this way, we won't return spaces that are on another side of a wall.	2012	* In this way, we won't return spaces that are on another side of a wall.
2033	* This mostly work, but it cuts down the search size in all directions -	2013	* This mostly work, but it cuts down the search size in all directions -
2034	* if the space being examined only has a wall to the north and empty	2014	* if the space being examined only has a wall to the north and empty
…		…
2050	* find_first_free_spot(archetype, maptile, x, y) works like	2030	* find_first_free_spot(archetype, maptile, x, y) works like
2051	* find_free_spot(), but it will search max number of squares.	2031	* find_free_spot(), but it will search max number of squares.
2052	* But it will return the first available spot, not a random choice.	2032	* But it will return the first available spot, not a random choice.
2053	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2033	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2054	*/	2034	*/
2055
2056	int	2035	int
2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2036	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2058	{	2037	{
2059	int
2060	i;
2061
2062	for (i = 0; i < SIZEOFFREE; i++)	2038	for (int i = 0; i < SIZEOFFREE; i++)
2063	{
2064	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2039	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2065	return i;	2040	return i;
2066	}	2041
2067	return -1;	2042	return -1;
2068	}	2043	}
2069		2044
2070	/*	2045	/*
2071	* The function permute(arr, begin, end) randomly reorders the array	2046	* The function permute(arr, begin, end) randomly reorders the array
2072	* arr[begin..end-1].	2047	* arr[begin..end-1].
		2048	* now uses a fisher-yates shuffle, old permute was broken
2073	*/	2049	*/
2074	static void	2050	static void
2075	permute (int *arr, int begin, int end)	2051	permute (int *arr, int begin, int end)
2076	{	2052	{
2077	int	2053	arr += begin;
2078	i,
2079	j,
2080	tmp,
2081	len;
2082
2083	len = end - begin;	2054	end -= begin;
2084	for (i = begin; i < end; i++)
2085	{
2086	j = begin + RANDOM () % len;
2087		2055
2088	tmp = arr[i];	2056	while (--end)
2089	arr[i] = arr[j];	2057	swap (arr [end], arr [RANDOM () % (end + 1)]);
2090	arr[j] = tmp;
2091	}
2092	}	2058	}
2093		2059
2094	/* new function to make monster searching more efficient, and effective!	2060	/* new function to make monster searching more efficient, and effective!
2095	* This basically returns a randomized array (in the passed pointer) of	2061	* This basically returns a randomized array (in the passed pointer) of
2096	* the spaces to find monsters. In this way, it won't always look for	2062	* the spaces to find monsters. In this way, it won't always look for
…		…
2099	* the 3x3 area will be searched, just not in a predictable order.	2065	* the 3x3 area will be searched, just not in a predictable order.
2100	*/	2066	*/
2101	void	2067	void
2102	get_search_arr (int *search_arr)	2068	get_search_arr (int *search_arr)
2103	{	2069	{
2104	int	2070	int i;
2105	i;
2106		2071
2107	for (i = 0; i < SIZEOFFREE; i++)	2072	for (i = 0; i < SIZEOFFREE; i++)
2108	{
2109	search_arr[i] = i;	2073	search_arr[i] = i;
2110	}
2111		2074
2112	permute (search_arr, 1, SIZEOFFREE1 + 1);	2075	permute (search_arr, 1, SIZEOFFREE1 + 1);
2113	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2076	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2114	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2077	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2115	}	2078	}
…		…
2124	* Perhaps incorrectly, but I'm making the assumption that exclude	2087	* Perhaps incorrectly, but I'm making the assumption that exclude
2125	* is actually want is going to try and move there. We need this info	2088	* is actually want is going to try and move there. We need this info
2126	* because we have to know what movement the thing looking to move	2089	* because we have to know what movement the thing looking to move
2127	* there is capable of.	2090	* there is capable of.
2128	*/	2091	*/
2129
2130	int	2092	int
2131	find_dir (maptile *m, int x, int y, object *exclude)	2093	find_dir (maptile *m, int x, int y, object *exclude)
2132	{	2094	{
2133	int
2134	i,
2135	max = SIZEOFFREE, mflags;	2095	int i, max = SIZEOFFREE, mflags;
2136		2096
2137	sint16 nx, ny;	2097	sint16 nx, ny;
2138	object *	2098	object *tmp;
2139	tmp;
2140	maptile *	2099	maptile *mp;
2141	mp;
2142		2100
2143	MoveType blocked, move_type;	2101	MoveType blocked, move_type;
2144		2102
2145	if (exclude && exclude->head)	2103	if (exclude && exclude->head)
2146	{	2104	{
…		…
2163		2121
2164	if (mflags & P_OUT_OF_MAP)	2122	if (mflags & P_OUT_OF_MAP)
2165	max = maxfree[i];	2123	max = maxfree[i];
2166	else	2124	else
2167	{	2125	{
2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2126	mapspace &ms = mp->at (nx, ny);
		2127
		2128	blocked = ms.move_block;
2169		2129
2170	if ((move_type & blocked) == move_type)	2130	if ((move_type & blocked) == move_type)
2171	max = maxfree[i];	2131	max = maxfree[i];
2172	else if (mflags & P_IS_ALIVE)	2132	else if (mflags & P_IS_ALIVE)
2173	{	2133	{
2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2134	for (tmp = ms.bot; tmp; tmp = tmp->above)
2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2135	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2136	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2176	break;	2137	break;
2177		2138
2178	if (tmp)	2139	if (tmp)
2179	return freedir[i];	2140	return freedir[i];
2180	}	2141	}
…		…
2186		2147
2187	/*	2148	/*
2188	* distance(object 1, object 2) will return the square of the	2149	* distance(object 1, object 2) will return the square of the
2189	* distance between the two given objects.	2150	* distance between the two given objects.
2190	*/	2151	*/
2191
2192	int	2152	int
2193	distance (const object *ob1, const object *ob2)	2153	distance (const object *ob1, const object *ob2)
2194	{	2154	{
2195	int i;
2196
2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2155	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2198	return i;
2199	}	2156	}
2200		2157
2201	/*	2158	/*
2202	* find_dir_2(delta-x,delta-y) will return a direction in which	2159	* find_dir_2(delta-x,delta-y) will return a direction in which
2203	* an object which has subtracted the x and y coordinates of another	2160	* an object which has subtracted the x and y coordinates of another
2204	* object, needs to travel toward it.	2161	* object, needs to travel toward it.
2205	*/	2162	*/
2206
2207	int	2163	int
2208	find_dir_2 (int x, int y)	2164	find_dir_2 (int x, int y)
2209	{	2165	{
2210	int q;	2166	int q;
2211		2167
…		…
2250	int	2206	int
2251	absdir (int d)	2207	absdir (int d)
2252	{	2208	{
2253	while (d < 1)	2209	while (d < 1)
2254	d += 8;	2210	d += 8;
		2211
2255	while (d > 8)	2212	while (d > 8)
2256	d -= 8;	2213	d -= 8;
		2214
2257	return d;	2215	return d;
2258	}	2216	}
2259		2217
2260	/*	2218	/*
2261	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2263	*/	2221	*/
2264		2222
2265	int	2223	int
2266	dirdiff (int dir1, int dir2)	2224	dirdiff (int dir1, int dir2)
2267	{	2225	{
2268	int	2226	int d;
2269	d;
2270		2227
2271	d = abs (dir1 - dir2);	2228	d = abs (dir1 - dir2);
2272	if (d > 4)	2229	if (d > 4)
2273	d = 8 - d;	2230	d = 8 - d;
		2231
2274	return d;	2232	return d;
2275	}	2233	}
2276		2234
2277	/* peterm:	2235	/* peterm:
2278	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2236	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2281	* This basically means that if direction is 15, then it could either go	2239	* This basically means that if direction is 15, then it could either go
2282	* direction 4, 14, or 16 to get back to where we are.	2240	* direction 4, 14, or 16 to get back to where we are.
2283	* Moved from spell_util.c to object.c with the other related direction	2241	* Moved from spell_util.c to object.c with the other related direction
2284	* functions.	2242	* functions.
2285	*/	2243	*/
2286
2287	int
2288	reduction_dir[SIZEOFFREE][3] = {	2244	int reduction_dir[SIZEOFFREE][3] = {
2289	{0, 0, 0}, /* 0 */	2245	{0, 0, 0}, /* 0 */
2290	{0, 0, 0}, /* 1 */	2246	{0, 0, 0}, /* 1 */
2291	{0, 0, 0}, /* 2 */	2247	{0, 0, 0}, /* 2 */
2292	{0, 0, 0}, /* 3 */	2248	{0, 0, 0}, /* 3 */
2293	{0, 0, 0}, /* 4 */	2249	{0, 0, 0}, /* 4 */
…		…
2443	/* Basically, we save the content of the string to a temp file, then call */	2399	/* Basically, we save the content of the string to a temp file, then call */
2444	/* load_object on it. I admit it is a highly inefficient way to make things, */	2400	/* load_object on it. I admit it is a highly inefficient way to make things, */
2445	/* but it was simple to make and allows reusing the load_object function. */	2401	/* but it was simple to make and allows reusing the load_object function. */
2446	/* Remember not to use load_object_str in a time-critical situation. */	2402	/* Remember not to use load_object_str in a time-critical situation. */
2447	/* Also remember that multiparts objects are not supported for now. */	2403	/* Also remember that multiparts objects are not supported for now. */
2448
2449	object *	2404	object *
2450	load_object_str (const char *obstr)	2405	load_object_str (const char *obstr)
2451	{	2406	{
2452	object *op;	2407	object *op;
2453	char filename[MAX_BUF];	2408	char filename[MAX_BUF];
…		…
2483	* returns NULL if no match.	2438	* returns NULL if no match.
2484	*/	2439	*/
2485	object *	2440	object *
2486	find_obj_by_type_subtype (const object *who, int type, int subtype)	2441	find_obj_by_type_subtype (const object *who, int type, int subtype)
2487	{	2442	{
2488	object *tmp;
2489
2490	for (tmp = who->inv; tmp; tmp = tmp->below)	2443	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2491	if (tmp->type == type && tmp->subtype == subtype)	2444	if (tmp->type == type && tmp->subtype == subtype)
2492	return tmp;	2445	return tmp;
2493		2446
2494	return NULL;	2447	return 0;
2495	}	2448	}
2496		2449
2497	/* If ob has a field named key, return the link from the list,	2450	/* If ob has a field named key, return the link from the list,
2498	* otherwise return NULL.	2451	* otherwise return NULL.
2499	*	2452	*
…		…
2501	* do the desired thing.	2454	* do the desired thing.
2502	*/	2455	*/
2503	key_value *	2456	key_value *
2504	get_ob_key_link (const object *ob, const char *key)	2457	get_ob_key_link (const object *ob, const char *key)
2505	{	2458	{
2506	key_value *link;
2507
2508	for (link = ob->key_values; link != NULL; link = link->next)	2459	for (key_value *link = ob->key_values; link; link = link->next)
2509	if (link->key == key)	2460	if (link->key == key)
2510	return link;	2461	return link;
2511		2462
2512	return NULL;	2463	return 0;
2513	}	2464	}
2514		2465
2515	/*	2466	/*
2516	* Returns the value of op has an extra_field for key, or NULL.	2467	* Returns the value of op has an extra_field for key, or NULL.
2517	*	2468	*
…		…
2557	* Returns TRUE on success.	2508	* Returns TRUE on success.
2558	*/	2509	*/
2559	int	2510	int
2560	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2511	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2561	{	2512	{
2562	key_value *
2563	field = NULL, *last = NULL;	2513	key_value *field = NULL, *last = NULL;
2564		2514
2565	for (field = op->key_values; field != NULL; field = field->next)	2515	for (field = op->key_values; field != NULL; field = field->next)
2566	{	2516	{
2567	if (field->key != canonical_key)	2517	if (field->key != canonical_key)
2568	{	2518	{
…		…
2596	/* IF we get here, key doesn't exist */	2546	/* IF we get here, key doesn't exist */
2597		2547
2598	/* No field, we'll have to add it. */	2548	/* No field, we'll have to add it. */
2599		2549
2600	if (!add_key)	2550	if (!add_key)
2601	{
2602	return FALSE;	2551	return FALSE;
2603	}	2552
2604	/* There isn't any good reason to store a null	2553	/* There isn't any good reason to store a null
2605	* value in the key/value list. If the archetype has	2554	* value in the key/value list. If the archetype has
2606	* this key, then we should also have it, so shouldn't	2555	* this key, then we should also have it, so shouldn't
2607	* be here. If user wants to store empty strings,	2556	* be here. If user wants to store empty strings,
2608	* should pass in ""	2557	* should pass in ""
…		…
2657	}	2606	}
2658	else	2607	else
2659	item = item->env;	2608	item = item->env;
2660	}	2609	}
2661		2610
		2611
		2612	const char *
		2613	object::flag_desc (char *desc, int len) const
		2614	{
		2615	char *p = desc;
		2616	bool first = true;
		2617
		2618	*p = 0;
		2619
		2620	for (int i = 0; i < NUM_FLAGS; i++)
		2621	{
		2622	if (len <= 10) // magic constant!
		2623	{
		2624	snprintf (p, len, ",...");
		2625	break;
		2626	}
		2627
		2628	if (flag [i])
		2629	{
		2630	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2631	len -= cnt;
		2632	p += cnt;
		2633	first = false;
		2634	}
		2635	}
		2636
		2637	return desc;
		2638	}
		2639
2662	// return a suitable string describing an objetc in enough detail to find it	2640	// return a suitable string describing an object in enough detail to find it
2663	const char *	2641	const char *
2664	object::debug_desc (char *info) const	2642	object::debug_desc (char *info) const
2665	{	2643	{
		2644	char flagdesc[512];
2666	char info2[256 * 3];	2645	char info2[256 * 4];
2667	char *p = info;	2646	char *p = info;
2668		2647
2669	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2648	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2670	count,	2649	count, uuid.seq,
2671	&name,	2650	&name,
2672	title ? " " : "",	2651	title ? "\",title:" : "",
2673	title ? (const char *)title : "");	2652	title ? (const char *)title : "",
		2653	flag_desc (flagdesc, 512), type);
2674		2654
2675	if (env)	2655	if (env)
2676	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2656	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2677		2657
2678	if (map)	2658	if (map)
2679	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2659	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2680		2660
2681	return info;	2661	return info;
2682	}	2662	}
2683		2663
2684	const char *	2664	const char *
2685	object::debug_desc () const	2665	object::debug_desc () const
2686	{	2666	{
2687	static char info[256 * 3];	2667	static char info[256 * 4];
2688	return debug_desc (info);	2668	return debug_desc (info);
2689	}	2669	}
2690		2670

Diff Legend

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