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.70 by root, Tue Dec 19 05:12:52 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:
…		…
352	op = op->env;	351	op = op->env;
353	return op;	352	return op;
354	}	353	}
355		354
356	/*	355	/*
357	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
358	* a better check. We basically keeping traversing up until we can't
359	* or find a player.
360	*/
361
362	object *
363	is_player_inv (object *op)
364	{
365	for (; op != NULL && op->type != PLAYER; op = op->env)
366	if (op->env == op)
367	op->env = NULL;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.	357	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.	358	* The result of the dump is stored in the static global errmsg array.
375	*/	359	*/
376		360
…		…
379	{	363	{
380	if (!op)	364	if (!op)
381	return strdup ("[NULLOBJ]");	365	return strdup ("[NULLOBJ]");
382		366
383	object_freezer freezer;	367	object_freezer freezer;
384	save_object (freezer, op, 3);	368	save_object (freezer, op, 1);
385	return freezer.as_string ();	369	return freezer.as_string ();
386	}	370	}
387		371
388	/*	372	/*
389	* 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	}	466	}
483		467
484	op->key_values = 0;	468	op->key_values = 0;
485	}	469	}
486		470
487	void object::clear ()
488	{
489	attachable_base::clear ();
490
491	free_key_values (this);
492
493	owner = 0;
494	name = 0;
495	name_pl = 0;
496	title = 0;
497	race = 0;
498	slaying = 0;
499	skill = 0;
500	msg = 0;
501	lore = 0;
502	custom_name = 0;
503	materialname = 0;
504	contr = 0;
505	below = 0;
506	above = 0;
507	inv = 0;
508	container = 0;
509	env = 0;
510	more = 0;
511	head = 0;
512	map = 0;
513	active_next = 0;
514	active_prev = 0;
515
516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
517
518	SET_FLAG (this, FLAG_REMOVED);
519
520	/* What is not cleared is next, prev, and count */
521
522	expmul = 1.0;
523	face = blank_face;
524
525	if (settings.casting_time)
526	casting_time = -1;
527	}
528
529	/*	471	/*
530	* copy_to first frees everything allocated by the dst object,	472	* copy_to first frees everything allocated by the dst object,
531	* and then copies the contents of itself into the second	473	* and then copies the contents of itself into the second
532	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
533	* 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,
…		…
539	{	481	{
540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
542		484
543	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
544	*(object_pod *)dst = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
548		486
549	if (is_freed)	487	if (is_freed)
550	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
551		489
552	if (is_removed)	490	if (is_removed)
…		…
583	tail = new_link;	521	tail = new_link;
584	}	522	}
585	}	523	}
586	}	524	}
587		525
588	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
589	}	527	}
590		528
591	object *	529	object *
592	object::clone ()	530	object::clone ()
593	{	531	{
…		…
599	/*	537	/*
600	* 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
601	* 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
602	* 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.
603	*/	541	*/
604
605	void	542	void
606	update_turn_face (object *op)	543	update_turn_face (object *op)
607	{	544	{
608	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
609	return;	546	return;
		547
610	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
611	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
612	}	550	}
613		551
614	/*	552	/*
615	* 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
616	* 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.
617	* 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.
618	*/	556	*/
619	void	557	void
620	update_ob_speed (object *op)	558	object::set_speed (float speed)
621	{	559	{
622	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
623
624	/* No reason putting the archetypes objects on the speed list,
625	* since they never really need to be updated.
626	*/
627
628	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629	{	561	{
630	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
631	#ifdef MANY_CORES
632	abort ();
633	#else
634	op->speed = 0;	563	speed = 0;
635	#endif
636	}
637
638	if (arch_init)
639	return;
640
641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
642	{	564	}
643	/* If already on active list, don't do anything */
644	if (op->active_next || op->active_prev || op == active_objects)
645	return;
646		565
647	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
648	* of the list. */
649	op->active_next = active_objects;
650		567
651	if (op->active_next != NULL)	568	if (has_active_speed ())
652	op->active_next->active_prev = op;	569	activate ();
653
654	active_objects = op;
655	}
656	else	570	else
657	{	571	deactivate ();
658	/* If not on the active list, nothing needs to be done */
659	if (!op->active_next && !op->active_prev && op != active_objects)
660	return;
661
662	if (op->active_prev == NULL)
663	{
664	active_objects = op->active_next;
665
666	if (op->active_next != NULL)
667	op->active_next->active_prev = NULL;
668	}
669	else
670	{
671	op->active_prev->active_next = op->active_next;
672
673	if (op->active_next)
674	op->active_next->active_prev = op->active_prev;
675	}
676
677	op->active_next = NULL;
678	op->active_prev = NULL;
679	}
680	}	572	}
681		573
682	/* This function removes object 'op' from the list of active
683	* objects.
684	* This should only be used for style maps or other such
685	* reference maps where you don't want an object that isn't
686	* in play chewing up cpu time getting processed.
687	* The reverse of this is to call update_ob_speed, which
688	* will do the right thing based on the speed of the object.
689	*/
690	void
691	remove_from_active_list (object *op)
692	{
693	/* If not on the active list, nothing needs to be done */
694	if (!op->active_next && !op->active_prev && op != active_objects)
695	return;
696
697	if (op->active_prev == NULL)
698	{
699	active_objects = op->active_next;
700	if (op->active_next != NULL)
701	op->active_next->active_prev = NULL;
702	}
703	else
704	{
705	op->active_prev->active_next = op->active_next;
706	if (op->active_next)
707	op->active_next->active_prev = op->active_prev;
708	}
709	op->active_next = NULL;
710	op->active_prev = NULL;
711	}
712
713	/*	574	/*
714	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
716	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
717	* invisible object, etc...)	578	* invisible object, etc...)
718	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
719	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
720	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
721	*	582	*
722	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	584	* current action are:
728	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
730	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
732	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
733	*/	590	*/
734
735	void	591	void
736	update_object (object *op, int action)	592	update_object (object *op, int action)
737	{	593	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
740		595
741	if (op == NULL)	596	if (op == NULL)
742	{	597	{
743	/* this should never happen */	598	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	600	return;
746	}	601	}
747		602
748	if (op->env != NULL)	603	if (op->env)
749	{	604	{
750	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
751	* to do in this case.	606	* to do in this case.
752	*/	607	*/
753	return;	608	return;
…		…
758	*/	613	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	615	return;
761		616
762	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
763	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)
764	{	619	{
765	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	621	#ifdef MANY_CORES
767	abort ();	622	abort ();
768	#endif	623	#endif
769	return;	624	return;
770	}	625	}
771		626
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
779	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
780	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* 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
803	* to have move_allow right now.	644	* to have move_allow right now.
804	*/	645	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		648	m.flags_ = 0;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	649	}
811
812	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
813	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
814	* that is being removed.	652	* that is being removed.
815	*/	653	*/
816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
817	update_now = 1;	655	m.flags_ = 0;
818	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
819	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
820	else	658	else
821	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
822		660
823	if (update_now)
824	{
825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
826	update_position (op->map, op->x, op->y);
827	}
828
829	if (op->more != NULL)	661	if (op->more)
830	update_object (op->more, action);	662	update_object (op->more, action);
831	}	663	}
832		664
833	object::vector object::mortals;
834	object::vector object::objects; // not yet used
835	object *object::first;	665	object *object::first;
836
837	void object::free_mortals ()
838	{
839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
840	if ((*i)->refcnt)
841	++i; // further delay freeing
842	else
843	{
844	delete *i;
845	mortals.erase (i);
846	}
847	}
848		666
849	object::object ()	667	object::object ()
850	{	668	{
851	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
852		670
…		…
884		702
885	prev = 0;	703	prev = 0;
886	next = 0;	704	next = 0;
887	}	705	}
888		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
889	object *object::create ()	841	object *object::create ()
890	{	842	{
891	object *op = new object;	843	object *op = new object;
892	op->link ();	844	op->link ();
893	return op;	845	return op;
894	}	846	}
895		847
896	/*	848	void
897	* free_object() frees everything allocated by an object, removes	849	object::do_destroy ()
898	* it from the list of used objects, and puts it on the list of
899	* free objects. The IS_FREED() flag is set in the object.
900	* The object must have been removed by remove_ob() first for
901	* this function to succeed.
902	*
903	* If destroy_inventory is set, free inventory as well. Else drop items in
904	* inventory to the ground.
905	*/
906	void object::destroy (bool destroy_inventory)
907	{	850	{
908	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])
909	return;	861	return;
910		862
911	if (QUERY_FLAG (this, FLAG_FRIENDLY))	863	set_speed (0);
912	remove_friendly_object (this);
913		864
914	if (!QUERY_FLAG (this, FLAG_REMOVED))	865	flag [FLAG_FREED] = 1;
915	remove ();
916		866
917	SET_FLAG (this, FLAG_FREED);	867	attachable::do_destroy ();
918		868
919	if (more)	869	destroy_inv (true);
920	{	870	unlink ();
921	more->destroy (destroy_inventory);
922	more = 0;
923	}
924
925	if (inv)
926	{
927	/* Only if the space blocks everything do we not process -
928	* if some form of movement is allowed, let objects
929	* drop on that space.
930	*/
931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
932	{
933	object *op = inv;
934
935	while (op)
936	{
937	object *tmp = op->below;
938	op->destroy (destroy_inventory);
939	op = tmp;
940	}
941	}
942	else
943	{ /* Put objects in inventory onto this space */
944	object *op = inv;
945
946	while (op)
947	{
948	object *tmp = op->below;
949
950	op->remove ();
951
952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
954	op->destroy ();
955	else
956	{
957	op->x = x;
958	op->y = y;
959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
960	}
961
962	op = tmp;
963	}
964	}
965	}
966		871
967	// hack to ensure that freed objects still have a valid map	872	// hack to ensure that freed objects still have a valid map
968	{	873	{
969	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
970		875
…		…
974		879
975	freed_map->name = "/internal/freed_objects_map";	880	freed_map->name = "/internal/freed_objects_map";
976	freed_map->width = 3;	881	freed_map->width = 3;
977	freed_map->height = 3;	882	freed_map->height = 3;
978		883
979	freed_map->allocate ();	884	freed_map->alloc ();
		885	freed_map->in_memory = MAP_IN_MEMORY;
980	}	886	}
981		887
982	map = freed_map;	888	map = freed_map;
983	x = 1;	889	x = 1;
984	y = 1;	890	y = 1;
985	}	891	}
986		892
		893	head = 0;
		894
		895	if (more)
		896	{
		897	more->destroy ();
		898	more = 0;
		899	}
		900
987	// clear those pointers that likely might have circular references to us	901	// clear those pointers that likely might have circular references to us
988	owner = 0;	902	owner = 0;
989	enemy = 0;	903	enemy = 0;
990	attacked_by = 0;	904	attacked_by = 0;
991		905
992	// only relevant for players(?), but make sure of it anyways	906	// only relevant for players(?), but make sure of it anyways
993	contr = 0;	907	contr = 0;
		908	}
994		909
995	/* Remove object from the active list */	910	void
996	speed = 0;	911	object::destroy (bool destroy_inventory)
997	update_ob_speed (this);	912	{
		913	if (destroyed ())
		914	return;
998		915
999	unlink ();	916	if (destroy_inventory)
		917	destroy_inv (false);
1000		918
1001	mortals.push_back (this);	919	attachable::destroy ();
1002	}	920	}
1003		921
1004	/*	922	/*
1005	* sub_weight() recursively (outwards) subtracts a number from the	923	* sub_weight() recursively (outwards) subtracts a number from the
1006	* 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)).
…		…
1030	object::remove ()	948	object::remove ()
1031	{	949	{
1032	object *tmp, *last = 0;	950	object *tmp, *last = 0;
1033	object *otmp;	951	object *otmp;
1034		952
1035	int check_walk_off;
1036
1037	if (QUERY_FLAG (this, FLAG_REMOVED))	953	if (QUERY_FLAG (this, FLAG_REMOVED))
1038	return;	954	return;
1039		955
1040	SET_FLAG (this, FLAG_REMOVED);	956	SET_FLAG (this, FLAG_REMOVED);
		957	INVOKE_OBJECT (REMOVE, this);
1041		958
1042	if (more)	959	if (more)
1043	more->remove ();	960	more->remove ();
1044		961
1045	/*	962	/*
…		…
1055		972
1056	/* 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
1057	* made to players inventory. If set, avoiding the call	974	* made to players inventory. If set, avoiding the call
1058	* to save cpu time.	975	* to save cpu time.
1059	*/	976	*/
1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	977	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1061	fix_player (otmp);	978	otmp->update_stats ();
1062		979
1063	if (above != NULL)	980	if (above)
1064	above->below = below;	981	above->below = below;
1065	else	982	else
1066	env->inv = below;	983	env->inv = below;
1067		984
1068	if (below != NULL)	985	if (below)
1069	below->above = above;	986	below->above = above;
1070		987
1071	/* we set up values so that it could be inserted into	988	/* we set up values so that it could be inserted into
1072	* 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
1073	* to the caller to decide what we want to do.	990	* to the caller to decide what we want to do.
…		…
1077	above = 0, below = 0;	994	above = 0, below = 0;
1078	env = 0;	995	env = 0;
1079	}	996	}
1080	else if (map)	997	else if (map)
1081	{	998	{
1082	/* Re did the following section of code - it looks like it had	999	if (type == PLAYER)
1083	* lots of logic for things we no longer care about
1084	*/	1000	{
		1001	--map->players;
		1002	map->touch ();
		1003	}
		1004
		1005	map->dirty = true;
1085		1006
1086	/* link the object above us */	1007	/* link the object above us */
1087	if (above)	1008	if (above)
1088	above->below = below;	1009	above->below = below;
1089	else	1010	else
1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1011	map->at (x, y).top = below; /* we were top, set new top */
1091		1012
1092	/* Relink the object below us, if there is one */	1013	/* Relink the object below us, if there is one */
1093	if (below)	1014	if (below)
1094	below->above = above;	1015	below->above = above;
1095	else	1016	else
…		…
1107	dump = dump_object (GET_MAP_OB (map, x, y));	1028	dump = dump_object (GET_MAP_OB (map, x, y));
1108	LOG (llevError, "%s\n", dump);	1029	LOG (llevError, "%s\n", dump);
1109	free (dump);	1030	free (dump);
1110	}	1031	}
1111		1032
1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1033	map->at (x, y).bot = above; /* goes on above it. */
1113	}	1034	}
1114		1035
1115	above = 0;	1036	above = 0;
1116	below = 0;	1037	below = 0;
1117		1038
1118	if (map->in_memory == MAP_SAVING)	1039	if (map->in_memory == MAP_SAVING)
1119	return;	1040	return;
1120		1041
1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1042	int check_walk_off = !flag [FLAG_NO_APPLY];
1122		1043
1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1044	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1124	{	1045	{
1125	/* 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
1126	* being removed.	1047	* being removed.
1127	*/	1048	*/
1128		1049
…		…
1132	* removed (most likely destroyed), update the player view	1053	* removed (most likely destroyed), update the player view
1133	* appropriately.	1054	* appropriately.
1134	*/	1055	*/
1135	if (tmp->container == this)	1056	if (tmp->container == this)
1136	{	1057	{
1137	CLEAR_FLAG (this, FLAG_APPLIED);	1058	flag [FLAG_APPLIED] = 0;
1138	tmp->container = 0;	1059	tmp->container = 0;
1139	}	1060	}
1140		1061
		1062	if (tmp->contr->ns)
1141	tmp->contr->socket->floorbox_update ();	1063	tmp->contr->ns->floorbox_update ();
1142	}	1064	}
1143		1065
1144	/* See if player moving off should effect something */	1066	/* See if object moving off should effect something */
1145	if (check_walk_off	1067	if (check_walk_off
1146	&& ((move_type & tmp->move_off)	1068	&& ((move_type & tmp->move_off)
1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1069	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1148	{	1070	{
1149	move_apply (tmp, this, 0);	1071	move_apply (tmp, this, 0);
…		…
1151	if (destroyed ())	1073	if (destroyed ())
1152	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 ());
1153	}	1075	}
1154		1076
1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1077	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1156		1078	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1157	if (tmp->above == tmp)	1079	if (tmp->above == tmp)
1158	tmp->above = 0;	1080	tmp->above = 0;
1159		1081
1160	last = tmp;	1082	last = tmp;
1161	}	1083	}
1162		1084
1163	/* 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?
1164	if (!last)	1087	if (!last)
1165	{	1088	map->at (x, y).flags_ = 0;
1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1168	* those out anyways, and if there are any flags set right now, they won't
1169	* be correct anyways.
1170	*/
1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1172	update_position (map, x, y);
1173	}
1174	else	1089	else
1175	update_object (last, UP_OBJ_REMOVE);	1090	update_object (last, UP_OBJ_REMOVE);
1176		1091
1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1092	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1178	update_all_los (map, x, y);	1093	update_all_los (map, x, y);
1179	}	1094	}
1180	}	1095	}
1181		1096
1182	/*	1097	/*
…		…
1191	merge_ob (object *op, object *top)	1106	merge_ob (object *op, object *top)
1192	{	1107	{
1193	if (!op->nrof)	1108	if (!op->nrof)
1194	return 0;	1109	return 0;
1195		1110
1196	if (top == NULL)	1111	if (top)
1197	for (top = op; top != NULL && top->above != NULL; top = top->above);	1112	for (top = op; top && top->above; top = top->above)
		1113	;
1198		1114
1199	for (; top != NULL; top = top->below)	1115	for (; top; top = top->below)
1200	{	1116	{
1201	if (top == op)	1117	if (top == op)
1202	continue;	1118	continue;
1203		1119
1204	if (object::can_merge (op, top))	1120	if (object::can_merge (op, top))
…		…
1220	* job preparing multi-part monsters	1136	* job preparing multi-part monsters
1221	*/	1137	*/
1222	object *	1138	object *
1223	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)
1224	{	1140	{
1225	object *tmp;
1226
1227	if (op->head)
1228	op = op->head;
1229
1230	for (tmp = op; tmp; tmp = tmp->more)	1141	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1231	{	1142	{
1232	tmp->x = x + tmp->arch->clone.x;	1143	tmp->x = x + tmp->arch->clone.x;
1233	tmp->y = y + tmp->arch->clone.y;	1144	tmp->y = y + tmp->arch->clone.y;
1234	}	1145	}
1235		1146
…		…
1254	* Return value:	1165	* Return value:
1255	* new object if 'op' was merged with other object	1166	* new object if 'op' was merged with other object
1256	* NULL if 'op' was destroyed	1167	* NULL if 'op' was destroyed
1257	* just 'op' otherwise	1168	* just 'op' otherwise
1258	*/	1169	*/
1259
1260	object *	1170	object *
1261	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)
1262	{	1172	{
1263	object *tmp, *top, *floor = NULL;	1173	object *tmp, *top, *floor = NULL;
1264	sint16 x, y;	1174	sint16 x, y;
…		…
1267	{	1177	{
1268	LOG (llevError, "Trying to insert freed object!\n");	1178	LOG (llevError, "Trying to insert freed object!\n");
1269	return NULL;	1179	return NULL;
1270	}	1180	}
1271		1181
1272	if (m == NULL)	1182	if (!m)
1273	{	1183	{
1274	char *dump = dump_object (op);	1184	char *dump = dump_object (op);
1275	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);
1276	free (dump);	1186	free (dump);
1277	return op;	1187	return op;
…		…
1298	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);
1299	free (dump);	1209	free (dump);
1300	return op;	1210	return op;
1301	}	1211	}
1302		1212
1303	if (op->more != NULL)	1213	if (op->more)
1304	{	1214	{
1305	/* The part may be on a different map. */	1215	/* The part may be on a different map. */
1306		1216
1307	object *more = op->more;	1217	object *more = op->more;
1308		1218
1309	/* We really need the caller to normalize coordinates - if	1219	/* We really need the caller to normalise coordinates - if
1310	* 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
1311	* 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
1312	* is clear wrong do we normalize it.	1222	* is clear wrong do we normalise it.
1313	*/	1223	*/
1314	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1224	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1315	more->map = get_map_from_coord (m, &more->x, &more->y);	1225	more->map = get_map_from_coord (m, &more->x, &more->y);
1316	else if (!more->map)	1226	else if (!more->map)
1317	{	1227	{
…		…
1324	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1234	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1325	{	1235	{
1326	if (!op->head)	1236	if (!op->head)
1327	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");
1328		1238
1329	return NULL;	1239	return 0;
1330	}	1240	}
1331	}	1241	}
1332		1242
1333	CLEAR_FLAG (op, FLAG_REMOVED);	1243	CLEAR_FLAG (op, FLAG_REMOVED);
1334		1244
…		…
1341	y = op->y;	1251	y = op->y;
1342		1252
1343	/* this has to be done after we translate the coordinates.	1253	/* this has to be done after we translate the coordinates.
1344	*/	1254	*/
1345	if (op->nrof && !(flag & INS_NO_MERGE))	1255	if (op->nrof && !(flag & INS_NO_MERGE))
1346	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)
1347	if (object::can_merge (op, tmp))	1257	if (object::can_merge (op, tmp))
1348	{	1258	{
1349	op->nrof += tmp->nrof;	1259	op->nrof += tmp->nrof;
1350	tmp->destroy ();	1260	tmp->destroy ();
1351	}	1261	}
…		…
1368	op->below = originator->below;	1278	op->below = originator->below;
1369		1279
1370	if (op->below)	1280	if (op->below)
1371	op->below->above = op;	1281	op->below->above = op;
1372	else	1282	else
1373	SET_MAP_OB (op->map, op->x, op->y, op);	1283	op->ms ().bot = op;
1374		1284
1375	/* since *below* originator, no need to update top */	1285	/* since *below* originator, no need to update top */
1376	originator->below = op;	1286	originator->below = op;
1377	}	1287	}
1378	else	1288	else
1379	{	1289	{
1380	/* If there are other objects, then */	1290	/* If there are other objects, then */
1381	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))
1382	{	1292	{
1383	object *last = NULL;	1293	object *last = 0;
1384		1294
1385	/*	1295	/*
1386	* 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.
1387	* We've already dealt with merging if appropriate.	1297	* We've already dealt with merging if appropriate.
1388	* 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
…		…
1392	* 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
1393	* 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
1394	* 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
1395	* that flying non pickable objects are spell objects.	1305	* that flying non pickable objects are spell objects.
1396	*/	1306	*/
1397
1398	while (top != NULL)	1307	while (top)
1399	{	1308	{
1400	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))
1401	floor = top;	1310	floor = top;
1402		1311
1403	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))
…		…
1424	* If INS_ON_TOP is used, don't do this processing	1333	* If INS_ON_TOP is used, don't do this processing
1425	* Need to find the object that in fact blocks view, otherwise	1334	* Need to find the object that in fact blocks view, otherwise
1426	* stacking is a bit odd.	1335	* stacking is a bit odd.
1427	*/	1336	*/
1428	if (!(flag & INS_ON_TOP) &&	1337	if (!(flag & INS_ON_TOP) &&
1429	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1338	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1430	{	1339	{
1431	for (last = top; last != floor; last = last->below)	1340	for (last = top; last != floor; last = last->below)
1432	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1341	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433	break;	1342	break;
1434	/* Check to see if we found the object that blocks view,	1343	/* Check to see if we found the object that blocks view,
…		…
1456	op->above = GET_MAP_OB (op->map, op->x, op->y);	1365	op->above = GET_MAP_OB (op->map, op->x, op->y);
1457		1366
1458	if (op->above)	1367	if (op->above)
1459	op->above->below = op;	1368	op->above->below = op;
1460		1369
1461	op->below = NULL;	1370	op->below = 0;
1462	SET_MAP_OB (op->map, op->x, op->y, op);	1371	op->ms ().bot = op;
1463	}	1372	}
1464	else	1373	else
1465	{ /* get inserted into the stack above top */	1374	{ /* get inserted into the stack above top */
1466	op->above = top->above;	1375	op->above = top->above;
1467		1376
…		…
1470		1379
1471	op->below = top;	1380	op->below = top;
1472	top->above = op;	1381	top->above = op;
1473	}	1382	}
1474		1383
1475	if (op->above == NULL)	1384	if (!op->above)
1476	SET_MAP_TOP (op->map, op->x, op->y, op);	1385	op->ms ().top = op;
1477	} /* else not INS_BELOW_ORIGINATOR */	1386	} /* else not INS_BELOW_ORIGINATOR */
1478		1387
1479	if (op->type == PLAYER)	1388	if (op->type == PLAYER)
		1389	{
1480	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;
1481		1396
1482	/* 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
1483	* it, so save a few ticks and start from there.	1398	* it, so save a few ticks and start from there.
1484	*/	1399	*/
1485	if (!(flag & INS_MAP_LOAD))	1400	if (!(flag & INS_MAP_LOAD))
1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1401	if (object *pl = op->ms ().player ())
1487	if (tmp->type == PLAYER)	1402	if (pl->contr->ns)
1488	tmp->contr->socket->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1489		1404
1490	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1491	* 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
1492	* 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
1493	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1494	* 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 -
1495	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1496	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1497	* of effect may be sufficient.	1412	* of effect may be sufficient.
1498	*/	1413	*/
1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1500	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1501		1416
1502	/* updates flags (blocked, alive, no magic, etc) for this map space */	1417	/* updates flags (blocked, alive, no magic, etc) for this map space */
1503	update_object (op, UP_OBJ_INSERT);	1418	update_object (op, UP_OBJ_INSERT);
		1419
		1420	INVOKE_OBJECT (INSERT, op);
1504		1421
1505	/* 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,
1506	* we want to have floorbox_update called before calling this.	1423	* we want to have floorbox_update called before calling this.
1507	*	1424	*
1508	* check_move_on() must be after this because code called from	1425	* check_move_on() must be after this because code called from
…		…
1513		1430
1514	/* 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 */
1515	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && !op->head)
1516	{	1433	{
1517	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1518	return NULL;	1435	return 0;
1519		1436
1520	/* 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
1521	* walk on's.	1438	* walk on's.
1522	*/	1439	*/
1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1524	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1525	return NULL;	1442	return 0;
1526	}	1443	}
1527		1444
1528	return op;	1445	return op;
1529	}	1446	}
1530		1447
1531	/* this function inserts an object in the map, but if it	1448	/* this function inserts an object in the map, but if it
1532	* finds an object of its own type, it'll remove that one first.	1449	* finds an object of its own type, it'll remove that one first.
1533	* op is the object to insert it under: supplies x and the map.	1450	* op is the object to insert it under: supplies x and the map.
1534	*/	1451	*/
1535	void	1452	void
1536	replace_insert_ob_in_map (const char *arch_string, object *op)	1453	replace_insert_ob_in_map (const char *arch_string, object *op)
1537	{	1454	{
1538	object *	1455	object *tmp, *tmp1;
1539	tmp;
1540	object *
1541	tmp1;
1542		1456
1543	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1544		1458
1545	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)
1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1547	tmp->destroy ();	1461	tmp->destroy ();
1548		1462
1549	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1550		1464
1551	tmp1->x = op->x;	1465	tmp1->x = op->x;
1552	tmp1->y = op->y;	1466	tmp1->y = op->y;
1553	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);
1554	}	1474	}
1555		1475
1556	/*	1476	/*
1557	* 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
1558	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
1559	* 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).
1560	* On failure, NULL is returned, and the reason put into the	1480	* On failure, NULL is returned, and the reason put into the
1561	* global static errmsg array.	1481	* global static errmsg array.
1562	*/	1482	*/
1563
1564	object *	1483	object *
1565	get_split_ob (object *orig_ob, uint32 nr)	1484	get_split_ob (object *orig_ob, uint32 nr)
1566	{	1485	{
1567	object *newob;	1486	object *newob;
1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1604		1523
1605	object *	1524	object *
1606	decrease_ob_nr (object *op, uint32 i)	1525	decrease_ob_nr (object *op, uint32 i)
1607	{	1526	{
1608	object *tmp;	1527	object *tmp;
1609	player *pl;
1610		1528
1611	if (i == 0) /* objects with op->nrof require this check */	1529	if (i == 0) /* objects with op->nrof require this check */
1612	return op;	1530	return op;
1613		1531
1614	if (i > op->nrof)	1532	if (i > op->nrof)
1615	i = op->nrof;	1533	i = op->nrof;
1616		1534
1617	if (QUERY_FLAG (op, FLAG_REMOVED))	1535	if (QUERY_FLAG (op, FLAG_REMOVED))
1618	op->nrof -= i;	1536	op->nrof -= i;
1619	else if (op->env != NULL)	1537	else if (op->env)
1620	{	1538	{
1621	/* is this object in the players inventory, or sub container	1539	/* is this object in the players inventory, or sub container
1622	* therein?	1540	* therein?
1623	*/	1541	*/
1624	tmp = is_player_inv (op->env);	1542	tmp = op->in_player ();
1625	/* nope. Is this a container the player has opened?	1543	/* nope. Is this a container the player has opened?
1626	* If so, set tmp to that player.	1544	* If so, set tmp to that player.
1627	* IMO, searching through all the players will mostly	1545	* IMO, searching through all the players will mostly
1628	* likely be quicker than following op->env to the map,	1546	* likely be quicker than following op->env to the map,
1629	* and then searching the map for a player.	1547	* and then searching the map for a player.
1630	*/	1548	*/
1631	if (!tmp)	1549	if (!tmp)
1632	{	1550	for_all_players (pl)
1633	for (pl = first_player; pl; pl = pl->next)
1634	if (pl->ob->container == op->env)	1551	if (pl->ob->container == op->env)
		1552	{
		1553	tmp = pl->ob;
1635	break;	1554	break;
1636	if (pl)
1637	tmp = pl->ob;
1638	else
1639	tmp = NULL;
1640	}	1555	}
1641		1556
1642	if (i < op->nrof)	1557	if (i < op->nrof)
1643	{	1558	{
1644	sub_weight (op->env, op->weight * i);	1559	sub_weight (op->env, op->weight * i);
1645	op->nrof -= i;	1560	op->nrof -= i;
1646	if (tmp)	1561	if (tmp)
1647	{
1648	esrv_send_item (tmp, op);	1562	esrv_send_item (tmp, op);
1649	}
1650	}	1563	}
1651	else	1564	else
1652	{	1565	{
1653	op->remove ();	1566	op->remove ();
1654	op->nrof = 0;	1567	op->nrof = 0;
1655	if (tmp)	1568	if (tmp)
1656	{
1657	esrv_del_item (tmp->contr, op->count);	1569	esrv_del_item (tmp->contr, op->count);
1658	}
1659	}	1570	}
1660	}	1571	}
1661	else	1572	else
1662	{	1573	{
1663	object *above = op->above;	1574	object *above = op->above;
…		…
1669	op->remove ();	1580	op->remove ();
1670	op->nrof = 0;	1581	op->nrof = 0;
1671	}	1582	}
1672		1583
1673	/* Since we just removed op, op->above is null */	1584	/* Since we just removed op, op->above is null */
1674	for (tmp = above; tmp != NULL; tmp = tmp->above)	1585	for (tmp = above; tmp; tmp = tmp->above)
1675	if (tmp->type == PLAYER)	1586	if (tmp->type == PLAYER)
1676	{	1587	{
1677	if (op->nrof)	1588	if (op->nrof)
1678	esrv_send_item (tmp, op);	1589	esrv_send_item (tmp, op);
1679	else	1590	else
…		…
1684	if (op->nrof)	1595	if (op->nrof)
1685	return op;	1596	return op;
1686	else	1597	else
1687	{	1598	{
1688	op->destroy ();	1599	op->destroy ();
1689	return NULL;	1600	return 0;
1690	}	1601	}
1691	}	1602	}
1692		1603
1693	/*	1604	/*
1694	* add_weight(object, weight) adds the specified weight to an object,	1605	* add_weight(object, weight) adds the specified weight to an object,
…		…
1782	add_weight (this, op->weight * op->nrof);	1693	add_weight (this, op->weight * op->nrof);
1783	}	1694	}
1784	else	1695	else
1785	add_weight (this, (op->weight + op->carrying));	1696	add_weight (this, (op->weight + op->carrying));
1786		1697
1787	otmp = is_player_inv (this);	1698	otmp = this->in_player ();
1788	if (otmp && otmp->contr)	1699	if (otmp && otmp->contr)
1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1700	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1790	fix_player (otmp);	1701	otmp->update_stats ();
1791		1702
1792	op->map = NULL;	1703	op->map = 0;
1793	op->env = this;	1704	op->env = this;
1794	op->above = NULL;	1705	op->above = 0;
1795	op->below = NULL;	1706	op->below = 0;
1796	op->x = 0, op->y = 0;	1707	op->x = 0, op->y = 0;
1797		1708
1798	/* reset the light list and los of the players on the map */	1709	/* reset the light list and los of the players on the map */
1799	if ((op->glow_radius != 0) && map)	1710	if ((op->glow_radius != 0) && map)
1800	{	1711	{
1801	#ifdef DEBUG_LIGHTS	1712	#ifdef DEBUG_LIGHTS
1802	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);
1803	#endif /* DEBUG_LIGHTS */	1714	#endif /* DEBUG_LIGHTS */
1804	if (MAP_DARKNESS (map))	1715	if (map->darkness)
1805	update_all_los (map, x, y);	1716	update_all_los (map, x, y);
1806	}	1717	}
1807		1718
1808	/* 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.
1809	* It sure simplifies this function...	1720	* It sure simplifies this function...
…		…
1814	{	1725	{
1815	op->below = inv;	1726	op->below = inv;
1816	op->below->above = op;	1727	op->below->above = op;
1817	inv = op;	1728	inv = op;
1818	}	1729	}
		1730
		1731	INVOKE_OBJECT (INSERT, this);
1819		1732
1820	return op;	1733	return op;
1821	}	1734	}
1822		1735
1823	/*	1736	/*
…		…
1838	*	1751	*
1839	* 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
1840	* 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
1841	* on top.	1754	* on top.
1842	*/	1755	*/
1843
1844	int	1756	int
1845	check_move_on (object *op, object *originator)	1757	check_move_on (object *op, object *originator)
1846	{	1758	{
1847	object *tmp;	1759	object *tmp;
1848	maptile *m = op->map;	1760	maptile *m = op->map;
…		…
1875		1787
1876	/* The objects have to be checked from top to bottom.	1788	/* The objects have to be checked from top to bottom.
1877	* Hence, we first go to the top:	1789	* Hence, we first go to the top:
1878	*/	1790	*/
1879		1791
1880	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)
1881	{	1793	{
1882	/* Trim the search when we find the first other spell effect	1794	/* Trim the search when we find the first other spell effect
1883	* 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,
1884	* we don't need to check all of them.	1796	* we don't need to check all of them.
1885	*/	1797	*/
…		…
1940	/*	1852	/*
1941	* present_arch(arch, map, x, y) searches for any objects with	1853	* present_arch(arch, map, x, y) searches for any objects with
1942	* a matching archetype at the given map and coordinates.	1854	* a matching archetype at the given map and coordinates.
1943	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1944	*/	1856	*/
1945
1946	object *	1857	object *
1947	present_arch (const archetype *at, maptile *m, int x, int y)	1858	present_arch (const archetype *at, maptile *m, int x, int y)
1948	{	1859	{
1949	object *
1950	tmp;
1951
1952	if (m == NULL || out_of_map (m, x, y))	1860	if (!m || out_of_map (m, x, y))
1953	{	1861	{
1954	LOG (llevError, "Present_arch called outside map.\n");	1862	LOG (llevError, "Present_arch called outside map.\n");
1955	return NULL;	1863	return NULL;
1956	}	1864	}
1957	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)
1958	if (tmp->arch == at)	1867	if (tmp->arch == at)
1959	return tmp;	1868	return tmp;
		1869
1960	return NULL;	1870	return NULL;
1961	}	1871	}
1962		1872
1963	/*	1873	/*
1964	* present(type, map, x, y) searches for any objects with	1874	* present(type, map, x, y) searches for any objects with
1965	* a matching type variable at the given map and coordinates.	1875	* a matching type variable at the given map and coordinates.
1966	* The first matching object is returned, or NULL if none.	1876	* The first matching object is returned, or NULL if none.
1967	*/	1877	*/
1968
1969	object *	1878	object *
1970	present (unsigned char type, maptile *m, int x, int y)	1879	present (unsigned char type, maptile *m, int x, int y)
1971	{	1880	{
1972	object *
1973	tmp;
1974
1975	if (out_of_map (m, x, y))	1881	if (out_of_map (m, x, y))
1976	{	1882	{
1977	LOG (llevError, "Present called outside map.\n");	1883	LOG (llevError, "Present called outside map.\n");
1978	return NULL;	1884	return NULL;
1979	}	1885	}
1980	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)
1981	if (tmp->type == type)	1888	if (tmp->type == type)
1982	return tmp;	1889	return tmp;
		1890
1983	return NULL;	1891	return NULL;
1984	}	1892	}
1985		1893
1986	/*	1894	/*
1987	* present_in_ob(type, object) searches for any objects with	1895	* present_in_ob(type, object) searches for any objects with
1988	* a matching type variable in the inventory of the given object.	1896	* a matching type variable in the inventory of the given object.
1989	* The first matching object is returned, or NULL if none.	1897	* The first matching object is returned, or NULL if none.
1990	*/	1898	*/
1991
1992	object *	1899	object *
1993	present_in_ob (unsigned char type, const object *op)	1900	present_in_ob (unsigned char type, const object *op)
1994	{	1901	{
1995	object *
1996	tmp;
1997
1998	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1902	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1999	if (tmp->type == type)	1903	if (tmp->type == type)
2000	return tmp;	1904	return tmp;
		1905
2001	return NULL;	1906	return NULL;
2002	}	1907	}
2003		1908
2004	/*	1909	/*
2005	* present_in_ob (type, str, object) searches for any objects with	1910	* present_in_ob (type, str, object) searches for any objects with
…		…
2013	* 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
2014	* 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
2015	* 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
2016	* to be unique.	1921	* to be unique.
2017	*/	1922	*/
2018
2019	object *	1923	object *
2020	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)
2021	{	1925	{
2022	object *
2023	tmp;
2024
2025	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1926	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2026	{
2027	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1927	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2028	return tmp;	1928	return tmp;
2029	}	1929
2030	return NULL;	1930	return 0;
2031	}	1931	}
2032		1932
2033	/*	1933	/*
2034	* present_arch_in_ob(archetype, object) searches for any objects with	1934	* present_arch_in_ob(archetype, object) searches for any objects with
2035	* a matching archetype in the inventory of the given object.	1935	* a matching archetype in the inventory of the given object.
2036	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2037	*/	1937	*/
2038
2039	object *	1938	object *
2040	present_arch_in_ob (const archetype *at, const object *op)	1939	present_arch_in_ob (const archetype *at, const object *op)
2041	{	1940	{
2042	object *
2043	tmp;
2044
2045	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1941	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2046	if (tmp->arch == at)	1942	if (tmp->arch == at)
2047	return tmp;	1943	return tmp;
		1944
2048	return NULL;	1945	return NULL;
2049	}	1946	}
2050		1947
2051	/*	1948	/*
2052	* activate recursively a flag on an object inventory	1949	* activate recursively a flag on an object inventory
2053	*/	1950	*/
2054	void	1951	void
2055	flag_inv (object *op, int flag)	1952	flag_inv (object *op, int flag)
2056	{	1953	{
2057	object *
2058	tmp;
2059
2060	if (op->inv)	1954	if (op->inv)
2061	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1955	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2062	{	1956	{
2063	SET_FLAG (tmp, flag);	1957	SET_FLAG (tmp, flag);
2064	flag_inv (tmp, flag);	1958	flag_inv (tmp, flag);
2065	}	1959	}
2066	} /*	1960	}
		1961
		1962	/*
2067	* desactivate recursively a flag on an object inventory	1963	* deactivate recursively a flag on an object inventory
2068	*/	1964	*/
2069	void	1965	void
2070	unflag_inv (object *op, int flag)	1966	unflag_inv (object *op, int flag)
2071	{	1967	{
2072	object *
2073	tmp;
2074
2075	if (op->inv)	1968	if (op->inv)
2076	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1969	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2077	{	1970	{
2078	CLEAR_FLAG (tmp, flag);	1971	CLEAR_FLAG (tmp, flag);
2079	unflag_inv (tmp, flag);	1972	unflag_inv (tmp, flag);
2080	}	1973	}
2081	}	1974	}
…		…
2084	* 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
2085	* all it's inventory (recursively).	1978	* all it's inventory (recursively).
2086	* 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
2087	* 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.
2088	*/	1981	*/
2089
2090	void	1982	void
2091	set_cheat (object *op)	1983	set_cheat (object *op)
2092	{	1984	{
2093	SET_FLAG (op, FLAG_WAS_WIZ);	1985	SET_FLAG (op, FLAG_WAS_WIZ);
2094	flag_inv (op, FLAG_WAS_WIZ);	1986	flag_inv (op, FLAG_WAS_WIZ);
…		…
2113	* 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
2114	* 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
2115	* 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
2116	* customized, changed states, etc.	2008	* customized, changed states, etc.
2117	*/	2009	*/
2118
2119	int	2010	int
2120	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)
2121	{	2012	{
2122	int
2123	i,
2124	index = 0, flag;	2013	int index = 0, flag;
2125	static int
2126	altern[SIZEOFFREE];	2014	int altern[SIZEOFFREE];
2127		2015
2128	for (i = start; i < stop; i++)	2016	for (int i = start; i < stop; i++)
2129	{	2017	{
2130	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]);
2131	if (!flag)	2019	if (!flag)
2132	altern[index++] = i;	2020	altern [index++] = i;
2133		2021
2134	/* 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.
2135	* 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.
2136	* 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 -
2137	* 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
2138	* spaces in all the other directions, this will reduce the search space	2026	* spaces in all the other directions, this will reduce the search space
2139	* to only the spaces immediately surrounding the target area, and	2027	* to only the spaces immediately surrounding the target area, and
2140	* won't look 2 spaces south of the target space.	2028	* won't look 2 spaces south of the target space.
2141	*/	2029	*/
2142	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2030	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2143	stop = maxfree[i];	2031	stop = maxfree[i];
2144	}	2032	}
		2033
2145	if (!index)	2034	if (!index)
2146	return -1;	2035	return -1;
		2036
2147	return altern[RANDOM () % index];	2037	return altern[RANDOM () % index];
2148	}	2038	}
2149		2039
2150	/*	2040	/*
2151	* find_first_free_spot(archetype, maptile, x, y) works like	2041	* find_first_free_spot(archetype, maptile, x, y) works like
2152	* find_free_spot(), but it will search max number of squares.	2042	* find_free_spot(), but it will search max number of squares.
2153	* 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.
2154	* 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.
2155	*/	2045	*/
2156
2157	int	2046	int
2158	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)
2159	{	2048	{
2160	int
2161	i;
2162
2163	for (i = 0; i < SIZEOFFREE; i++)	2049	for (int i = 0; i < SIZEOFFREE; i++)
2164	{
2165	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]))
2166	return i;	2051	return i;
2167	}	2052
2168	return -1;	2053	return -1;
2169	}	2054	}
2170		2055
2171	/*	2056	/*
2172	* The function permute(arr, begin, end) randomly reorders the array	2057	* The function permute(arr, begin, end) randomly reorders the array
2173	* arr[begin..end-1].	2058	* arr[begin..end-1].
		2059	* now uses a fisher-yates shuffle, old permute was broken
2174	*/	2060	*/
2175	static void	2061	static void
2176	permute (int *arr, int begin, int end)	2062	permute (int *arr, int begin, int end)
2177	{	2063	{
2178	int	2064	arr += begin;
2179	i,
2180	j,
2181	tmp,
2182	len;
2183
2184	len = end - begin;	2065	end -= begin;
2185	for (i = begin; i < end; i++)
2186	{
2187	j = begin + RANDOM () % len;
2188		2066
2189	tmp = arr[i];	2067	while (--end)
2190	arr[i] = arr[j];	2068	swap (arr [end], arr [RANDOM () % (end + 1)]);
2191	arr[j] = tmp;
2192	}
2193	}	2069	}
2194		2070
2195	/* new function to make monster searching more efficient, and effective!	2071	/* new function to make monster searching more efficient, and effective!
2196	* This basically returns a randomized array (in the passed pointer) of	2072	* This basically returns a randomized array (in the passed pointer) of
2197	* 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
…		…
2200	* 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.
2201	*/	2077	*/
2202	void	2078	void
2203	get_search_arr (int *search_arr)	2079	get_search_arr (int *search_arr)
2204	{	2080	{
2205	int	2081	int i;
2206	i;
2207		2082
2208	for (i = 0; i < SIZEOFFREE; i++)	2083	for (i = 0; i < SIZEOFFREE; i++)
2209	{
2210	search_arr[i] = i;	2084	search_arr[i] = i;
2211	}
2212		2085
2213	permute (search_arr, 1, SIZEOFFREE1 + 1);	2086	permute (search_arr, 1, SIZEOFFREE1 + 1);
2214	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2087	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2215	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2088	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2216	}	2089	}
…		…
2225	* Perhaps incorrectly, but I'm making the assumption that exclude	2098	* Perhaps incorrectly, but I'm making the assumption that exclude
2226	* 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
2227	* 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
2228	* there is capable of.	2101	* there is capable of.
2229	*/	2102	*/
2230
2231	int	2103	int
2232	find_dir (maptile *m, int x, int y, object *exclude)	2104	find_dir (maptile *m, int x, int y, object *exclude)
2233	{	2105	{
2234	int
2235	i,
2236	max = SIZEOFFREE, mflags;	2106	int i, max = SIZEOFFREE, mflags;
2237		2107
2238	sint16 nx, ny;	2108	sint16 nx, ny;
2239	object *	2109	object *tmp;
2240	tmp;
2241	maptile *	2110	maptile *mp;
2242	mp;
2243		2111
2244	MoveType blocked, move_type;	2112	MoveType blocked, move_type;
2245		2113
2246	if (exclude && exclude->head)	2114	if (exclude && exclude->head)
2247	{	2115	{
…		…
2259	mp = m;	2127	mp = m;
2260	nx = x + freearr_x[i];	2128	nx = x + freearr_x[i];
2261	ny = y + freearr_y[i];	2129	ny = y + freearr_y[i];
2262		2130
2263	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2131	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2132
2264	if (mflags & P_OUT_OF_MAP)	2133	if (mflags & P_OUT_OF_MAP)
2265	{
2266	max = maxfree[i];	2134	max = maxfree[i];
2267	}
2268	else	2135	else
2269	{	2136	{
2270	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2137	mapspace &ms = mp->at (nx, ny);
		2138
		2139	blocked = ms.move_block;
2271		2140
2272	if ((move_type & blocked) == move_type)	2141	if ((move_type & blocked) == move_type)
2273	{
2274	max = maxfree[i];	2142	max = maxfree[i];
2275	}
2276	else if (mflags & P_IS_ALIVE)	2143	else if (mflags & P_IS_ALIVE)
2277	{	2144	{
2278	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2145	for (tmp = ms.bot; tmp; tmp = tmp->above)
2279	{	2146	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2280	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2147	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2281	{
2282	break;	2148	break;
2283	}	2149
2284	}
2285	if (tmp)	2150	if (tmp)
2286	{
2287	return freedir[i];	2151	return freedir[i];
2288	}
2289	}	2152	}
2290	}	2153	}
2291	}	2154	}
		2155
2292	return 0;	2156	return 0;
2293	}	2157	}
2294		2158
2295	/*	2159	/*
2296	* distance(object 1, object 2) will return the square of the	2160	* distance(object 1, object 2) will return the square of the
2297	* distance between the two given objects.	2161	* distance between the two given objects.
2298	*/	2162	*/
2299
2300	int	2163	int
2301	distance (const object *ob1, const object *ob2)	2164	distance (const object *ob1, const object *ob2)
2302	{	2165	{
2303	int
2304	i;
2305
2306	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);
2307	return i;
2308	}	2167	}
2309		2168
2310	/*	2169	/*
2311	* 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
2312	* 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
2313	* object, needs to travel toward it.	2172	* object, needs to travel toward it.
2314	*/	2173	*/
2315
2316	int	2174	int
2317	find_dir_2 (int x, int y)	2175	find_dir_2 (int x, int y)
2318	{	2176	{
2319	int	2177	int q;
2320	q;
2321		2178
2322	if (y)	2179	if (y)
2323	q = x * 100 / y;	2180	q = x * 100 / y;
2324	else if (x)	2181	else if (x)
2325	q = -300 * x;	2182	q = -300 * x;
…		…
2360	int	2217	int
2361	absdir (int d)	2218	absdir (int d)
2362	{	2219	{
2363	while (d < 1)	2220	while (d < 1)
2364	d += 8;	2221	d += 8;
		2222
2365	while (d > 8)	2223	while (d > 8)
2366	d -= 8;	2224	d -= 8;
		2225
2367	return d;	2226	return d;
2368	}	2227	}
2369		2228
2370	/*	2229	/*
2371	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2373	*/	2232	*/
2374		2233
2375	int	2234	int
2376	dirdiff (int dir1, int dir2)	2235	dirdiff (int dir1, int dir2)
2377	{	2236	{
2378	int	2237	int d;
2379	d;
2380		2238
2381	d = abs (dir1 - dir2);	2239	d = abs (dir1 - dir2);
2382	if (d > 4)	2240	if (d > 4)
2383	d = 8 - d;	2241	d = 8 - d;
		2242
2384	return d;	2243	return d;
2385	}	2244	}
2386		2245
2387	/* peterm:	2246	/* peterm:
2388	* 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.
…		…
2391	* 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
2392	* 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.
2393	* 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
2394	* functions.	2253	* functions.
2395	*/	2254	*/
2396
2397	int
2398	reduction_dir[SIZEOFFREE][3] = {	2255	int reduction_dir[SIZEOFFREE][3] = {
2399	{0, 0, 0}, /* 0 */	2256	{0, 0, 0}, /* 0 */
2400	{0, 0, 0}, /* 1 */	2257	{0, 0, 0}, /* 1 */
2401	{0, 0, 0}, /* 2 */	2258	{0, 0, 0}, /* 2 */
2402	{0, 0, 0}, /* 3 */	2259	{0, 0, 0}, /* 3 */
2403	{0, 0, 0}, /* 4 */	2260	{0, 0, 0}, /* 4 */
…		…
2451	* find a path to that monster that we found. If not,	2308	* find a path to that monster that we found. If not,
2452	* we don't bother going toward it. Returns 1 if we	2309	* we don't bother going toward it. Returns 1 if we
2453	* can see a direct way to get it	2310	* can see a direct way to get it
2454	* Modified to be map tile aware -.MSW	2311	* Modified to be map tile aware -.MSW
2455	*/	2312	*/
2456
2457
2458	int	2313	int
2459	can_see_monsterP (maptile *m, int x, int y, int dir)	2314	can_see_monsterP (maptile *m, int x, int y, int dir)
2460	{	2315	{
2461	sint16 dx, dy;	2316	sint16 dx, dy;
2462	int
2463	mflags;	2317	int mflags;
2464		2318
2465	if (dir < 0)	2319	if (dir < 0)
2466	return 0; /* exit condition: invalid direction */	2320	return 0; /* exit condition: invalid direction */
2467		2321
2468	dx = x + freearr_x[dir];	2322	dx = x + freearr_x[dir];
…		…
2481	return 0;	2335	return 0;
2482		2336
2483	/* yes, can see. */	2337	/* yes, can see. */
2484	if (dir < 9)	2338	if (dir < 9)
2485	return 1;	2339	return 1;
		2340
2486	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2341	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2487	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2342	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2343	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2488	}	2344	}
2489
2490
2491		2345
2492	/*	2346	/*
2493	* can_pick(picker, item): finds out if an object is possible to be	2347	* can_pick(picker, item): finds out if an object is possible to be
2494	* picked up by the picker. Returnes 1 if it can be	2348	* picked up by the picker. Returnes 1 if it can be
2495	* picked up, otherwise 0.	2349	* picked up, otherwise 0.
…		…
2506	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2360	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2507	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2361	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2508	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2362	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2509	}	2363	}
2510		2364
2511
2512	/*	2365	/*
2513	* create clone from object to another	2366	* create clone from object to another
2514	*/	2367	*/
2515	object *	2368	object *
2516	object_create_clone (object *asrc)	2369	object_create_clone (object *asrc)
…		…
2535	{	2388	{
2536	dst = tmp;	2389	dst = tmp;
2537	tmp->head = 0;	2390	tmp->head = 0;
2538	}	2391	}
2539	else	2392	else
2540	{
2541	tmp->head = dst;	2393	tmp->head = dst;
2542	}
2543		2394
2544	tmp->more = 0;	2395	tmp->more = 0;
2545		2396
2546	if (prev)	2397	if (prev)
2547	prev->more = tmp;	2398	prev->more = tmp;
…		…
2559	/* 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 */
2560	/* 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, */
2561	/* 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. */
2562	/* 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. */
2563	/* Also remember that multiparts objects are not supported for now. */	2414	/* Also remember that multiparts objects are not supported for now. */
2564
2565	object *	2415	object *
2566	load_object_str (const char *obstr)	2416	load_object_str (const char *obstr)
2567	{	2417	{
2568	object *op;	2418	object *op;
2569	char filename[MAX_BUF];	2419	char filename[MAX_BUF];
…		…
2599	* returns NULL if no match.	2449	* returns NULL if no match.
2600	*/	2450	*/
2601	object *	2451	object *
2602	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)
2603	{	2453	{
2604	object *tmp;
2605
2606	for (tmp = who->inv; tmp; tmp = tmp->below)	2454	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2607	if (tmp->type == type && tmp->subtype == subtype)	2455	if (tmp->type == type && tmp->subtype == subtype)
2608	return tmp;	2456	return tmp;
2609		2457
2610	return NULL;	2458	return 0;
2611	}	2459	}
2612		2460
2613	/* 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,
2614	* otherwise return NULL.	2462	* otherwise return NULL.
2615	*	2463	*
…		…
2617	* do the desired thing.	2465	* do the desired thing.
2618	*/	2466	*/
2619	key_value *	2467	key_value *
2620	get_ob_key_link (const object *ob, const char *key)	2468	get_ob_key_link (const object *ob, const char *key)
2621	{	2469	{
2622	key_value *link;
2623
2624	for (link = ob->key_values; link != NULL; link = link->next)	2470	for (key_value *link = ob->key_values; link; link = link->next)
2625	if (link->key == key)	2471	if (link->key == key)
2626	return link;	2472	return link;
2627		2473
2628	return NULL;	2474	return 0;
2629	}	2475	}
2630		2476
2631	/*	2477	/*
2632	* 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.
2633	*	2479	*
…		…
2673	* Returns TRUE on success.	2519	* Returns TRUE on success.
2674	*/	2520	*/
2675	int	2521	int
2676	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)
2677	{	2523	{
2678	key_value *
2679	field = NULL, *last = NULL;	2524	key_value *field = NULL, *last = NULL;
2680		2525
2681	for (field = op->key_values; field != NULL; field = field->next)	2526	for (field = op->key_values; field != NULL; field = field->next)
2682	{	2527	{
2683	if (field->key != canonical_key)	2528	if (field->key != canonical_key)
2684	{	2529	{
…		…
2712	/* IF we get here, key doesn't exist */	2557	/* IF we get here, key doesn't exist */
2713		2558
2714	/* No field, we'll have to add it. */	2559	/* No field, we'll have to add it. */
2715		2560
2716	if (!add_key)	2561	if (!add_key)
2717	{
2718	return FALSE;	2562	return FALSE;
2719	}	2563
2720	/* There isn't any good reason to store a null	2564	/* There isn't any good reason to store a null
2721	* value in the key/value list. If the archetype has	2565	* value in the key/value list. If the archetype has
2722	* this key, then we should also have it, so shouldn't	2566	* this key, then we should also have it, so shouldn't
2723	* be here. If user wants to store empty strings,	2567	* be here. If user wants to store empty strings,
2724	* should pass in ""	2568	* should pass in ""
…		…
2773	}	2617	}
2774	else	2618	else
2775	item = item->env;	2619	item = item->env;
2776	}	2620	}
2777		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
2778	// 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
2779	const char *	2652	const char *
2780	object::debug_desc (char *info) const	2653	object::debug_desc (char *info) const
2781	{	2654	{
		2655	char flagdesc[512];
2782	char info2[256 * 3];	2656	char info2[256 * 4];
2783	char *p = info;	2657	char *p = info;
2784		2658
2785	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}",
2786	count,	2660	count, uuid.seq,
2787	&name,	2661	&name,
2788	title ? " " : "",	2662	title ? "\",title:" : "",
2789	title ? (const char *)title : "");	2663	title ? (const char *)title : "",
		2664	flag_desc (flagdesc, 512), type);
2790		2665
2791	if (env)	2666	if (env)
2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2667	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2793		2668
2794	if (map)	2669	if (map)
2795	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);
2796		2671
2797	return info;	2672	return info;
2798	}	2673	}
2799		2674
2800	const char *	2675	const char *
2801	object::debug_desc () const	2676	object::debug_desc () const
2802	{	2677	{
2803	static char info[256 * 3];	2678	static char info[256 * 4];
2804	return debug_desc (info);	2679	return debug_desc (info);
2805	}	2680	}
2806		2681

Diff Legend

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