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.65 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC

…		…
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
34		36
35	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
36	static UUID uuid;	38	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
38		40
…		…
139	* 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
140	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
141	*/	143	*/
142		144
143	/* For each field in wants, */	145	/* For each field in wants, */
144	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)
145	{	147	{
146	key_value *has_field;	148	key_value *has_field;
147		149
148	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	185	*
184	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
187	*	189	*
188	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
189	*	191	*
190	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
191	* check weight	193	* check weight
192	*/	194	*/
193		195
194	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	197	{
196	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
198	return 0;	204	return 0;
199		205
200	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	209	* used to store nrof).
206	*/	210	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		222
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		225
222		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	251	return 0;
254		252
255	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	254	* check all objects in the inventory.
257	*/	255	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	260	return 0;
263		261
264	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	264	return 0;
267		265
268	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	267	* if it is valid.
270	*/	268	*/
…		…
354	op = op->env;	352	op = op->env;
355	return op;	353	return op;
356	}	354	}
357		355
358	/*	356	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	358	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
377	*/	360	*/
378		361
…		…
381	{	364	{
382	if (!op)	365	if (!op)
383	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
384		367
385	object_freezer freezer;	368	object_freezer freezer;
386	save_object (freezer, op, 3);	369	save_object (freezer, op, 1);
387	return freezer.as_string ();	370	return freezer.as_string ();
388	}	371	}
389		372
390	/*	373	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
484	}	467	}
485		468
486	op->key_values = 0;	469	op->key_values = 0;
487	}	470	}
488		471
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	/*	472	/*
532	* copy_to first frees everything allocated by the dst object,	473	* copy_to first frees everything allocated by the dst object,
533	* and then copies the contents of itself into the second	474	* and then copies the contents of itself into the second
534	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
541	{	482	{
542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
544		485
545	*(object_copy *)dst = *this;	486	*(object_copy *)dst = *this;
546	*(object_pod *)dst = *this;
547
548	if (self || cb)
549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
550		487
551	if (is_freed)	488	if (is_freed)
552	SET_FLAG (dst, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
553		490
554	if (is_removed)	491	if (is_removed)
…		…
585	tail = new_link;	522	tail = new_link;
586	}	523	}
587	}	524	}
588	}	525	}
589		526
590	update_ob_speed (dst);	527	dst->set_speed (dst->speed);
591	}	528	}
592		529
593	object *	530	object *
594	object::clone ()	531	object::clone ()
595	{	532	{
…		…
617	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
618	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
619	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
620	*/	557	*/
621	void	558	void
622	update_ob_speed (object *op)	559	object::set_speed (float speed)
623	{	560	{
624	extern int arch_init;	561	extern int arch_init;
625		562
626	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
627	* since they never really need to be updated.	564	* since they never really need to be updated.
628	*/	565	*/
629		566	if (flag [FLAG_FREED] && speed)
630	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
631	{	567	{
632	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
633	#ifdef MANY_CORES
634	abort ();
635	#else
636	op->speed = 0;	569	speed = 0;
637	#endif
638	}	570	}
		571
		572	this->speed = speed;
639		573
640	if (arch_init)	574	if (arch_init)
641	return;	575	return;
642		576
643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
644	{	578	{
645	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
646	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
647	return;	581	return;
648		582
649	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
650	* of the list. */	584	* of the list. */
651	op->active_next = active_objects;	585	active_next = active_objects;
652		586
653	if (op->active_next != NULL)	587	if (active_next)
654	op->active_next->active_prev = op;	588	active_next->active_prev = this;
655		589
656	active_objects = op;	590	active_objects = this;
657	}	591	}
658	else	592	else
659	{	593	{
660	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
661	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
662	return;	596	return;
663		597
664	if (op->active_prev == NULL)	598	if (!active_prev)
665	{	599	{
666	active_objects = op->active_next;	600	active_objects = active_next;
667		601
668	if (op->active_next != NULL)	602	if (active_next)
669	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
670	}	604	}
671	else	605	else
672	{	606	{
673	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
674		608
675	if (op->active_next)	609	if (active_next)
676	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
677	}	611	}
678		612
679	op->active_next = NULL;	613	active_next = 0;
680	op->active_prev = NULL;	614	active_prev = 0;
681	}	615	}
682	}	616	}
683		617
684	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
685	* objects.	619	* objects.
…		…
711	op->active_next = NULL;	645	op->active_next = NULL;
712	op->active_prev = NULL;	646	op->active_prev = NULL;
713	}	647	}
714		648
715	/*	649	/*
716	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
717	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
718	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
719	* invisible object, etc...)	653	* invisible object, etc...)
720	* If the object being updated is beneath a player, the look-window	654	* If the object being updated is beneath a player, the look-window
721	* of that player is updated (this might be a suboptimal way of	655	* of that player is updated (this might be a suboptimal way of
722	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
723	*	657	*
724	* action is a hint of what the caller believes need to be done.	658	* action is a hint of what the caller believes need to be done.
725	* For example, if the only thing that has changed is the face (due to
726	* an animation), we don't need to call update_position until that actually
727	* comes into view of a player. OTOH, many other things, like addition/removal
728	* of walls or living creatures may need us to update the flags now.
729	* current action are:	659	* current action are:
730	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
731	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
732	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
733	* as that is easier than trying to look at what may have changed.	663	* as that is easier than trying to look at what may have changed.
734	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
735	*/	665	*/
736
737	void	666	void
738	update_object (object *op, int action)	667	update_object (object *op, int action)
739	{	668	{
740	int update_now = 0, flags;
741	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
742		670
743	if (op == NULL)	671	if (op == NULL)
744	{	672	{
745	/* this should never happen */	673	/* this should never happen */
746	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
747	return;	675	return;
748	}	676	}
749		677
750	if (op->env != NULL)	678	if (op->env)
751	{	679	{
752	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
753	* to do in this case.	681	* to do in this case.
754	*/	682	*/
755	return;	683	return;
…		…
760	*/	688	*/
761	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
762	return;	690	return;
763		691
764	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
765	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
766	{	694	{
767	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
768	#ifdef MANY_CORES	696	#ifdef MANY_CORES
769	abort ();	697	abort ();
770	#endif	698	#endif
771	return;	699	return;
772	}	700	}
773		701
774	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	mapspace &m = op->ms ();
775	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
776	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
777	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
778	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
779	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
780		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
781	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
782	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
783	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	update_now = 1;
785
786	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
787	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
788		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
789	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
793	update_now = 1;
794
795	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
796	update_now = 1;
797
798	if ((move_on | op->move_on) != move_on)	715	|| (m.move_on | op->move_on ) != m.move_on
799	update_now = 1;
800
801	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
802	update_now = 1;	717	|| (m.move_slow | op->move_slow) != m.move_slow
803
804	/* This isn't perfect, but I don't expect a lot of objects to	718	/* This isn't perfect, but I don't expect a lot of objects to
805	* to have move_allow right now.	719	* to have move_allow right now.
806	*/	720	*/
807	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
808	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
809		723	m.flags_ = P_NEED_UPDATE;
810	if ((move_slow | op->move_slow) != move_slow)
811	update_now = 1;
812	}	724	}
813
814	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
815	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
816	* that is being removed.	727	* that is being removed.
817	*/	728	*/
818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
819	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
820	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
821	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
822	else	733	else
823	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
824		735
825	if (update_now)
826	{
827	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
828	update_position (op->map, op->x, op->y);
829	}
830
831	if (op->more != NULL)	736	if (op->more)
832	update_object (op->more, action);	737	update_object (op->more, action);
833	}	738	}
834		739
835	object::vector object::mortals;
836	object::vector object::objects; // not yet used	740	object::vector object::objects; // not yet used
837	object *object::first;	741	object *object::first;
838
839	void object::free_mortals ()
840	{
841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
842	if ((*i)->refcnt)
843	++i; // further delay freeing
844	else
845	{
846	delete *i;
847	mortals.erase (i);
848	}
849	}
850		742
851	object::object ()	743	object::object ()
852	{	744	{
853	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
854		746
…		…
886		778
887	prev = 0;	779	prev = 0;
888	next = 0;	780	next = 0;
889	}	781	}
890		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	// need to check first, because the checks below might segfault
		791	// as we might be on an invalid mapspace and crossfire code
		792	// is too buggy to ensure that the inventory is empty.
		793	// corollary: if you create arrows etc. with stuff in tis inventory,
		794	// cf will crash below with off-map x and y
		795	if (!inv)
		796	return;
		797
		798	/* Only if the space blocks everything do we not process -
		799	* if some form of movement is allowed, let objects
		800	* drop on that space.
		801	*/
		802	if (!drop_to_ground
		803	|| !map
		804	|| map->in_memory != MAP_IN_MEMORY
		805	|| ms ().move_block == MOVE_ALL)
		806	{
		807	while (inv)
		808	{
		809	inv->destroy_inv (drop_to_ground);
		810	inv->destroy ();
		811	}
		812	}
		813	else
		814	{ /* Put objects in inventory onto this space */
		815	while (inv)
		816	{
		817	object *op = inv;
		818
		819	if (op->flag [FLAG_STARTEQUIP]
		820	|| op->flag [FLAG_NO_DROP]
		821	|| op->type == RUNE
		822	|| op->type == TRAP
		823	|| op->flag [FLAG_IS_A_TEMPLATE])
		824	op->destroy ();
		825	else
		826	map->insert (op, x, y);
		827	}
		828	}
		829	}
		830
891	object *object::create ()	831	object *object::create ()
892	{	832	{
893	object *op = new object;	833	object *op = new object;
894	op->link ();	834	op->link ();
895	return op;	835	return op;
896	}	836	}
897		837
898	/*	838	void
899	* free_object() frees everything allocated by an object, removes	839	object::do_destroy ()
900	* it from the list of used objects, and puts it on the list of
901	* free objects. The IS_FREED() flag is set in the object.
902	* The object must have been removed by remove_ob() first for
903	* this function to succeed.
904	*
905	* If destroy_inventory is set, free inventory as well. Else drop items in
906	* inventory to the ground.
907	*/
908	void object::destroy (bool destroy_inventory)
909	{	840	{
910	if (QUERY_FLAG (this, FLAG_FREED))	841	if (flag [FLAG_IS_LINKED])
		842	remove_button_link (this);
		843
		844	if (flag [FLAG_FRIENDLY])
		845	remove_friendly_object (this);
		846
		847	if (!flag [FLAG_REMOVED])
		848	remove ();
		849
		850	if (flag [FLAG_FREED])
911	return;	851	return;
912		852
913	if (QUERY_FLAG (this, FLAG_FRIENDLY))	853	set_speed (0);
914	remove_friendly_object (this);
915		854
916	if (!QUERY_FLAG (this, FLAG_REMOVED))	855	flag [FLAG_FREED] = 1;
917	remove ();
918		856
919	SET_FLAG (this, FLAG_FREED);	857	attachable::do_destroy ();
920		858
921	if (more)	859	destroy_inv (true);
922	{	860	unlink ();
923	more->destroy (destroy_inventory);
924	more = 0;
925	}
926
927	if (inv)
928	{
929	/* Only if the space blocks everything do we not process -
930	* if some form of movement is allowed, let objects
931	* drop on that space.
932	*/
933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
934	{
935	object *op = inv;
936
937	while (op)
938	{
939	object *tmp = op->below;
940	op->destroy (destroy_inventory);
941	op = tmp;
942	}
943	}
944	else
945	{ /* Put objects in inventory onto this space */
946	object *op = inv;
947
948	while (op)
949	{
950	object *tmp = op->below;
951
952	op->remove ();
953
954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
956	op->destroy ();
957	else
958	{
959	op->x = x;
960	op->y = y;
961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
962	}
963
964	op = tmp;
965	}
966	}
967	}
968		861
969	// hack to ensure that freed objects still have a valid map	862	// hack to ensure that freed objects still have a valid map
970	{	863	{
971	static maptile *freed_map; // freed objects are moved here to avoid crashes	864	static maptile *freed_map; // freed objects are moved here to avoid crashes
972		865
…		…
984	map = freed_map;	877	map = freed_map;
985	x = 1;	878	x = 1;
986	y = 1;	879	y = 1;
987	}	880	}
988		881
		882	head = 0;
		883
		884	if (more)
		885	{
		886	more->destroy ();
		887	more = 0;
		888	}
		889
989	// clear those pointers that likely might have circular references to us	890	// clear those pointers that likely might have circular references to us
990	owner = 0;	891	owner = 0;
991	enemy = 0;	892	enemy = 0;
992	attacked_by = 0;	893	attacked_by = 0;
993		894
994	// only relevant for players(?), but make sure of it anyways	895	// only relevant for players(?), but make sure of it anyways
995	contr = 0;	896	contr = 0;
		897	}
996		898
997	/* Remove object from the active list */	899	void
998	speed = 0;	900	object::destroy (bool destroy_inventory)
999	update_ob_speed (this);	901	{
		902	if (destroyed ())
		903	return;
1000		904
1001	unlink ();	905	if (destroy_inventory)
		906	destroy_inv (false);
1002		907
1003	mortals.push_back (this);	908	attachable::destroy ();
1004	}	909	}
1005		910
1006	/*	911	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
…		…
1032	object::remove ()	937	object::remove ()
1033	{	938	{
1034	object *tmp, *last = 0;	939	object *tmp, *last = 0;
1035	object *otmp;	940	object *otmp;
1036		941
1037	int check_walk_off;
1038
1039	if (QUERY_FLAG (this, FLAG_REMOVED))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
1040	return;	943	return;
1041		944
1042	SET_FLAG (this, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
1043		947
1044	if (more)	948	if (more)
1045	more->remove ();	949	more->remove ();
1046		950
1047	/*	951	/*
…		…
1057		961
1058	/* NO_FIX_PLAYER is set when a great many changes are being	962	/* NO_FIX_PLAYER is set when a great many changes are being
1059	* made to players inventory. If set, avoiding the call	963	* made to players inventory. If set, avoiding the call
1060	* to save cpu time.	964	* to save cpu time.
1061	*/	965	*/
1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	fix_player (otmp);	967	otmp->update_stats ();
1064		968
1065	if (above != NULL)	969	if (above != NULL)
1066	above->below = below;	970	above->below = below;
1067	else	971	else
1068	env->inv = below;	972	env->inv = below;
…		…
1087		991
1088	/* link the object above us */	992	/* link the object above us */
1089	if (above)	993	if (above)
1090	above->below = below;	994	above->below = below;
1091	else	995	else
1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	996	map->at (x, y).top = below; /* we were top, set new top */
1093		997
1094	/* Relink the object below us, if there is one */	998	/* Relink the object below us, if there is one */
1095	if (below)	999	if (below)
1096	below->above = above;	1000	below->above = above;
1097	else	1001	else
…		…
1109	dump = dump_object (GET_MAP_OB (map, x, y));	1013	dump = dump_object (GET_MAP_OB (map, x, y));
1110	LOG (llevError, "%s\n", dump);	1014	LOG (llevError, "%s\n", dump);
1111	free (dump);	1015	free (dump);
1112	}	1016	}
1113		1017
1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1018	map->at (x, y).bot = above; /* goes on above it. */
1115	}	1019	}
1116		1020
1117	above = 0;	1021	above = 0;
1118	below = 0;	1022	below = 0;
1119		1023
1120	if (map->in_memory == MAP_SAVING)	1024	if (map->in_memory == MAP_SAVING)
1121	return;	1025	return;
1122		1026
1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1027	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1028
1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1126	{	1030	{
1127	/* No point updating the players look faces if he is the object	1031	/* No point updating the players look faces if he is the object
1128	* being removed.	1032	* being removed.
1129	*/	1033	*/
1130		1034
…		…
1134	* removed (most likely destroyed), update the player view	1038	* removed (most likely destroyed), update the player view
1135	* appropriately.	1039	* appropriately.
1136	*/	1040	*/
1137	if (tmp->container == this)	1041	if (tmp->container == this)
1138	{	1042	{
1139	CLEAR_FLAG (this, FLAG_APPLIED);	1043	flag [FLAG_APPLIED] = 0;
1140	tmp->container = 0;	1044	tmp->container = 0;
1141	}	1045	}
1142		1046
1143	tmp->contr->socket.update_look = 1;	1047	if (tmp->contr->ns)
		1048	tmp->contr->ns->floorbox_update ();
1144	}	1049	}
1145		1050
1146	/* See if player moving off should effect something */	1051	/* See if player moving off should effect something */
1147	if (check_walk_off	1052	if (check_walk_off
1148	&& ((move_type & tmp->move_off)	1053	&& ((move_type & tmp->move_off)
…		…
1162	last = tmp;	1067	last = tmp;
1163	}	1068	}
1164		1069
1165	/* last == NULL of there are no objects on this space */	1070	/* last == NULL of there are no objects on this space */
1166	if (!last)	1071	if (!last)
1167	{	1072	map->at (x, y).flags_ = P_NEED_UPDATE;
1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1170	* those out anyways, and if there are any flags set right now, they won't
1171	* be correct anyways.
1172	*/
1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1174	update_position (map, x, y);
1175	}
1176	else	1073	else
1177	update_object (last, UP_OBJ_REMOVE);	1074	update_object (last, UP_OBJ_REMOVE);
1178		1075
1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1180	update_all_los (map, x, y);	1077	update_all_los (map, x, y);
1181	}	1078	}
1182	}	1079	}
1183		1080
1184	/*	1081	/*
…		…
1193	merge_ob (object *op, object *top)	1090	merge_ob (object *op, object *top)
1194	{	1091	{
1195	if (!op->nrof)	1092	if (!op->nrof)
1196	return 0;	1093	return 0;
1197		1094
1198	if (top == NULL)	1095	if (top)
1199	for (top = op; top != NULL && top->above != NULL; top = top->above);	1096	for (top = op; top && top->above; top = top->above)
		1097	;
1200		1098
1201	for (; top != NULL; top = top->below)	1099	for (; top; top = top->below)
1202	{	1100	{
1203	if (top == op)	1101	if (top == op)
1204	continue;	1102	continue;
1205	if (CAN_MERGE (op, top))	1103
		1104	if (object::can_merge (op, top))
1206	{	1105	{
1207	top->nrof += op->nrof;	1106	top->nrof += op->nrof;
1208		1107
1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1108	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1210	op->weight = 0; /* Don't want any adjustements now */	1109	op->weight = 0; /* Don't want any adjustements now */
…		…
1221	* job preparing multi-part monsters	1120	* job preparing multi-part monsters
1222	*/	1121	*/
1223	object *	1122	object *
1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225	{	1124	{
1226	object *tmp;
1227
1228	if (op->head)
1229	op = op->head;
1230
1231	for (tmp = op; tmp; tmp = tmp->more)	1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232	{	1126	{
1233	tmp->x = x + tmp->arch->clone.x;	1127	tmp->x = x + tmp->arch->clone.x;
1234	tmp->y = y + tmp->arch->clone.y;	1128	tmp->y = y + tmp->arch->clone.y;
1235	}	1129	}
1236		1130
…		…
1255	* Return value:	1149	* Return value:
1256	* new object if 'op' was merged with other object	1150	* new object if 'op' was merged with other object
1257	* NULL if 'op' was destroyed	1151	* NULL if 'op' was destroyed
1258	* just 'op' otherwise	1152	* just 'op' otherwise
1259	*/	1153	*/
1260
1261	object *	1154	object *
1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263	{	1156	{
1264	object *tmp, *top, *floor = NULL;	1157	object *tmp, *top, *floor = NULL;
1265	sint16 x, y;	1158	sint16 x, y;
…		…
1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300	free (dump);	1193	free (dump);
1301	return op;	1194	return op;
1302	}	1195	}
1303		1196
1304	if (op->more != NULL)	1197	if (op->more)
1305	{	1198	{
1306	/* The part may be on a different map. */	1199	/* The part may be on a different map. */
1307		1200
1308	object *more = op->more;	1201	object *more = op->more;
1309		1202
…		…
1325	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1326	{	1219	{
1327	if (!op->head)	1220	if (!op->head)
1328	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329		1222
1330	return NULL;	1223	return 0;
1331	}	1224	}
1332	}	1225	}
1333		1226
1334	CLEAR_FLAG (op, FLAG_REMOVED);	1227	CLEAR_FLAG (op, FLAG_REMOVED);
1335		1228
…		…
1343		1236
1344	/* this has to be done after we translate the coordinates.	1237	/* this has to be done after we translate the coordinates.
1345	*/	1238	*/
1346	if (op->nrof && !(flag & INS_NO_MERGE))	1239	if (op->nrof && !(flag & INS_NO_MERGE))
1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1348	if (CAN_MERGE (op, tmp))	1241	if (object::can_merge (op, tmp))
1349	{	1242	{
1350	op->nrof += tmp->nrof;	1243	op->nrof += tmp->nrof;
1351	tmp->destroy ();	1244	tmp->destroy ();
1352	}	1245	}
1353		1246
…		…
1369	op->below = originator->below;	1262	op->below = originator->below;
1370		1263
1371	if (op->below)	1264	if (op->below)
1372	op->below->above = op;	1265	op->below->above = op;
1373	else	1266	else
1374	SET_MAP_OB (op->map, op->x, op->y, op);	1267	op->ms ().bot = op;
1375		1268
1376	/* since *below* originator, no need to update top */	1269	/* since *below* originator, no need to update top */
1377	originator->below = op;	1270	originator->below = op;
1378	}	1271	}
1379	else	1272	else
…		…
1425	* If INS_ON_TOP is used, don't do this processing	1318	* If INS_ON_TOP is used, don't do this processing
1426	* Need to find the object that in fact blocks view, otherwise	1319	* Need to find the object that in fact blocks view, otherwise
1427	* stacking is a bit odd.	1320	* stacking is a bit odd.
1428	*/	1321	*/
1429	if (!(flag & INS_ON_TOP) &&	1322	if (!(flag & INS_ON_TOP) &&
1430	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1431	{	1324	{
1432	for (last = top; last != floor; last = last->below)	1325	for (last = top; last != floor; last = last->below)
1433	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434	break;	1327	break;
1435	/* Check to see if we found the object that blocks view,	1328	/* Check to see if we found the object that blocks view,
…		…
1458		1351
1459	if (op->above)	1352	if (op->above)
1460	op->above->below = op;	1353	op->above->below = op;
1461		1354
1462	op->below = NULL;	1355	op->below = NULL;
1463	SET_MAP_OB (op->map, op->x, op->y, op);	1356	op->ms ().bot = op;
1464	}	1357	}
1465	else	1358	else
1466	{ /* get inserted into the stack above top */	1359	{ /* get inserted into the stack above top */
1467	op->above = top->above;	1360	op->above = top->above;
1468		1361
…		…
1472	op->below = top;	1365	op->below = top;
1473	top->above = op;	1366	top->above = op;
1474	}	1367	}
1475		1368
1476	if (op->above == NULL)	1369	if (op->above == NULL)
1477	SET_MAP_TOP (op->map, op->x, op->y, op);	1370	op->ms ().top = op;
1478	} /* else not INS_BELOW_ORIGINATOR */	1371	} /* else not INS_BELOW_ORIGINATOR */
1479		1372
1480	if (op->type == PLAYER)	1373	if (op->type == PLAYER)
1481	op->contr->do_los = 1;	1374	op->contr->do_los = 1;
1482		1375
1483	/* If we have a floor, we know the player, if any, will be above	1376	/* If we have a floor, we know the player, if any, will be above
1484	* it, so save a few ticks and start from there.	1377	* it, so save a few ticks and start from there.
1485	*/	1378	*/
1486	if (!(flag & INS_MAP_LOAD))	1379	if (!(flag & INS_MAP_LOAD))
1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1380	if (object *pl = op->ms ().player ())
1488	if (tmp->type == PLAYER)	1381	if (pl->contr->ns)
1489	tmp->contr->socket.update_look = 1;	1382	pl->contr->ns->floorbox_update ();
1490		1383
1491	/* If this object glows, it may affect lighting conditions that are	1384	/* If this object glows, it may affect lighting conditions that are
1492	* visible to others on this map. But update_all_los is really	1385	* visible to others on this map. But update_all_los is really
1493	* an inefficient way to do this, as it means los for all players	1386	* an inefficient way to do this, as it means los for all players
1494	* on the map will get recalculated. The players could very well	1387	* on the map will get recalculated. The players could very well
1495	* be far away from this change and not affected in any way -	1388	* be far away from this change and not affected in any way -
1496	* this should get redone to only look for players within range,	1389	* this should get redone to only look for players within range,
1497	* or just updating the P_NEED_UPDATE for spaces within this area	1390	* or just updating the P_NEED_UPDATE for spaces within this area
1498	* of effect may be sufficient.	1391	* of effect may be sufficient.
1499	*/	1392	*/
1500	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1393	if (op->map->darkness && (op->glow_radius != 0))
1501	update_all_los (op->map, op->x, op->y);	1394	update_all_los (op->map, op->x, op->y);
1502		1395
1503	/* updates flags (blocked, alive, no magic, etc) for this map space */	1396	/* updates flags (blocked, alive, no magic, etc) for this map space */
1504	update_object (op, UP_OBJ_INSERT);	1397	update_object (op, UP_OBJ_INSERT);
1505		1398
		1399	INVOKE_OBJECT (INSERT, op);
		1400
1506	/* Don't know if moving this to the end will break anything. However,	1401	/* Don't know if moving this to the end will break anything. However,
1507	* we want to have update_look set above before calling this.	1402	* we want to have floorbox_update called before calling this.
1508	*	1403	*
1509	* check_move_on() must be after this because code called from	1404	* check_move_on() must be after this because code called from
1510	* check_move_on() depends on correct map flags (so functions like	1405	* check_move_on() depends on correct map flags (so functions like
1511	* blocked() and wall() work properly), and these flags are updated by	1406	* blocked() and wall() work properly), and these flags are updated by
1512	* update_object().	1407	* update_object().
…		…
1514		1409
1515	/* if this is not the head or flag has been passed, don't check walk on status */	1410	/* if this is not the head or flag has been passed, don't check walk on status */
1516	if (!(flag & INS_NO_WALK_ON) && !op->head)	1411	if (!(flag & INS_NO_WALK_ON) && !op->head)
1517	{	1412	{
1518	if (check_move_on (op, originator))	1413	if (check_move_on (op, originator))
1519	return NULL;	1414	return 0;
1520		1415
1521	/* If we are a multi part object, lets work our way through the check	1416	/* If we are a multi part object, lets work our way through the check
1522	* walk on's.	1417	* walk on's.
1523	*/	1418	*/
1524	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1419	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1525	if (check_move_on (tmp, originator))	1420	if (check_move_on (tmp, originator))
1526	return NULL;	1421	return 0;
1527	}	1422	}
1528		1423
1529	return op;	1424	return op;
1530	}	1425	}
1531		1426
1532	/* this function inserts an object in the map, but if it	1427	/* this function inserts an object in the map, but if it
1533	* finds an object of its own type, it'll remove that one first.	1428	* finds an object of its own type, it'll remove that one first.
1534	* op is the object to insert it under: supplies x and the map.	1429	* op is the object to insert it under: supplies x and the map.
1535	*/	1430	*/
1536	void	1431	void
1537	replace_insert_ob_in_map (const char *arch_string, object *op)	1432	replace_insert_ob_in_map (const char *arch_string, object *op)
1538	{	1433	{
1539	object *	1434	object *tmp, *tmp1;
1540	tmp;
1541	object *
1542	tmp1;
1543		1435
1544	/* first search for itself and remove any old instances */	1436	/* first search for itself and remove any old instances */
1545		1437
1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
…		…
1550	tmp1 = arch_to_object (archetype::find (arch_string));	1442	tmp1 = arch_to_object (archetype::find (arch_string));
1551		1443
1552	tmp1->x = op->x;	1444	tmp1->x = op->x;
1553	tmp1->y = op->y;	1445	tmp1->y = op->y;
1554	insert_ob_in_map (tmp1, op->map, op, 0);	1446	insert_ob_in_map (tmp1, op->map, op, 0);
		1447	}
		1448
		1449	object *
		1450	object::insert_at (object *where, object *originator, int flags)
		1451	{
		1452	where->map->insert (this, where->x, where->y, originator, flags);
1555	}	1453	}
1556		1454
1557	/*	1455	/*
1558	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1456	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1559	* is returned contains nr objects, and the remaining parts contains	1457	* is returned contains nr objects, and the remaining parts contains
1560	* the rest (or is removed and freed if that number is 0).	1458	* the rest (or is removed and freed if that number is 0).
1561	* On failure, NULL is returned, and the reason put into the	1459	* On failure, NULL is returned, and the reason put into the
1562	* global static errmsg array.	1460	* global static errmsg array.
1563	*/	1461	*/
1564
1565	object *	1462	object *
1566	get_split_ob (object *orig_ob, uint32 nr)	1463	get_split_ob (object *orig_ob, uint32 nr)
1567	{	1464	{
1568	object *newob;	1465	object *newob;
1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1466	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1605		1502
1606	object *	1503	object *
1607	decrease_ob_nr (object *op, uint32 i)	1504	decrease_ob_nr (object *op, uint32 i)
1608	{	1505	{
1609	object *tmp;	1506	object *tmp;
1610	player *pl;
1611		1507
1612	if (i == 0) /* objects with op->nrof require this check */	1508	if (i == 0) /* objects with op->nrof require this check */
1613	return op;	1509	return op;
1614		1510
1615	if (i > op->nrof)	1511	if (i > op->nrof)
1616	i = op->nrof;	1512	i = op->nrof;
1617		1513
1618	if (QUERY_FLAG (op, FLAG_REMOVED))	1514	if (QUERY_FLAG (op, FLAG_REMOVED))
1619	op->nrof -= i;	1515	op->nrof -= i;
1620	else if (op->env != NULL)	1516	else if (op->env)
1621	{	1517	{
1622	/* is this object in the players inventory, or sub container	1518	/* is this object in the players inventory, or sub container
1623	* therein?	1519	* therein?
1624	*/	1520	*/
1625	tmp = is_player_inv (op->env);	1521	tmp = op->in_player ();
1626	/* nope. Is this a container the player has opened?	1522	/* nope. Is this a container the player has opened?
1627	* If so, set tmp to that player.	1523	* If so, set tmp to that player.
1628	* IMO, searching through all the players will mostly	1524	* IMO, searching through all the players will mostly
1629	* likely be quicker than following op->env to the map,	1525	* likely be quicker than following op->env to the map,
1630	* and then searching the map for a player.	1526	* and then searching the map for a player.
1631	*/	1527	*/
1632	if (!tmp)	1528	if (!tmp)
1633	{	1529	for_all_players (pl)
1634	for (pl = first_player; pl; pl = pl->next)
1635	if (pl->ob->container == op->env)	1530	if (pl->ob->container == op->env)
		1531	{
		1532	tmp = pl->ob;
1636	break;	1533	break;
1637	if (pl)
1638	tmp = pl->ob;
1639	else
1640	tmp = NULL;
1641	}	1534	}
1642		1535
1643	if (i < op->nrof)	1536	if (i < op->nrof)
1644	{	1537	{
1645	sub_weight (op->env, op->weight * i);	1538	sub_weight (op->env, op->weight * i);
1646	op->nrof -= i;	1539	op->nrof -= i;
1647	if (tmp)	1540	if (tmp)
1648	{
1649	esrv_send_item (tmp, op);	1541	esrv_send_item (tmp, op);
1650	}
1651	}	1542	}
1652	else	1543	else
1653	{	1544	{
1654	op->remove ();	1545	op->remove ();
1655	op->nrof = 0;	1546	op->nrof = 0;
1656	if (tmp)	1547	if (tmp)
1657	{
1658	esrv_del_item (tmp->contr, op->count);	1548	esrv_del_item (tmp->contr, op->count);
1659	}
1660	}	1549	}
1661	}	1550	}
1662	else	1551	else
1663	{	1552	{
1664	object *above = op->above;	1553	object *above = op->above;
…		…
1670	op->remove ();	1559	op->remove ();
1671	op->nrof = 0;	1560	op->nrof = 0;
1672	}	1561	}
1673		1562
1674	/* Since we just removed op, op->above is null */	1563	/* Since we just removed op, op->above is null */
1675	for (tmp = above; tmp != NULL; tmp = tmp->above)	1564	for (tmp = above; tmp; tmp = tmp->above)
1676	if (tmp->type == PLAYER)	1565	if (tmp->type == PLAYER)
1677	{	1566	{
1678	if (op->nrof)	1567	if (op->nrof)
1679	esrv_send_item (tmp, op);	1568	esrv_send_item (tmp, op);
1680	else	1569	else
…		…
1685	if (op->nrof)	1574	if (op->nrof)
1686	return op;	1575	return op;
1687	else	1576	else
1688	{	1577	{
1689	op->destroy ();	1578	op->destroy ();
1690	return NULL;	1579	return 0;
1691	}	1580	}
1692	}	1581	}
1693		1582
1694	/*	1583	/*
1695	* add_weight(object, weight) adds the specified weight to an object,	1584	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1644	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1756	CLEAR_FLAG (op, FLAG_REMOVED);	1645	CLEAR_FLAG (op, FLAG_REMOVED);
1757	if (op->nrof)	1646	if (op->nrof)
1758	{	1647	{
1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1648	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1760	if (CAN_MERGE (tmp, op))	1649	if (object::can_merge (tmp, op))
1761	{	1650	{
1762	/* return the original object and remove inserted object	1651	/* return the original object and remove inserted object
1763	(client needs the original object) */	1652	(client needs the original object) */
1764	tmp->nrof += op->nrof;	1653	tmp->nrof += op->nrof;
1765	/* Weight handling gets pretty funky. Since we are adding to	1654	/* Weight handling gets pretty funky. Since we are adding to
…		…
1783	add_weight (this, op->weight * op->nrof);	1672	add_weight (this, op->weight * op->nrof);
1784	}	1673	}
1785	else	1674	else
1786	add_weight (this, (op->weight + op->carrying));	1675	add_weight (this, (op->weight + op->carrying));
1787		1676
1788	otmp = is_player_inv (this);	1677	otmp = this->in_player ();
1789	if (otmp && otmp->contr)	1678	if (otmp && otmp->contr)
1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791	fix_player (otmp);	1680	otmp->update_stats ();
1792		1681
1793	op->map = NULL;	1682	op->map = 0;
1794	op->env = this;	1683	op->env = this;
1795	op->above = NULL;	1684	op->above = 0;
1796	op->below = NULL;	1685	op->below = 0;
1797	op->x = 0, op->y = 0;	1686	op->x = 0, op->y = 0;
1798		1687
1799	/* reset the light list and los of the players on the map */	1688	/* reset the light list and los of the players on the map */
1800	if ((op->glow_radius != 0) && map)	1689	if ((op->glow_radius != 0) && map)
1801	{	1690	{
1802	#ifdef DEBUG_LIGHTS	1691	#ifdef DEBUG_LIGHTS
1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1692	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804	#endif /* DEBUG_LIGHTS */	1693	#endif /* DEBUG_LIGHTS */
1805	if (MAP_DARKNESS (map))	1694	if (map->darkness)
1806	update_all_los (map, x, y);	1695	update_all_los (map, x, y);
1807	}	1696	}
1808		1697
1809	/* Client has no idea of ordering so lets not bother ordering it here.	1698	/* Client has no idea of ordering so lets not bother ordering it here.
1810	* It sure simplifies this function...	1699	* It sure simplifies this function...
…		…
1815	{	1704	{
1816	op->below = inv;	1705	op->below = inv;
1817	op->below->above = op;	1706	op->below->above = op;
1818	inv = op;	1707	inv = op;
1819	}	1708	}
		1709
		1710	INVOKE_OBJECT (INSERT, this);
1820		1711
1821	return op;	1712	return op;
1822	}	1713	}
1823		1714
1824	/*	1715	/*
…		…
1839	*	1730	*
1840	* MSW 2001-07-08: Check all objects on space, not just those below	1731	* MSW 2001-07-08: Check all objects on space, not just those below
1841	* object being inserted. insert_ob_in_map may not put new objects	1732	* object being inserted. insert_ob_in_map may not put new objects
1842	* on top.	1733	* on top.
1843	*/	1734	*/
1844
1845	int	1735	int
1846	check_move_on (object *op, object *originator)	1736	check_move_on (object *op, object *originator)
1847	{	1737	{
1848	object *tmp;	1738	object *tmp;
1849	maptile *m = op->map;	1739	maptile *m = op->map;
…		…
1876		1766
1877	/* The objects have to be checked from top to bottom.	1767	/* The objects have to be checked from top to bottom.
1878	* Hence, we first go to the top:	1768	* Hence, we first go to the top:
1879	*/	1769	*/
1880		1770
1881	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1882	{	1772	{
1883	/* Trim the search when we find the first other spell effect	1773	/* Trim the search when we find the first other spell effect
1884	* this helps performance so that if a space has 50 spell objects,	1774	* this helps performance so that if a space has 50 spell objects,
1885	* we don't need to check all of them.	1775	* we don't need to check all of them.
1886	*/	1776	*/
…		…
1941	/*	1831	/*
1942	* present_arch(arch, map, x, y) searches for any objects with	1832	* present_arch(arch, map, x, y) searches for any objects with
1943	* a matching archetype at the given map and coordinates.	1833	* a matching archetype at the given map and coordinates.
1944	* The first matching object is returned, or NULL if none.	1834	* The first matching object is returned, or NULL if none.
1945	*/	1835	*/
1946
1947	object *	1836	object *
1948	present_arch (const archetype *at, maptile *m, int x, int y)	1837	present_arch (const archetype *at, maptile *m, int x, int y)
1949	{	1838	{
1950	object *
1951	tmp;
1952
1953	if (m == NULL || out_of_map (m, x, y))	1839	if (m == NULL || out_of_map (m, x, y))
1954	{	1840	{
1955	LOG (llevError, "Present_arch called outside map.\n");	1841	LOG (llevError, "Present_arch called outside map.\n");
1956	return NULL;	1842	return NULL;
1957	}	1843	}
		1844
1958	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1959	if (tmp->arch == at)	1846	if (tmp->arch == at)
1960	return tmp;	1847	return tmp;
		1848
1961	return NULL;	1849	return NULL;
1962	}	1850	}
1963		1851
1964	/*	1852	/*
1965	* present(type, map, x, y) searches for any objects with	1853	* present(type, map, x, y) searches for any objects with
1966	* a matching type variable at the given map and coordinates.	1854	* a matching type variable at the given map and coordinates.
1967	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1968	*/	1856	*/
1969
1970	object *	1857	object *
1971	present (unsigned char type, maptile *m, int x, int y)	1858	present (unsigned char type, maptile *m, int x, int y)
1972	{	1859	{
1973	object *
1974	tmp;
1975
1976	if (out_of_map (m, x, y))	1860	if (out_of_map (m, x, y))
1977	{	1861	{
1978	LOG (llevError, "Present called outside map.\n");	1862	LOG (llevError, "Present called outside map.\n");
1979	return NULL;	1863	return NULL;
1980	}	1864	}
		1865
1981	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1982	if (tmp->type == type)	1867	if (tmp->type == type)
1983	return tmp;	1868	return tmp;
		1869
1984	return NULL;	1870	return NULL;
1985	}	1871	}
1986		1872
1987	/*	1873	/*
1988	* present_in_ob(type, object) searches for any objects with	1874	* present_in_ob(type, object) searches for any objects with
1989	* a matching type variable in the inventory of the given object.	1875	* a matching type variable in the inventory of the given object.
1990	* The first matching object is returned, or NULL if none.	1876	* The first matching object is returned, or NULL if none.
1991	*/	1877	*/
1992
1993	object *	1878	object *
1994	present_in_ob (unsigned char type, const object *op)	1879	present_in_ob (unsigned char type, const object *op)
1995	{	1880	{
1996	object *
1997	tmp;
1998
1999	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1881	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000	if (tmp->type == type)	1882	if (tmp->type == type)
2001	return tmp;	1883	return tmp;
		1884
2002	return NULL;	1885	return NULL;
2003	}	1886	}
2004		1887
2005	/*	1888	/*
2006	* present_in_ob (type, str, object) searches for any objects with	1889	* present_in_ob (type, str, object) searches for any objects with
…		…
2014	* str is the string to match against. Note that we match against	1897	* str is the string to match against. Note that we match against
2015	* the object name, not the archetype name. this is so that the	1898	* the object name, not the archetype name. this is so that the
2016	* spell code can use one object type (force), but change it's name	1899	* spell code can use one object type (force), but change it's name
2017	* to be unique.	1900	* to be unique.
2018	*/	1901	*/
2019
2020	object *	1902	object *
2021	present_in_ob_by_name (int type, const char *str, const object *op)	1903	present_in_ob_by_name (int type, const char *str, const object *op)
2022	{	1904	{
2023	object *
2024	tmp;
2025
2026	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027	{
2028	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1906	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029	return tmp;	1907	return tmp;
2030	}	1908
2031	return NULL;	1909	return 0;
2032	}	1910	}
2033		1911
2034	/*	1912	/*
2035	* present_arch_in_ob(archetype, object) searches for any objects with	1913	* present_arch_in_ob(archetype, object) searches for any objects with
2036	* a matching archetype in the inventory of the given object.	1914	* a matching archetype in the inventory of the given object.
2037	* The first matching object is returned, or NULL if none.	1915	* The first matching object is returned, or NULL if none.
2038	*/	1916	*/
2039
2040	object *	1917	object *
2041	present_arch_in_ob (const archetype *at, const object *op)	1918	present_arch_in_ob (const archetype *at, const object *op)
2042	{	1919	{
2043	object *
2044	tmp;
2045
2046	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047	if (tmp->arch == at)	1921	if (tmp->arch == at)
2048	return tmp;	1922	return tmp;
		1923
2049	return NULL;	1924	return NULL;
2050	}	1925	}
2051		1926
2052	/*	1927	/*
2053	* activate recursively a flag on an object inventory	1928	* activate recursively a flag on an object inventory
2054	*/	1929	*/
2055	void	1930	void
2056	flag_inv (object *op, int flag)	1931	flag_inv (object *op, int flag)
2057	{	1932	{
2058	object *
2059	tmp;
2060
2061	if (op->inv)	1933	if (op->inv)
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063	{	1935	{
2064	SET_FLAG (tmp, flag);	1936	SET_FLAG (tmp, flag);
2065	flag_inv (tmp, flag);	1937	flag_inv (tmp, flag);
2066	}	1938	}
2067	} /*	1939	}
		1940
		1941	/*
2068	* desactivate recursively a flag on an object inventory	1942	* deactivate recursively a flag on an object inventory
2069	*/	1943	*/
2070	void	1944	void
2071	unflag_inv (object *op, int flag)	1945	unflag_inv (object *op, int flag)
2072	{	1946	{
2073	object *
2074	tmp;
2075
2076	if (op->inv)	1947	if (op->inv)
2077	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2078	{	1949	{
2079	CLEAR_FLAG (tmp, flag);	1950	CLEAR_FLAG (tmp, flag);
2080	unflag_inv (tmp, flag);	1951	unflag_inv (tmp, flag);
2081	}	1952	}
2082	}	1953	}
…		…
2085	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1956	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086	* all it's inventory (recursively).	1957	* all it's inventory (recursively).
2087	* If checksums are used, a player will get set_cheat called for	1958	* If checksums are used, a player will get set_cheat called for
2088	* him/her-self and all object carried by a call to this function.	1959	* him/her-self and all object carried by a call to this function.
2089	*/	1960	*/
2090
2091	void	1961	void
2092	set_cheat (object *op)	1962	set_cheat (object *op)
2093	{	1963	{
2094	SET_FLAG (op, FLAG_WAS_WIZ);	1964	SET_FLAG (op, FLAG_WAS_WIZ);
2095	flag_inv (op, FLAG_WAS_WIZ);	1965	flag_inv (op, FLAG_WAS_WIZ);
…		…
2114	* because arch_blocked (now ob_blocked) needs to know the movement type	1984	* because arch_blocked (now ob_blocked) needs to know the movement type
2115	* to know if the space in question will block the object. We can't use	1985	* to know if the space in question will block the object. We can't use
2116	* the archetype because that isn't correct if the monster has been	1986	* the archetype because that isn't correct if the monster has been
2117	* customized, changed states, etc.	1987	* customized, changed states, etc.
2118	*/	1988	*/
2119
2120	int	1989	int
2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1990	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122	{	1991	{
2123	int
2124	i,
2125	index = 0, flag;	1992	int index = 0, flag;
2126	static int
2127	altern[SIZEOFFREE];	1993	int altern[SIZEOFFREE];
2128		1994
2129	for (i = start; i < stop; i++)	1995	for (int i = start; i < stop; i++)
2130	{	1996	{
2131	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1997	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2132	if (!flag)	1998	if (!flag)
2133	altern[index++] = i;	1999	altern [index++] = i;
2134		2000
2135	/* Basically, if we find a wall on a space, we cut down the search size.	2001	/* Basically, if we find a wall on a space, we cut down the search size.
2136	* In this way, we won't return spaces that are on another side of a wall.	2002	* In this way, we won't return spaces that are on another side of a wall.
2137	* This mostly work, but it cuts down the search size in all directions -	2003	* This mostly work, but it cuts down the search size in all directions -
2138	* if the space being examined only has a wall to the north and empty	2004	* if the space being examined only has a wall to the north and empty
2139	* spaces in all the other directions, this will reduce the search space	2005	* spaces in all the other directions, this will reduce the search space
2140	* to only the spaces immediately surrounding the target area, and	2006	* to only the spaces immediately surrounding the target area, and
2141	* won't look 2 spaces south of the target space.	2007	* won't look 2 spaces south of the target space.
2142	*/	2008	*/
2143	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2009	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2144	stop = maxfree[i];	2010	stop = maxfree[i];
2145	}	2011	}
		2012
2146	if (!index)	2013	if (!index)
2147	return -1;	2014	return -1;
		2015
2148	return altern[RANDOM () % index];	2016	return altern[RANDOM () % index];
2149	}	2017	}
2150		2018
2151	/*	2019	/*
2152	* find_first_free_spot(archetype, maptile, x, y) works like	2020	* find_first_free_spot(archetype, maptile, x, y) works like
2153	* find_free_spot(), but it will search max number of squares.	2021	* find_free_spot(), but it will search max number of squares.
2154	* But it will return the first available spot, not a random choice.	2022	* But it will return the first available spot, not a random choice.
2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2023	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2156	*/	2024	*/
2157
2158	int	2025	int
2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2026	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160	{	2027	{
2161	int
2162	i;
2163
2164	for (i = 0; i < SIZEOFFREE; i++)	2028	for (int i = 0; i < SIZEOFFREE; i++)
2165	{
2166	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2029	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2167	return i;	2030	return i;
2168	}	2031
2169	return -1;	2032	return -1;
2170	}	2033	}
2171		2034
2172	/*	2035	/*
2173	* The function permute(arr, begin, end) randomly reorders the array	2036	* The function permute(arr, begin, end) randomly reorders the array
2174	* arr[begin..end-1].	2037	* arr[begin..end-1].
		2038	* now uses a fisher-yates shuffle, old permute was broken
2175	*/	2039	*/
2176	static void	2040	static void
2177	permute (int *arr, int begin, int end)	2041	permute (int *arr, int begin, int end)
2178	{	2042	{
2179	int	2043	arr += begin;
2180	i,
2181	j,
2182	tmp,
2183	len;
2184
2185	len = end - begin;	2044	end -= begin;
2186	for (i = begin; i < end; i++)
2187	{
2188	j = begin + RANDOM () % len;
2189		2045
2190	tmp = arr[i];	2046	while (--end)
2191	arr[i] = arr[j];	2047	swap (arr [end], arr [RANDOM () % (end + 1)]);
2192	arr[j] = tmp;
2193	}
2194	}	2048	}
2195		2049
2196	/* new function to make monster searching more efficient, and effective!	2050	/* new function to make monster searching more efficient, and effective!
2197	* This basically returns a randomized array (in the passed pointer) of	2051	* This basically returns a randomized array (in the passed pointer) of
2198	* the spaces to find monsters. In this way, it won't always look for	2052	* the spaces to find monsters. In this way, it won't always look for
…		…
2201	* the 3x3 area will be searched, just not in a predictable order.	2055	* the 3x3 area will be searched, just not in a predictable order.
2202	*/	2056	*/
2203	void	2057	void
2204	get_search_arr (int *search_arr)	2058	get_search_arr (int *search_arr)
2205	{	2059	{
2206	int	2060	int i;
2207	i;
2208		2061
2209	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
2210	{
2211	search_arr[i] = i;	2063	search_arr[i] = i;
2212	}
2213		2064
2214	permute (search_arr, 1, SIZEOFFREE1 + 1);	2065	permute (search_arr, 1, SIZEOFFREE1 + 1);
2215	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2066	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2067	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217	}	2068	}
…		…
2226	* Perhaps incorrectly, but I'm making the assumption that exclude	2077	* Perhaps incorrectly, but I'm making the assumption that exclude
2227	* is actually want is going to try and move there. We need this info	2078	* is actually want is going to try and move there. We need this info
2228	* because we have to know what movement the thing looking to move	2079	* because we have to know what movement the thing looking to move
2229	* there is capable of.	2080	* there is capable of.
2230	*/	2081	*/
2231
2232	int	2082	int
2233	find_dir (maptile *m, int x, int y, object *exclude)	2083	find_dir (maptile *m, int x, int y, object *exclude)
2234	{	2084	{
2235	int
2236	i,
2237	max = SIZEOFFREE, mflags;	2085	int i, max = SIZEOFFREE, mflags;
2238		2086
2239	sint16 nx, ny;	2087	sint16 nx, ny;
2240	object *	2088	object *tmp;
2241	tmp;
2242	maptile *	2089	maptile *mp;
2243	mp;
2244		2090
2245	MoveType blocked, move_type;	2091	MoveType blocked, move_type;
2246		2092
2247	if (exclude && exclude->head)	2093	if (exclude && exclude->head)
2248	{	2094	{
…		…
2260	mp = m;	2106	mp = m;
2261	nx = x + freearr_x[i];	2107	nx = x + freearr_x[i];
2262	ny = y + freearr_y[i];	2108	ny = y + freearr_y[i];
2263		2109
2264	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2110	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2111
2265	if (mflags & P_OUT_OF_MAP)	2112	if (mflags & P_OUT_OF_MAP)
2266	{
2267	max = maxfree[i];	2113	max = maxfree[i];
2268	}
2269	else	2114	else
2270	{	2115	{
2271	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2116	mapspace &ms = mp->at (nx, ny);
		2117
		2118	blocked = ms.move_block;
2272		2119
2273	if ((move_type & blocked) == move_type)	2120	if ((move_type & blocked) == move_type)
2274	{
2275	max = maxfree[i];	2121	max = maxfree[i];
2276	}
2277	else if (mflags & P_IS_ALIVE)	2122	else if (mflags & P_IS_ALIVE)
2278	{	2123	{
2279	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2124	for (tmp = ms.bot; tmp; tmp = tmp->above)
2280	{	2125	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2126	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2282	{
2283	break;	2127	break;
2284	}	2128
2285	}
2286	if (tmp)	2129	if (tmp)
2287	{
2288	return freedir[i];	2130	return freedir[i];
2289	}
2290	}	2131	}
2291	}	2132	}
2292	}	2133	}
		2134
2293	return 0;	2135	return 0;
2294	}	2136	}
2295		2137
2296	/*	2138	/*
2297	* distance(object 1, object 2) will return the square of the	2139	* distance(object 1, object 2) will return the square of the
2298	* distance between the two given objects.	2140	* distance between the two given objects.
2299	*/	2141	*/
2300
2301	int	2142	int
2302	distance (const object *ob1, const object *ob2)	2143	distance (const object *ob1, const object *ob2)
2303	{	2144	{
2304	int
2305	i;
2306
2307	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2145	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308	return i;
2309	}	2146	}
2310		2147
2311	/*	2148	/*
2312	* find_dir_2(delta-x,delta-y) will return a direction in which	2149	* find_dir_2(delta-x,delta-y) will return a direction in which
2313	* an object which has subtracted the x and y coordinates of another	2150	* an object which has subtracted the x and y coordinates of another
2314	* object, needs to travel toward it.	2151	* object, needs to travel toward it.
2315	*/	2152	*/
2316
2317	int	2153	int
2318	find_dir_2 (int x, int y)	2154	find_dir_2 (int x, int y)
2319	{	2155	{
2320	int	2156	int q;
2321	q;
2322		2157
2323	if (y)	2158	if (y)
2324	q = x * 100 / y;	2159	q = x * 100 / y;
2325	else if (x)	2160	else if (x)
2326	q = -300 * x;	2161	q = -300 * x;
…		…
2361	int	2196	int
2362	absdir (int d)	2197	absdir (int d)
2363	{	2198	{
2364	while (d < 1)	2199	while (d < 1)
2365	d += 8;	2200	d += 8;
		2201
2366	while (d > 8)	2202	while (d > 8)
2367	d -= 8;	2203	d -= 8;
		2204
2368	return d;	2205	return d;
2369	}	2206	}
2370		2207
2371	/*	2208	/*
2372	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2374	*/	2211	*/
2375		2212
2376	int	2213	int
2377	dirdiff (int dir1, int dir2)	2214	dirdiff (int dir1, int dir2)
2378	{	2215	{
2379	int	2216	int d;
2380	d;
2381		2217
2382	d = abs (dir1 - dir2);	2218	d = abs (dir1 - dir2);
2383	if (d > 4)	2219	if (d > 4)
2384	d = 8 - d;	2220	d = 8 - d;
		2221
2385	return d;	2222	return d;
2386	}	2223	}
2387		2224
2388	/* peterm:	2225	/* peterm:
2389	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2226	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2392	* This basically means that if direction is 15, then it could either go	2229	* This basically means that if direction is 15, then it could either go
2393	* direction 4, 14, or 16 to get back to where we are.	2230	* direction 4, 14, or 16 to get back to where we are.
2394	* Moved from spell_util.c to object.c with the other related direction	2231	* Moved from spell_util.c to object.c with the other related direction
2395	* functions.	2232	* functions.
2396	*/	2233	*/
2397
2398	int
2399	reduction_dir[SIZEOFFREE][3] = {	2234	int reduction_dir[SIZEOFFREE][3] = {
2400	{0, 0, 0}, /* 0 */	2235	{0, 0, 0}, /* 0 */
2401	{0, 0, 0}, /* 1 */	2236	{0, 0, 0}, /* 1 */
2402	{0, 0, 0}, /* 2 */	2237	{0, 0, 0}, /* 2 */
2403	{0, 0, 0}, /* 3 */	2238	{0, 0, 0}, /* 3 */
2404	{0, 0, 0}, /* 4 */	2239	{0, 0, 0}, /* 4 */
…		…
2452	* find a path to that monster that we found. If not,	2287	* find a path to that monster that we found. If not,
2453	* we don't bother going toward it. Returns 1 if we	2288	* we don't bother going toward it. Returns 1 if we
2454	* can see a direct way to get it	2289	* can see a direct way to get it
2455	* Modified to be map tile aware -.MSW	2290	* Modified to be map tile aware -.MSW
2456	*/	2291	*/
2457
2458
2459	int	2292	int
2460	can_see_monsterP (maptile *m, int x, int y, int dir)	2293	can_see_monsterP (maptile *m, int x, int y, int dir)
2461	{	2294	{
2462	sint16 dx, dy;	2295	sint16 dx, dy;
2463	int
2464	mflags;	2296	int mflags;
2465		2297
2466	if (dir < 0)	2298	if (dir < 0)
2467	return 0; /* exit condition: invalid direction */	2299	return 0; /* exit condition: invalid direction */
2468		2300
2469	dx = x + freearr_x[dir];	2301	dx = x + freearr_x[dir];
…		…
2482	return 0;	2314	return 0;
2483		2315
2484	/* yes, can see. */	2316	/* yes, can see. */
2485	if (dir < 9)	2317	if (dir < 9)
2486	return 1;	2318	return 1;
		2319
2487	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2320	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2321	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2322	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489	}	2323	}
2490
2491
2492		2324
2493	/*	2325	/*
2494	* can_pick(picker, item): finds out if an object is possible to be	2326	* can_pick(picker, item): finds out if an object is possible to be
2495	* picked up by the picker. Returnes 1 if it can be	2327	* picked up by the picker. Returnes 1 if it can be
2496	* picked up, otherwise 0.	2328	* picked up, otherwise 0.
…		…
2507	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2339	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2340	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2341	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510	}	2342	}
2511		2343
2512
2513	/*	2344	/*
2514	* create clone from object to another	2345	* create clone from object to another
2515	*/	2346	*/
2516	object *	2347	object *
2517	object_create_clone (object *asrc)	2348	object_create_clone (object *asrc)
…		…
2536	{	2367	{
2537	dst = tmp;	2368	dst = tmp;
2538	tmp->head = 0;	2369	tmp->head = 0;
2539	}	2370	}
2540	else	2371	else
2541	{
2542	tmp->head = dst;	2372	tmp->head = dst;
2543	}
2544		2373
2545	tmp->more = 0;	2374	tmp->more = 0;
2546		2375
2547	if (prev)	2376	if (prev)
2548	prev->more = tmp;	2377	prev->more = tmp;
…		…
2560	/* Basically, we save the content of the string to a temp file, then call */	2389	/* Basically, we save the content of the string to a temp file, then call */
2561	/* load_object on it. I admit it is a highly inefficient way to make things, */	2390	/* load_object on it. I admit it is a highly inefficient way to make things, */
2562	/* but it was simple to make and allows reusing the load_object function. */	2391	/* but it was simple to make and allows reusing the load_object function. */
2563	/* Remember not to use load_object_str in a time-critical situation. */	2392	/* Remember not to use load_object_str in a time-critical situation. */
2564	/* Also remember that multiparts objects are not supported for now. */	2393	/* Also remember that multiparts objects are not supported for now. */
2565
2566	object *	2394	object *
2567	load_object_str (const char *obstr)	2395	load_object_str (const char *obstr)
2568	{	2396	{
2569	object *op;	2397	object *op;
2570	char filename[MAX_BUF];	2398	char filename[MAX_BUF];
…		…
2600	* returns NULL if no match.	2428	* returns NULL if no match.
2601	*/	2429	*/
2602	object *	2430	object *
2603	find_obj_by_type_subtype (const object *who, int type, int subtype)	2431	find_obj_by_type_subtype (const object *who, int type, int subtype)
2604	{	2432	{
2605	object *tmp;
2606
2607	for (tmp = who->inv; tmp; tmp = tmp->below)	2433	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608	if (tmp->type == type && tmp->subtype == subtype)	2434	if (tmp->type == type && tmp->subtype == subtype)
2609	return tmp;	2435	return tmp;
2610		2436
2611	return NULL;	2437	return 0;
2612	}	2438	}
2613		2439
2614	/* If ob has a field named key, return the link from the list,	2440	/* If ob has a field named key, return the link from the list,
2615	* otherwise return NULL.	2441	* otherwise return NULL.
2616	*	2442	*
…		…
2618	* do the desired thing.	2444	* do the desired thing.
2619	*/	2445	*/
2620	key_value *	2446	key_value *
2621	get_ob_key_link (const object *ob, const char *key)	2447	get_ob_key_link (const object *ob, const char *key)
2622	{	2448	{
2623	key_value *link;
2624
2625	for (link = ob->key_values; link != NULL; link = link->next)	2449	for (key_value *link = ob->key_values; link; link = link->next)
2626	if (link->key == key)	2450	if (link->key == key)
2627	return link;	2451	return link;
2628		2452
2629	return NULL;	2453	return 0;
2630	}	2454	}
2631		2455
2632	/*	2456	/*
2633	* Returns the value of op has an extra_field for key, or NULL.	2457	* Returns the value of op has an extra_field for key, or NULL.
2634	*	2458	*
…		…
2674	* Returns TRUE on success.	2498	* Returns TRUE on success.
2675	*/	2499	*/
2676	int	2500	int
2677	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2501	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678	{	2502	{
2679	key_value *
2680	field = NULL, *last = NULL;	2503	key_value *field = NULL, *last = NULL;
2681		2504
2682	for (field = op->key_values; field != NULL; field = field->next)	2505	for (field = op->key_values; field != NULL; field = field->next)
2683	{	2506	{
2684	if (field->key != canonical_key)	2507	if (field->key != canonical_key)
2685	{	2508	{
…		…
2713	/* IF we get here, key doesn't exist */	2536	/* IF we get here, key doesn't exist */
2714		2537
2715	/* No field, we'll have to add it. */	2538	/* No field, we'll have to add it. */
2716		2539
2717	if (!add_key)	2540	if (!add_key)
2718	{
2719	return FALSE;	2541	return FALSE;
2720	}	2542
2721	/* There isn't any good reason to store a null	2543	/* There isn't any good reason to store a null
2722	* value in the key/value list. If the archetype has	2544	* value in the key/value list. If the archetype has
2723	* this key, then we should also have it, so shouldn't	2545	* this key, then we should also have it, so shouldn't
2724	* be here. If user wants to store empty strings,	2546	* be here. If user wants to store empty strings,
2725	* should pass in ""	2547	* should pass in ""

Diff Legend

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