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.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.127 by elmex, Mon Jan 29 21:04:32 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
…		…
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
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		486
488	if (self || cb)
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
490
491	if (is_freed)	487	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
493		489
494	if (is_removed)	490	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
496		492
497	if (speed < 0)	493	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - rndm ();
499		495
500	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
501	if (key_values)	497	if (key_values)
502	{	498	{
503	key_value *tail = 0;	499	key_value *tail = 0;
…		…
525	tail = new_link;	521	tail = new_link;
526	}	522	}
527	}	523	}
528	}	524	}
529		525
530	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
531	}	527	}
532		528
533	object *	529	object *
534	object::clone ()	530	object::clone ()
535	{	531	{
…		…
541	/*	537	/*
542	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
543	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
544	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
545	*/	541	*/
546
547	void	542	void
548	update_turn_face (object *op)	543	update_turn_face (object *op)
549	{	544	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	546	return;
		547
552	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
554	}	550	}
555		551
556	/*	552	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
558	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
559	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
560	*/	556	*/
561	void	557	void
562	update_ob_speed (object *op)	558	object::set_speed (float speed)
563	{	559	{
564	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	561	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	563	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	564	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		565
589	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		567
593	if (op->active_next != NULL)	568	if (has_active_speed ())
594	op->active_next->active_prev = op;	569	activate ();
595
596	active_objects = op;
597	}
598	else	570	else
599	{	571	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	572	}
654		573
655	/*	574	/*
656	* update_object() updates the the map.	575	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
694	*/	613	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	615	return;
697		616
698	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
699	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	619	{
701	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	621	#ifdef MANY_CORES
703	abort ();	622	abort ();
704	#endif	623	#endif
705	return;	624	return;
706	}	625	}
707		626
708	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
709		628
710	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	630	/* nop */;
712	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
713	{	632	{
714	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
725	* to have move_allow right now.	644	* to have move_allow right now.
726	*/	645	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
730	}	649	}
731	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	652	* that is being removed.
734	*/	653	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
739	else	658	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		660
742	if (op->more)	661	if (op->more)
743	update_object (op->more, action);	662	update_object (op->more, action);
744	}	663	}
745		664
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	665	object::object ()
763	{	666	{
764	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
765		668
766	expmul = 1.0;	669	expmul = 1.0;
767	face = blank_face;	670	face = blank_face;
768	}	671	}
769		672
770	object::~object ()	673	object::~object ()
771	{	674	{
		675	unlink ();
		676
772	free_key_values (this);	677	free_key_values (this);
773	}	678	}
774		679
		680	static int object_count;
		681
775	void object::link ()	682	void object::link ()
776	{	683	{
777	count = ++ob_count;	684	assert (!index);//D
778	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
779		687
780	prev = 0;	688	refcnt_inc ();
781	next = object::first;	689	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	690	}
788		691
789	void object::unlink ()	692	void object::unlink ()
790	{	693	{
791	if (this == object::first)	694	if (!index)
792	object::first = next;	695	return;
793		696
794	/* Remove this object from the list of used objects */	697	objects.erase (this);
795	if (prev) prev->next = next;	698	refcnt_dec ();
796	if (next) next->prev = prev;	699	}
797		700
798	prev = 0;	701	void
799	next = 0;	702	object::activate ()
		703	{
		704	/* If already on active list, don't do anything */
		705	if (active)
		706	return;
		707
		708	if (has_active_speed ())
		709	actives.insert (this);
		710	}
		711
		712	void
		713	object::activate_recursive ()
		714	{
		715	activate ();
		716
		717	for (object *op = inv; op; op = op->below)
		718	op->activate_recursive ();
		719	}
		720
		721	/* This function removes object 'op' from the list of active
		722	* objects.
		723	* This should only be used for style maps or other such
		724	* reference maps where you don't want an object that isn't
		725	* in play chewing up cpu time getting processed.
		726	* The reverse of this is to call update_ob_speed, which
		727	* will do the right thing based on the speed of the object.
		728	*/
		729	void
		730	object::deactivate ()
		731	{
		732	/* If not on the active list, nothing needs to be done */
		733	if (!active)
		734	return;
		735
		736	actives.erase (this);
		737	}
		738
		739	void
		740	object::deactivate_recursive ()
		741	{
		742	for (object *op = inv; op; op = op->below)
		743	op->deactivate_recursive ();
		744
		745	deactivate ();
		746	}
		747
		748	void
		749	object::set_flag_inv (int flag, int value)
		750	{
		751	for (object *op = inv; op; op = op->below)
		752	{
		753	op->flag [flag] = value;
		754	op->set_flag_inv (flag, value);
		755	}
		756	}
		757
		758	/*
		759	* Remove and free all objects in the inventory of the given object.
		760	* object.c ?
		761	*/
		762	void
		763	object::destroy_inv (bool drop_to_ground)
		764	{
		765	// need to check first, because the checks below might segfault
		766	// as we might be on an invalid mapspace and crossfire code
		767	// is too buggy to ensure that the inventory is empty.
		768	// corollary: if you create arrows etc. with stuff in tis inventory,
		769	// cf will crash below with off-map x and y
		770	if (!inv)
		771	return;
		772
		773	/* Only if the space blocks everything do we not process -
		774	* if some form of movement is allowed, let objects
		775	* drop on that space.
		776	*/
		777	if (!drop_to_ground
		778	|| !map
		779	|| map->in_memory != MAP_IN_MEMORY
		780	|| map->nodrop
		781	|| ms ().move_block == MOVE_ALL)
		782	{
		783	while (inv)
		784	{
		785	inv->destroy_inv (drop_to_ground);
		786	inv->destroy ();
		787	}
		788	}
		789	else
		790	{ /* Put objects in inventory onto this space */
		791	while (inv)
		792	{
		793	object *op = inv;
		794
		795	if (op->flag [FLAG_STARTEQUIP]
		796	|| op->flag [FLAG_NO_DROP]
		797	|| op->type == RUNE
		798	|| op->type == TRAP
		799	|| op->flag [FLAG_IS_A_TEMPLATE]
		800	|| op->flag [FLAG_DESTROY_ON_DEATH])
		801	op->destroy ();
		802	else
		803	map->insert (op, x, y);
		804	}
		805	}
800	}	806	}
801		807
802	object *object::create ()	808	object *object::create ()
803	{	809	{
804	object *op = new object;	810	object *op = new object;
805	op->link ();	811	op->link ();
806	return op;	812	return op;
807	}	813	}
808		814
809	/*	815	void
810	* free_object() frees everything allocated by an object, removes	816	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	817	{
821	if (QUERY_FLAG (this, FLAG_FREED))	818	attachable::do_destroy ();
822	return;
823		819
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	if (flag [FLAG_IS_LINKED])
		821	remove_button_link (this);
		822
		823	if (flag [FLAG_FRIENDLY])
		824	{
825	remove_friendly_object (this);	825	remove_friendly_object (this);
826		826
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (type == GOLEM
		828	&& owner
		829	&& owner->type == PLAYER
		830	&& owner->contr->ranges[range_golem] == this)
		831	owner->contr->ranges[range_golem] = 0;
		832	}
		833
		834	if (!flag [FLAG_REMOVED])
828	remove ();	835	remove ();
829		836
830	SET_FLAG (this, FLAG_FREED);	837	destroy_inv (true);
831		838
832	if (more)	839	deactivate ();
833	{	840	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		841
838	if (inv)	842	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		843
880	// hack to ensure that freed objects still have a valid map	844	// hack to ensure that freed objects still have a valid map
881	{	845	{
882	static maptile *freed_map; // freed objects are moved here to avoid crashes	846	static maptile *freed_map; // freed objects are moved here to avoid crashes
883		847
…		…
887		851
888	freed_map->name = "/internal/freed_objects_map";	852	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	853	freed_map->width = 3;
890	freed_map->height = 3;	854	freed_map->height = 3;
891		855
892	freed_map->allocate ();	856	freed_map->alloc ();
		857	freed_map->in_memory = MAP_IN_MEMORY;
893	}	858	}
894		859
895	map = freed_map;	860	map = freed_map;
896	x = 1;	861	x = 1;
897	y = 1;	862	y = 1;
898	}	863	}
899		864
		865	head = 0;
		866
		867	if (more)
		868	{
		869	more->destroy ();
		870	more = 0;
		871	}
		872
900	// clear those pointers that likely might have circular references to us	873	// clear those pointers that likely might have circular references to us
901	owner = 0;	874	owner = 0;
902	enemy = 0;	875	enemy = 0;
903	attacked_by = 0;	876	attacked_by = 0;
		877	}
904		878
905	// only relevant for players(?), but make sure of it anyways	879	void
906	contr = 0;	880	object::destroy (bool destroy_inventory)
		881	{
		882	if (destroyed ())
		883	return;
907		884
908	/* Remove object from the active list */	885	if (destroy_inventory)
909	speed = 0;	886	destroy_inv (false);
910	update_ob_speed (this);
911		887
912	unlink ();	888	attachable::destroy ();
913
914	mortals.push_back (this);
915	}	889	}
916		890
917	/*	891	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	892	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	893	* weight of an object (and what is carried by it's environment(s)).
…		…
935	* This function removes the object op from the linked list of objects	909	* This function removes the object op from the linked list of objects
936	* which it is currently tied to. When this function is done, the	910	* which it is currently tied to. When this function is done, the
937	* object will have no environment. If the object previously had an	911	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	912	* environment, the x and y coordinates will be updated to
939	* the previous environment.	913	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	914	*/
942	void	915	void
943	object::remove ()	916	object::remove_slow ()
944	{	917	{
945	object *tmp, *last = 0;	918	object *tmp, *last = 0;
946	object *otmp;	919	object *otmp;
947		920
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	921	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	922	return;
952		923
953	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
		925	INVOKE_OBJECT (REMOVE, this);
954		926
955	if (more)	927	if (more)
956	more->remove ();	928	more->remove ();
957		929
958	/*	930	/*
…		…
971	* to save cpu time.	943	* to save cpu time.
972	*/	944	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	945	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	946	otmp->update_stats ();
975		947
976	if (above != NULL)	948	if (above)
977	above->below = below;	949	above->below = below;
978	else	950	else
979	env->inv = below;	951	env->inv = below;
980		952
981	if (below != NULL)	953	if (below)
982	below->above = above;	954	below->above = above;
983		955
984	/* we set up values so that it could be inserted into	956	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	957	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	958	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	962	above = 0, below = 0;
991	env = 0;	963	env = 0;
992	}	964	}
993	else if (map)	965	else if (map)
994	{	966	{
995	/* Re did the following section of code - it looks like it had	967	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	968	{
		969	--map->players;
		970	map->touch ();
		971	}
		972
		973	map->dirty = true;
		974	mapspace &ms = this->ms ();
998		975
999	/* link the object above us */	976	/* link the object above us */
1000	if (above)	977	if (above)
1001	above->below = below;	978	above->below = below;
1002	else	979	else
1003	map->at (x, y).top = below; /* we were top, set new top */	980	ms.top = below; /* we were top, set new top */
1004		981
1005	/* Relink the object below us, if there is one */	982	/* Relink the object below us, if there is one */
1006	if (below)	983	if (below)
1007	below->above = above;	984	below->above = above;
1008	else	985	else
…		…
1010	/* Nothing below, which means we need to relink map object for this space	987	/* Nothing below, which means we need to relink map object for this space
1011	* use translated coordinates in case some oddness with map tiling is	988	* use translated coordinates in case some oddness with map tiling is
1012	* evident	989	* evident
1013	*/	990	*/
1014	if (GET_MAP_OB (map, x, y) != this)	991	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	992	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		993
1025	map->at (x, y).bottom = above; /* goes on above it. */	994	ms.bot = above; /* goes on above it. */
1026	}	995	}
1027		996
1028	above = 0;	997	above = 0;
1029	below = 0;	998	below = 0;
1030		999
1031	if (map->in_memory == MAP_SAVING)	1000	if (map->in_memory == MAP_SAVING)
1032	return;	1001	return;
1033		1002
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1003	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1004
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1005	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1006	{
1038	/* No point updating the players look faces if he is the object	1007	/* No point updating the players look faces if he is the object
1039	* being removed.	1008	* being removed.
1040	*/	1009	*/
1041		1010
…		…
1045	* removed (most likely destroyed), update the player view	1014	* removed (most likely destroyed), update the player view
1046	* appropriately.	1015	* appropriately.
1047	*/	1016	*/
1048	if (tmp->container == this)	1017	if (tmp->container == this)
1049	{	1018	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);	1019	flag [FLAG_APPLIED] = 0;
1051	tmp->container = 0;	1020	tmp->container = 0;
1052	}	1021	}
1053		1022
		1023	if (tmp->contr->ns)
1054	tmp->contr->ns->floorbox_update ();	1024	tmp->contr->ns->floorbox_update ();
1055	}	1025	}
1056		1026
1057	/* See if player moving off should effect something */	1027	/* See if object moving off should effect something */
1058	if (check_walk_off	1028	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1029	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1030	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1031	{
1062	move_apply (tmp, this, 0);	1032	move_apply (tmp, this, 0);
…		…
1064	if (destroyed ())	1034	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1035	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1036	}
1067		1037
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1038	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069		1039	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1070	if (tmp->above == tmp)	1040	if (tmp->above == tmp)
1071	tmp->above = 0;	1041	tmp->above = 0;
1072		1042
1073	last = tmp;	1043	last = tmp;
1074	}	1044	}
1075		1045
1076	/* last == NULL of there are no objects on this space */	1046	/* last == NULL if there are no objects on this space */
		1047	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1048	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1049	map->at (x, y).flags_ = 0;
1079	else	1050	else
1080	update_object (last, UP_OBJ_REMOVE);	1051	update_object (last, UP_OBJ_REMOVE);
1081		1052
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1053	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1054	update_all_los (map, x, y);
1084	}	1055	}
1085	}	1056	}
1086		1057
1087	/*	1058	/*
…		…
1096	merge_ob (object *op, object *top)	1067	merge_ob (object *op, object *top)
1097	{	1068	{
1098	if (!op->nrof)	1069	if (!op->nrof)
1099	return 0;	1070	return 0;
1100		1071
1101	if (top == NULL)	1072	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1073	for (top = op; top && top->above; top = top->above)
		1074	;
1103		1075
1104	for (; top != NULL; top = top->below)	1076	for (; top; top = top->below)
1105	{	1077	{
1106	if (top == op)	1078	if (top == op)
1107	continue;	1079	continue;
1108		1080
1109	if (object::can_merge (op, top))	1081	if (object::can_merge (op, top))
…		…
1119		1091
1120	return 0;	1092	return 0;
1121	}	1093	}
1122		1094
1123	/*	1095	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1096	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1097	* job preparing multi-part monsters.
1126	*/	1098	*/
1127	object *	1099	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1100	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1101	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1102	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1103	{
1137	tmp->x = x + tmp->arch->clone.x;	1104	tmp->x = x + tmp->arch->clone.x;
1138	tmp->y = y + tmp->arch->clone.y;	1105	tmp->y = y + tmp->arch->clone.y;
1139	}	1106	}
1140		1107
…		…
1159	* Return value:	1126	* Return value:
1160	* new object if 'op' was merged with other object	1127	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1128	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1129	* just 'op' otherwise
1163	*/	1130	*/
1164
1165	object *	1131	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1132	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1133	{
1168	object *tmp, *top, *floor = NULL;	1134	object *tmp, *top, *floor = NULL;
1169	sint16 x, y;
1170		1135
1171	if (QUERY_FLAG (op, FLAG_FREED))	1136	if (QUERY_FLAG (op, FLAG_FREED))
1172	{	1137	{
1173	LOG (llevError, "Trying to insert freed object!\n");	1138	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;	1139	return NULL;
1175	}	1140	}
1176		1141
1177	if (m == NULL)	1142	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1143	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1144
		1145	op->remove ();
		1146
		1147	if (!m)
1178	{	1148	{
1179	char *dump = dump_object (op);	1149	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1150	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181	free (dump);	1151	free (dump);
1182	return op;	1152	return op;
…		…
1195	#endif	1165	#endif
1196	free (dump);	1166	free (dump);
1197	return op;	1167	return op;
1198	}	1168	}
1199		1169
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;	1170	if (object *more = op->more)
1213		1171	{
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1172	if (!insert_ob_in_map (more, m, originator, flag))
1230	{	1173	{
1231	if (!op->head)	1174	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1175	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1176
1234	return NULL;	1177	return 0;
1235	}	1178	}
1236	}	1179	}
1237		1180
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1181	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1182
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1183	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1184	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1185	* need extra work
1243	*/	1186	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1187	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1188	return 0;
1246	y = op->y;	1189
		1190	op->map = m;
		1191	mapspace &ms = op->ms ();
1247		1192
1248	/* this has to be done after we translate the coordinates.	1193	/* this has to be done after we translate the coordinates.
1249	*/	1194	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1195	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1196	for (tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1197	if (object::can_merge (op, tmp))
1253	{	1198	{
1254	op->nrof += tmp->nrof;	1199	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1200	tmp->destroy ();
1256	}	1201	}
…		…
1273	op->below = originator->below;	1218	op->below = originator->below;
1274		1219
1275	if (op->below)	1220	if (op->below)
1276	op->below->above = op;	1221	op->below->above = op;
1277	else	1222	else
1278	op->ms ().bottom = op;	1223	ms.bot = op;
1279		1224
1280	/* since *below* originator, no need to update top */	1225	/* since *below* originator, no need to update top */
1281	originator->below = op;	1226	originator->below = op;
1282	}	1227	}
1283	else	1228	else
1284	{	1229	{
		1230	top = ms.bot;
		1231
1285	/* If there are other objects, then */	1232	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1233	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1234	{
1288	object *last = NULL;	1235	object *last = 0;
1289		1236
1290	/*	1237	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1238	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1239	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1240	* Generally, we want to put the new object on top. But if
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1244	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1245	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1246	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1247	* that flying non pickable objects are spell objects.
1301	*/	1248	*/
1302		1249	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1250	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1251	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1252	floor = top;
1307		1253
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1254	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1311	top = top->below;	1257	top = top->below;
1312	break;	1258	break;
1313	}	1259	}
1314		1260
1315	last = top;	1261	last = top;
1316	top = top->above;
1317	}	1262	}
1318		1263
1319	/* Don't want top to be NULL, so set it to the last valid object */	1264	/* Don't want top to be NULL, so set it to the last valid object */
1320	top = last;	1265	top = last;
1321		1266
…		…
1328	* Unless those objects are exits, type 66	1273	* Unless those objects are exits, type 66
1329	* If INS_ON_TOP is used, don't do this processing	1274	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1275	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1276	* stacking is a bit odd.
1332	*/	1277	*/
1333	if (!(flag & INS_ON_TOP) &&	1278	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1279	&& ms.flags () & P_BLOCKSVIEW
		1280	&& (op->face && !op->face->visibility))
1335	{	1281	{
1336	for (last = top; last != floor; last = last->below)	1282	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1283	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1284	break;
		1285
1339	/* Check to see if we found the object that blocks view,	1286	/* Check to see if we found the object that blocks view,
1340	* and make sure we have a below pointer for it so that	1287	* and make sure we have a below pointer for it so that
1341	* we can get inserted below this one, which requires we	1288	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1289	* set top to the object below us.
1343	*/	1290	*/
…		…
1345	top = last->below;	1292	top = last->below;
1346	}	1293	}
1347	} /* If objects on this space */	1294	} /* If objects on this space */
1348		1295
1349	if (flag & INS_MAP_LOAD)	1296	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);	1297	top = ms.top;
1351		1298
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1299	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1300	top = floor;
1354		1301
1355	/* Top is the object that our object (op) is going to get inserted above.	1302	/* Top is the object that our object (op) is going to get inserted above.
1356	*/	1303	*/
1357		1304
1358	/* First object on this space */	1305	/* First object on this space */
1359	if (!top)	1306	if (!top)
1360	{	1307	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1308	op->above = ms.bot;
1362		1309
1363	if (op->above)	1310	if (op->above)
1364	op->above->below = op;	1311	op->above->below = op;
1365		1312
1366	op->below = NULL;	1313	op->below = 0;
1367	op->ms ().bottom = op;	1314	ms.bot = op;
1368	}	1315	}
1369	else	1316	else
1370	{ /* get inserted into the stack above top */	1317	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1318	op->above = top->above;
1372		1319
…		…
1375		1322
1376	op->below = top;	1323	op->below = top;
1377	top->above = op;	1324	top->above = op;
1378	}	1325	}
1379		1326
1380	if (op->above == NULL)	1327	if (!op->above)
1381	op->ms ().top = op;	1328	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1329	} /* else not INS_BELOW_ORIGINATOR */
1383		1330
1384	if (op->type == PLAYER)	1331	if (op->type == PLAYER)
		1332	{
1385	op->contr->do_los = 1;	1333	op->contr->do_los = 1;
		1334	++op->map->players;
		1335	op->map->touch ();
		1336	}
		1337
		1338	op->map->dirty = true;
1386		1339
1387	/* If we have a floor, we know the player, if any, will be above	1340	/* If we have a floor, we know the player, if any, will be above
1388	* it, so save a few ticks and start from there.	1341	* it, so save a few ticks and start from there.
1389	*/	1342	*/
1390	if (!(flag & INS_MAP_LOAD))	1343	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1344	if (object *pl = ms.player ())
		1345	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1346	pl->contr->ns->floorbox_update ();
1393		1347
1394	/* If this object glows, it may affect lighting conditions that are	1348	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1349	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1350	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1351	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1352	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1353	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1354	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1355	* of effect may be sufficient.
1402	*/	1356	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1357	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1358	update_all_los (op->map, op->x, op->y);
1405		1359
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1360	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1361	update_object (op, UP_OBJ_INSERT);
		1362
		1363	INVOKE_OBJECT (INSERT, op);
1408		1364
1409	/* Don't know if moving this to the end will break anything. However,	1365	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1366	* we want to have floorbox_update called before calling this.
1411	*	1367	*
1412	* check_move_on() must be after this because code called from	1368	* check_move_on() must be after this because code called from
…		…
1417		1373
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1374	/* if this is not the head or flag has been passed, don't check walk on status */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1375	if (!(flag & INS_NO_WALK_ON) && !op->head)
1420	{	1376	{
1421	if (check_move_on (op, originator))	1377	if (check_move_on (op, originator))
1422	return NULL;	1378	return 0;
1423		1379
1424	/* If we are a multi part object, lets work our way through the check	1380	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1381	* walk on's.
1426	*/	1382	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1383	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1384	if (check_move_on (tmp, originator))
1429	return NULL;	1385	return 0;
1430	}	1386	}
1431		1387
1432	return op;	1388	return op;
1433	}	1389	}
1434		1390
…		…
1441	{	1397	{
1442	object *tmp, *tmp1;	1398	object *tmp, *tmp1;
1443		1399
1444	/* first search for itself and remove any old instances */	1400	/* first search for itself and remove any old instances */
1445		1401
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1402	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1403	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1448	tmp->destroy ();	1404	tmp->destroy ();
1449		1405
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1406	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1407
1452	tmp1->x = op->x;	1408	tmp1->x = op->x;
1453	tmp1->y = op->y;	1409	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1410	insert_ob_in_map (tmp1, op->map, op, 0);
		1411	}
		1412
		1413	object *
		1414	object::insert_at (object *where, object *originator, int flags)
		1415	{
		1416	where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1417	}
1456		1418
1457	/*	1419	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1420	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1459	* is returned contains nr objects, and the remaining parts contains	1421	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1422	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1423	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1424	* global static errmsg array.
1463	*/	1425	*/
1464
1465	object *	1426	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1427	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1428	{
1468	object *newob;	1429	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1430	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1692	if ((op->glow_radius != 0) && map)	1653	if ((op->glow_radius != 0) && map)
1693	{	1654	{
1694	#ifdef DEBUG_LIGHTS	1655	#ifdef DEBUG_LIGHTS
1695	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1656	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1696	#endif /* DEBUG_LIGHTS */	1657	#endif /* DEBUG_LIGHTS */
1697	if (MAP_DARKNESS (map))	1658	if (map->darkness)
1698	update_all_los (map, x, y);	1659	update_all_los (map, x, y);
1699	}	1660	}
1700		1661
1701	/* Client has no idea of ordering so lets not bother ordering it here.	1662	/* Client has no idea of ordering so lets not bother ordering it here.
1702	* It sure simplifies this function...	1663	* It sure simplifies this function...
…		…
1707	{	1668	{
1708	op->below = inv;	1669	op->below = inv;
1709	op->below->above = op;	1670	op->below->above = op;
1710	inv = op;	1671	inv = op;
1711	}	1672	}
		1673
		1674	INVOKE_OBJECT (INSERT, this);
1712		1675
1713	return op;	1676	return op;
1714	}	1677	}
1715		1678
1716	/*	1679	/*
…		…
1731	*	1694	*
1732	* MSW 2001-07-08: Check all objects on space, not just those below	1695	* MSW 2001-07-08: Check all objects on space, not just those below
1733	* object being inserted. insert_ob_in_map may not put new objects	1696	* object being inserted. insert_ob_in_map may not put new objects
1734	* on top.	1697	* on top.
1735	*/	1698	*/
1736
1737	int	1699	int
1738	check_move_on (object *op, object *originator)	1700	check_move_on (object *op, object *originator)
1739	{	1701	{
1740	object *tmp;	1702	object *tmp;
1741	maptile *m = op->map;	1703	maptile *m = op->map;
…		…
1768		1730
1769	/* The objects have to be checked from top to bottom.	1731	/* The objects have to be checked from top to bottom.
1770	* Hence, we first go to the top:	1732	* Hence, we first go to the top:
1771	*/	1733	*/
1772		1734
1773	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1735	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1774	{	1736	{
1775	/* Trim the search when we find the first other spell effect	1737	/* Trim the search when we find the first other spell effect
1776	* this helps performance so that if a space has 50 spell objects,	1738	* this helps performance so that if a space has 50 spell objects,
1777	* we don't need to check all of them.	1739	* we don't need to check all of them.
1778	*/	1740	*/
…		…
1796	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1797	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1798	{	1760	{
1799		1761
1800	float	1762	float
1801	diff = tmp->move_slow_penalty * FABS (op->speed);	1763	diff = tmp->move_slow_penalty * fabs (op->speed);
1802		1764
1803	if (op->type == PLAYER)	1765	if (op->type == PLAYER)
1804	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1805	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1806	diff /= 4.0;	1768	diff /= 4.0;
…		…
1833	/*	1795	/*
1834	* present_arch(arch, map, x, y) searches for any objects with	1796	* present_arch(arch, map, x, y) searches for any objects with
1835	* a matching archetype at the given map and coordinates.	1797	* a matching archetype at the given map and coordinates.
1836	* The first matching object is returned, or NULL if none.	1798	* The first matching object is returned, or NULL if none.
1837	*/	1799	*/
1838
1839	object *	1800	object *
1840	present_arch (const archetype *at, maptile *m, int x, int y)	1801	present_arch (const archetype *at, maptile *m, int x, int y)
1841	{	1802	{
1842	object *
1843	tmp;
1844
1845	if (m == NULL || out_of_map (m, x, y))	1803	if (!m || out_of_map (m, x, y))
1846	{	1804	{
1847	LOG (llevError, "Present_arch called outside map.\n");	1805	LOG (llevError, "Present_arch called outside map.\n");
1848	return NULL;	1806	return NULL;
1849	}	1807	}
1850	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1808
		1809	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1851	if (tmp->arch == at)	1810	if (tmp->arch == at)
1852	return tmp;	1811	return tmp;
		1812
1853	return NULL;	1813	return NULL;
1854	}	1814	}
1855		1815
1856	/*	1816	/*
1857	* present(type, map, x, y) searches for any objects with	1817	* present(type, map, x, y) searches for any objects with
1858	* a matching type variable at the given map and coordinates.	1818	* a matching type variable at the given map and coordinates.
1859	* The first matching object is returned, or NULL if none.	1819	* The first matching object is returned, or NULL if none.
1860	*/	1820	*/
1861
1862	object *	1821	object *
1863	present (unsigned char type, maptile *m, int x, int y)	1822	present (unsigned char type, maptile *m, int x, int y)
1864	{	1823	{
1865	object *
1866	tmp;
1867
1868	if (out_of_map (m, x, y))	1824	if (out_of_map (m, x, y))
1869	{	1825	{
1870	LOG (llevError, "Present called outside map.\n");	1826	LOG (llevError, "Present called outside map.\n");
1871	return NULL;	1827	return NULL;
1872	}	1828	}
1873	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1829
		1830	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1874	if (tmp->type == type)	1831	if (tmp->type == type)
1875	return tmp;	1832	return tmp;
		1833
1876	return NULL;	1834	return NULL;
1877	}	1835	}
1878		1836
1879	/*	1837	/*
1880	* present_in_ob(type, object) searches for any objects with	1838	* present_in_ob(type, object) searches for any objects with
1881	* a matching type variable in the inventory of the given object.	1839	* a matching type variable in the inventory of the given object.
1882	* The first matching object is returned, or NULL if none.	1840	* The first matching object is returned, or NULL if none.
1883	*/	1841	*/
1884
1885	object *	1842	object *
1886	present_in_ob (unsigned char type, const object *op)	1843	present_in_ob (unsigned char type, const object *op)
1887	{	1844	{
1888	object *
1889	tmp;
1890
1891	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1845	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1892	if (tmp->type == type)	1846	if (tmp->type == type)
1893	return tmp;	1847	return tmp;
		1848
1894	return NULL;	1849	return NULL;
1895	}	1850	}
1896		1851
1897	/*	1852	/*
1898	* present_in_ob (type, str, object) searches for any objects with	1853	* present_in_ob (type, str, object) searches for any objects with
…		…
1906	* str is the string to match against. Note that we match against	1861	* str is the string to match against. Note that we match against
1907	* the object name, not the archetype name. this is so that the	1862	* the object name, not the archetype name. this is so that the
1908	* spell code can use one object type (force), but change it's name	1863	* spell code can use one object type (force), but change it's name
1909	* to be unique.	1864	* to be unique.
1910	*/	1865	*/
1911
1912	object *	1866	object *
1913	present_in_ob_by_name (int type, const char *str, const object *op)	1867	present_in_ob_by_name (int type, const char *str, const object *op)
1914	{	1868	{
1915	object *
1916	tmp;
1917
1918	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1869	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919	{
1920	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1870	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1921	return tmp;	1871	return tmp;
1922	}	1872
1923	return NULL;	1873	return 0;
1924	}	1874	}
1925		1875
1926	/*	1876	/*
1927	* present_arch_in_ob(archetype, object) searches for any objects with	1877	* present_arch_in_ob(archetype, object) searches for any objects with
1928	* a matching archetype in the inventory of the given object.	1878	* a matching archetype in the inventory of the given object.
1929	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
1930	*/	1880	*/
1931
1932	object *	1881	object *
1933	present_arch_in_ob (const archetype *at, const object *op)	1882	present_arch_in_ob (const archetype *at, const object *op)
1934	{	1883	{
1935	object *
1936	tmp;
1937
1938	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939	if (tmp->arch == at)	1885	if (tmp->arch == at)
1940	return tmp;	1886	return tmp;
		1887
1941	return NULL;	1888	return NULL;
1942	}	1889	}
1943		1890
1944	/*	1891	/*
1945	* activate recursively a flag on an object inventory	1892	* activate recursively a flag on an object inventory
1946	*/	1893	*/
1947	void	1894	void
1948	flag_inv (object *op, int flag)	1895	flag_inv (object *op, int flag)
1949	{	1896	{
1950	object *
1951	tmp;
1952
1953	if (op->inv)	1897	if (op->inv)
1954	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1955	{	1899	{
1956	SET_FLAG (tmp, flag);	1900	SET_FLAG (tmp, flag);
1957	flag_inv (tmp, flag);	1901	flag_inv (tmp, flag);
1958	}	1902	}
1959	} /*	1903	}
		1904
		1905	/*
1960	* desactivate recursively a flag on an object inventory	1906	* deactivate recursively a flag on an object inventory
1961	*/	1907	*/
1962	void	1908	void
1963	unflag_inv (object *op, int flag)	1909	unflag_inv (object *op, int flag)
1964	{	1910	{
1965	object *
1966	tmp;
1967
1968	if (op->inv)	1911	if (op->inv)
1969	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1912	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1970	{	1913	{
1971	CLEAR_FLAG (tmp, flag);	1914	CLEAR_FLAG (tmp, flag);
1972	unflag_inv (tmp, flag);	1915	unflag_inv (tmp, flag);
1973	}	1916	}
1974	}	1917	}
…		…
1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1920	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978	* all it's inventory (recursively).	1921	* all it's inventory (recursively).
1979	* If checksums are used, a player will get set_cheat called for	1922	* If checksums are used, a player will get set_cheat called for
1980	* him/her-self and all object carried by a call to this function.	1923	* him/her-self and all object carried by a call to this function.
1981	*/	1924	*/
1982
1983	void	1925	void
1984	set_cheat (object *op)	1926	set_cheat (object *op)
1985	{	1927	{
1986	SET_FLAG (op, FLAG_WAS_WIZ);	1928	SET_FLAG (op, FLAG_WAS_WIZ);
1987	flag_inv (op, FLAG_WAS_WIZ);	1929	flag_inv (op, FLAG_WAS_WIZ);
…		…
2006	* because arch_blocked (now ob_blocked) needs to know the movement type	1948	* because arch_blocked (now ob_blocked) needs to know the movement type
2007	* to know if the space in question will block the object. We can't use	1949	* to know if the space in question will block the object. We can't use
2008	* the archetype because that isn't correct if the monster has been	1950	* the archetype because that isn't correct if the monster has been
2009	* customized, changed states, etc.	1951	* customized, changed states, etc.
2010	*/	1952	*/
2011
2012	int	1953	int
2013	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1954	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2014	{	1955	{
2015	int
2016	i,
2017	index = 0, flag;	1956	int index = 0, flag;
2018	static int
2019	altern[SIZEOFFREE];	1957	int altern[SIZEOFFREE];
2020		1958
2021	for (i = start; i < stop; i++)	1959	for (int i = start; i < stop; i++)
2022	{	1960	{
2023	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1961	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2024	if (!flag)	1962	if (!flag)
2025	altern[index++] = i;	1963	altern [index++] = i;
2026		1964
2027	/* Basically, if we find a wall on a space, we cut down the search size.	1965	/* Basically, if we find a wall on a space, we cut down the search size.
2028	* In this way, we won't return spaces that are on another side of a wall.	1966	* In this way, we won't return spaces that are on another side of a wall.
2029	* This mostly work, but it cuts down the search size in all directions -	1967	* This mostly work, but it cuts down the search size in all directions -
2030	* if the space being examined only has a wall to the north and empty	1968	* if the space being examined only has a wall to the north and empty
…		…
2037	}	1975	}
2038		1976
2039	if (!index)	1977	if (!index)
2040	return -1;	1978	return -1;
2041		1979
2042	return altern[RANDOM () % index];	1980	return altern [rndm (index)];
2043	}	1981	}
2044		1982
2045	/*	1983	/*
2046	* find_first_free_spot(archetype, maptile, x, y) works like	1984	* find_first_free_spot(archetype, maptile, x, y) works like
2047	* find_free_spot(), but it will search max number of squares.	1985	* find_free_spot(), but it will search max number of squares.
2048	* But it will return the first available spot, not a random choice.	1986	* But it will return the first available spot, not a random choice.
2049	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1987	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2050	*/	1988	*/
2051
2052	int	1989	int
2053	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1990	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2054	{	1991	{
2055	int
2056	i;
2057
2058	for (i = 0; i < SIZEOFFREE; i++)	1992	for (int i = 0; i < SIZEOFFREE; i++)
2059	{
2060	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	1993	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2061	return i;	1994	return i;
2062	}	1995
2063	return -1;	1996	return -1;
2064	}	1997	}
2065		1998
2066	/*	1999	/*
2067	* The function permute(arr, begin, end) randomly reorders the array	2000	* The function permute(arr, begin, end) randomly reorders the array
2068	* arr[begin..end-1].	2001	* arr[begin..end-1].
		2002	* now uses a fisher-yates shuffle, old permute was broken
2069	*/	2003	*/
2070	static void	2004	static void
2071	permute (int *arr, int begin, int end)	2005	permute (int *arr, int begin, int end)
2072	{	2006	{
2073	int	2007	arr += begin;
2074	i,
2075	j,
2076	tmp,
2077	len;
2078
2079	len = end - begin;	2008	end -= begin;
2080	for (i = begin; i < end; i++)
2081	{
2082	j = begin + RANDOM () % len;
2083		2009
2084	tmp = arr[i];	2010	while (--end)
2085	arr[i] = arr[j];	2011	swap (arr [end], arr [rndm (end + 1)]);
2086	arr[j] = tmp;
2087	}
2088	}	2012	}
2089		2013
2090	/* new function to make monster searching more efficient, and effective!	2014	/* new function to make monster searching more efficient, and effective!
2091	* This basically returns a randomized array (in the passed pointer) of	2015	* This basically returns a randomized array (in the passed pointer) of
2092	* the spaces to find monsters. In this way, it won't always look for	2016	* the spaces to find monsters. In this way, it won't always look for
…		…
2095	* the 3x3 area will be searched, just not in a predictable order.	2019	* the 3x3 area will be searched, just not in a predictable order.
2096	*/	2020	*/
2097	void	2021	void
2098	get_search_arr (int *search_arr)	2022	get_search_arr (int *search_arr)
2099	{	2023	{
2100	int	2024	int i;
2101	i;
2102		2025
2103	for (i = 0; i < SIZEOFFREE; i++)	2026	for (i = 0; i < SIZEOFFREE; i++)
2104	{
2105	search_arr[i] = i;	2027	search_arr[i] = i;
2106	}
2107		2028
2108	permute (search_arr, 1, SIZEOFFREE1 + 1);	2029	permute (search_arr, 1, SIZEOFFREE1 + 1);
2109	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2030	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2110	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2031	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2111	}	2032	}
…		…
2120	* Perhaps incorrectly, but I'm making the assumption that exclude	2041	* Perhaps incorrectly, but I'm making the assumption that exclude
2121	* is actually want is going to try and move there. We need this info	2042	* is actually want is going to try and move there. We need this info
2122	* because we have to know what movement the thing looking to move	2043	* because we have to know what movement the thing looking to move
2123	* there is capable of.	2044	* there is capable of.
2124	*/	2045	*/
2125
2126	int	2046	int
2127	find_dir (maptile *m, int x, int y, object *exclude)	2047	find_dir (maptile *m, int x, int y, object *exclude)
2128	{	2048	{
2129	int
2130	i,
2131	max = SIZEOFFREE, mflags;	2049	int i, max = SIZEOFFREE, mflags;
2132		2050
2133	sint16 nx, ny;	2051	sint16 nx, ny;
2134	object *	2052	object *tmp;
2135	tmp;
2136	maptile *	2053	maptile *mp;
2137	mp;
2138		2054
2139	MoveType blocked, move_type;	2055	MoveType blocked, move_type;
2140		2056
2141	if (exclude && exclude->head)	2057	if (exclude && exclude->head)
2142	{	2058	{
…		…
2159		2075
2160	if (mflags & P_OUT_OF_MAP)	2076	if (mflags & P_OUT_OF_MAP)
2161	max = maxfree[i];	2077	max = maxfree[i];
2162	else	2078	else
2163	{	2079	{
2164	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2080	mapspace &ms = mp->at (nx, ny);
		2081
		2082	blocked = ms.move_block;
2165		2083
2166	if ((move_type & blocked) == move_type)	2084	if ((move_type & blocked) == move_type)
2167	max = maxfree[i];	2085	max = maxfree[i];
2168	else if (mflags & P_IS_ALIVE)	2086	else if (mflags & P_IS_ALIVE)
2169	{	2087	{
2170	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2088	for (tmp = ms.bot; tmp; tmp = tmp->above)
2171	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2089	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2090	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2172	break;	2091	break;
2173		2092
2174	if (tmp)	2093	if (tmp)
2175	return freedir[i];	2094	return freedir[i];
2176	}	2095	}
…		…
2182		2101
2183	/*	2102	/*
2184	* distance(object 1, object 2) will return the square of the	2103	* distance(object 1, object 2) will return the square of the
2185	* distance between the two given objects.	2104	* distance between the two given objects.
2186	*/	2105	*/
2187
2188	int	2106	int
2189	distance (const object *ob1, const object *ob2)	2107	distance (const object *ob1, const object *ob2)
2190	{	2108	{
2191	int i;
2192
2193	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2109	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2194	return i;
2195	}	2110	}
2196		2111
2197	/*	2112	/*
2198	* find_dir_2(delta-x,delta-y) will return a direction in which	2113	* find_dir_2(delta-x,delta-y) will return a direction in which
2199	* an object which has subtracted the x and y coordinates of another	2114	* an object which has subtracted the x and y coordinates of another
2200	* object, needs to travel toward it.	2115	* object, needs to travel toward it.
2201	*/	2116	*/
2202
2203	int	2117	int
2204	find_dir_2 (int x, int y)	2118	find_dir_2 (int x, int y)
2205	{	2119	{
2206	int q;	2120	int q;
2207		2121
…		…
2236		2150
2237	return 3;	2151	return 3;
2238	}	2152	}
2239		2153
2240	/*	2154	/*
2241	* absdir(int): Returns a number between 1 and 8, which represent
2242	* the "absolute" direction of a number (it actually takes care of
2243	* "overflow" in previous calculations of a direction).
2244	*/
2245
2246	int
2247	absdir (int d)
2248	{
2249	while (d < 1)
2250	d += 8;
2251	while (d > 8)
2252	d -= 8;
2253	return d;
2254	}
2255
2256	/*
2257	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2155	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2258	* between two directions (which are expected to be absolute (see absdir())	2156	* between two directions (which are expected to be absolute (see absdir())
2259	*/	2157	*/
2260
2261	int	2158	int
2262	dirdiff (int dir1, int dir2)	2159	dirdiff (int dir1, int dir2)
2263	{	2160	{
2264	int	2161	int d;
2265	d;
2266		2162
2267	d = abs (dir1 - dir2);	2163	d = abs (dir1 - dir2);
2268	if (d > 4)	2164	if (d > 4)
2269	d = 8 - d;	2165	d = 8 - d;
		2166
2270	return d;	2167	return d;
2271	}	2168	}
2272		2169
2273	/* peterm:	2170	/* peterm:
2274	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2171	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2277	* This basically means that if direction is 15, then it could either go	2174	* This basically means that if direction is 15, then it could either go
2278	* direction 4, 14, or 16 to get back to where we are.	2175	* direction 4, 14, or 16 to get back to where we are.
2279	* Moved from spell_util.c to object.c with the other related direction	2176	* Moved from spell_util.c to object.c with the other related direction
2280	* functions.	2177	* functions.
2281	*/	2178	*/
2282
2283	int
2284	reduction_dir[SIZEOFFREE][3] = {	2179	int reduction_dir[SIZEOFFREE][3] = {
2285	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2286	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2287	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2288	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2289	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2439	/* Basically, we save the content of the string to a temp file, then call */	2334	/* Basically, we save the content of the string to a temp file, then call */
2440	/* load_object on it. I admit it is a highly inefficient way to make things, */	2335	/* load_object on it. I admit it is a highly inefficient way to make things, */
2441	/* but it was simple to make and allows reusing the load_object function. */	2336	/* but it was simple to make and allows reusing the load_object function. */
2442	/* Remember not to use load_object_str in a time-critical situation. */	2337	/* Remember not to use load_object_str in a time-critical situation. */
2443	/* Also remember that multiparts objects are not supported for now. */	2338	/* Also remember that multiparts objects are not supported for now. */
2444
2445	object *	2339	object *
2446	load_object_str (const char *obstr)	2340	load_object_str (const char *obstr)
2447	{	2341	{
2448	object *op;	2342	object *op;
2449	char filename[MAX_BUF];	2343	char filename[MAX_BUF];
…		…
2479	* returns NULL if no match.	2373	* returns NULL if no match.
2480	*/	2374	*/
2481	object *	2375	object *
2482	find_obj_by_type_subtype (const object *who, int type, int subtype)	2376	find_obj_by_type_subtype (const object *who, int type, int subtype)
2483	{	2377	{
2484	object *tmp;
2485
2486	for (tmp = who->inv; tmp; tmp = tmp->below)	2378	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2487	if (tmp->type == type && tmp->subtype == subtype)	2379	if (tmp->type == type && tmp->subtype == subtype)
2488	return tmp;	2380	return tmp;
2489		2381
2490	return NULL;	2382	return 0;
2491	}	2383	}
2492		2384
2493	/* If ob has a field named key, return the link from the list,	2385	/* If ob has a field named key, return the link from the list,
2494	* otherwise return NULL.	2386	* otherwise return NULL.
2495	*	2387	*
…		…
2497	* do the desired thing.	2389	* do the desired thing.
2498	*/	2390	*/
2499	key_value *	2391	key_value *
2500	get_ob_key_link (const object *ob, const char *key)	2392	get_ob_key_link (const object *ob, const char *key)
2501	{	2393	{
2502	key_value *link;
2503
2504	for (link = ob->key_values; link != NULL; link = link->next)	2394	for (key_value *link = ob->key_values; link; link = link->next)
2505	if (link->key == key)	2395	if (link->key == key)
2506	return link;	2396	return link;
2507		2397
2508	return NULL;	2398	return 0;
2509	}	2399	}
2510		2400
2511	/*	2401	/*
2512	* Returns the value of op has an extra_field for key, or NULL.	2402	* Returns the value of op has an extra_field for key, or NULL.
2513	*	2403	*
…		…
2553	* Returns TRUE on success.	2443	* Returns TRUE on success.
2554	*/	2444	*/
2555	int	2445	int
2556	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2446	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2557	{	2447	{
2558	key_value *
2559	field = NULL, *last = NULL;	2448	key_value *field = NULL, *last = NULL;
2560		2449
2561	for (field = op->key_values; field != NULL; field = field->next)	2450	for (field = op->key_values; field != NULL; field = field->next)
2562	{	2451	{
2563	if (field->key != canonical_key)	2452	if (field->key != canonical_key)
2564	{	2453	{
…		…
2592	/* IF we get here, key doesn't exist */	2481	/* IF we get here, key doesn't exist */
2593		2482
2594	/* No field, we'll have to add it. */	2483	/* No field, we'll have to add it. */
2595		2484
2596	if (!add_key)	2485	if (!add_key)
2597	{
2598	return FALSE;	2486	return FALSE;
2599	}	2487
2600	/* There isn't any good reason to store a null	2488	/* There isn't any good reason to store a null
2601	* value in the key/value list. If the archetype has	2489	* value in the key/value list. If the archetype has
2602	* this key, then we should also have it, so shouldn't	2490	* this key, then we should also have it, so shouldn't
2603	* be here. If user wants to store empty strings,	2491	* be here. If user wants to store empty strings,
2604	* should pass in ""	2492	* should pass in ""
…		…
2653	}	2541	}
2654	else	2542	else
2655	item = item->env;	2543	item = item->env;
2656	}	2544	}
2657		2545
		2546
		2547	const char *
		2548	object::flag_desc (char *desc, int len) const
		2549	{
		2550	char *p = desc;
		2551	bool first = true;
		2552
		2553	*p = 0;
		2554
		2555	for (int i = 0; i < NUM_FLAGS; i++)
		2556	{
		2557	if (len <= 10) // magic constant!
		2558	{
		2559	snprintf (p, len, ",...");
		2560	break;
		2561	}
		2562
		2563	if (flag [i])
		2564	{
		2565	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2566	len -= cnt;
		2567	p += cnt;
		2568	first = false;
		2569	}
		2570	}
		2571
		2572	return desc;
		2573	}
		2574
2658	// return a suitable string describing an objetc in enough detail to find it	2575	// return a suitable string describing an object in enough detail to find it
2659	const char *	2576	const char *
2660	object::debug_desc (char *info) const	2577	object::debug_desc (char *info) const
2661	{	2578	{
		2579	char flagdesc[512];
2662	char info2[256 * 3];	2580	char info2[256 * 4];
2663	char *p = info;	2581	char *p = info;
2664		2582
2665	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2583	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2666	count,	2584	count, uuid.seq,
2667	&name,	2585	&name,
2668	title ? " " : "",	2586	title ? "\",title:\"" : "",
2669	title ? (const char *)title : "");	2587	title ? (const char *)title : "",
		2588	flag_desc (flagdesc, 512), type);
2670		2589
2671	if (env)	2590	if (env)
2672	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2591	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2673		2592
2674	if (map)	2593	if (map)
2675	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2594	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2676		2595
2677	return info;	2596	return info;
2678	}	2597	}
2679		2598
2680	const char *	2599	const char *
2681	object::debug_desc () const	2600	object::debug_desc () const
2682	{	2601	{
2683	static char info[256 * 3];	2602	static char info[256 * 4];
2684	return debug_desc (info);	2603	return debug_desc (info);
2685	}	2604	}
2686		2605
		2606	const char *
		2607	object::debug_desc2 () const
		2608	{
		2609	static char info[256 * 4];
		2610	return debug_desc (info);
		2611	}
		2612
		2613	struct region *
		2614	object::region () const
		2615	{
		2616	return map ? map->region (x, y)
		2617	: region::default_region ();
		2618	}
		2619

Diff Legend

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