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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.82 by root, Mon Dec 25 11:25:49 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
…		…
104	_exit (1);	106	_exit (1);
105	}	107	}
106		108
107	uuid.seq = uid;	109	uuid.seq = uid;
108	write_uuid ();	110	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	112	fclose (fp);
111	}	113	}
112		114
113	UUID	115	UUID
114	gen_uuid ()	116	gen_uuid ()
…		…
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	*/
…		…
350	object *	348	object *
351	object_get_env_recursive (object *op)	349	object_get_env_recursive (object *op)
352	{	350	{
353	while (op->env != NULL)	351	while (op->env != NULL)
354	op = op->env;	352	op = op->env;
355	return op;
356	}
357
358	/*
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;	353	return op;
371	}	354	}
372		355
373	/*	356	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
…		…
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	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*	472	/*
541	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
542	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
543	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
544	* 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,
545	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
546	* will point at garbage.	478	* will point at garbage.
547	*/	479	*/
548	void	480	void
549	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
550	{	482	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553		485
554	op2->clone (op);	486	*(object_copy *)dst = *this;
555		487
556	if (is_freed)	488	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
558	if (is_removed)	491	if (is_removed)
559	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
560		493
561	if (op2->speed < 0)	494	if (speed < 0)
562	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563		496
564	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
565	if (op2->key_values)	498	if (key_values)
566	{	499	{
567	key_value *tail = 0;	500	key_value *tail = 0;
568	key_value *i;	501	key_value *i;
569		502
570	op->key_values = 0;	503	dst->key_values = 0;
571		504
572	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
573	{	506	{
574	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
575		508
576	new_link->next = 0;	509	new_link->next = 0;
577	new_link->key = i->key;	510	new_link->key = i->key;
578	new_link->value = i->value;	511	new_link->value = i->value;
579		512
580	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
581	if (!op->key_values)	514	if (!dst->key_values)
582	{	515	{
583	op->key_values = new_link;	516	dst->key_values = new_link;
584	tail = new_link;	517	tail = new_link;
585	}	518	}
586	else	519	else
587	{	520	{
588	tail->next = new_link;	521	tail->next = new_link;
589	tail = new_link;	522	tail = new_link;
590	}	523	}
591	}	524	}
592	}	525	}
593		526
594	update_ob_speed (op);	527	update_ob_speed (dst);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
595	}	536	}
596		537
597	/*	538	/*
598	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
599	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
…		…
707	op->active_next = NULL;	648	op->active_next = NULL;
708	op->active_prev = NULL;	649	op->active_prev = NULL;
709	}	650	}
710		651
711	/*	652	/*
712	* update_object() updates the array which represents the map.	653	* update_object() updates the the map.
713	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
714	* by invisible objects by whatever is below them (unless it's another	655	* by invisible objects by whatever is below them (unless it's another
715	* invisible object, etc...)	656	* invisible object, etc...)
716	* If the object being updated is beneath a player, the look-window	657	* If the object being updated is beneath a player, the look-window
717	* of that player is updated (this might be a suboptimal way of	658	* of that player is updated (this might be a suboptimal way of
718	* updating that window, though, since update_object() is called _often_)	659	* updating that window, though, since update_object() is called _often_)
719	*	660	*
720	* action is a hint of what the caller believes need to be done.	661	* action is a hint of what the caller believes need to be done.
721	* For example, if the only thing that has changed is the face (due to
722	* an animation), we don't need to call update_position until that actually
723	* comes into view of a player. OTOH, many other things, like addition/removal
724	* of walls or living creatures may need us to update the flags now.
725	* current action are:	662	* current action are:
726	* UP_OBJ_INSERT: op was inserted	663	* UP_OBJ_INSERT: op was inserted
727	* UP_OBJ_REMOVE: op was removed	664	* UP_OBJ_REMOVE: op was removed
728	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	665	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729	* as that is easier than trying to look at what may have changed.	666	* as that is easier than trying to look at what may have changed.
730	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
731	*/	668	*/
732
733	void	669	void
734	update_object (object *op, int action)	670	update_object (object *op, int action)
735	{	671	{
736	int update_now = 0, flags;
737	MoveType move_on, move_off, move_block, move_slow;	672	MoveType move_on, move_off, move_block, move_slow;
738		673
739	if (op == NULL)	674	if (op == NULL)
740	{	675	{
741	/* this should never happen */	676	/* this should never happen */
742	LOG (llevDebug, "update_object() called for NULL object.\n");	677	LOG (llevDebug, "update_object() called for NULL object.\n");
743	return;	678	return;
744	}	679	}
745		680
746	if (op->env != NULL)	681	if (op->env)
747	{	682	{
748	/* Animation is currently handled by client, so nothing	683	/* Animation is currently handled by client, so nothing
749	* to do in this case.	684	* to do in this case.
750	*/	685	*/
751	return;	686	return;
…		…
765	abort ();	700	abort ();
766	#endif	701	#endif
767	return;	702	return;
768	}	703	}
769		704
770	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	705	mapspace &m = op->ms ();
771	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776		706
		707	if (m.flags_ & P_NEED_UPDATE)
		708	/* nop */;
777	if (action == UP_OBJ_INSERT)	709	else if (action == UP_OBJ_INSERT)
778	{	710	{
		711	// this is likely overkill, TODO: revisit (schmorp)
779	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780	update_now = 1;
781
782	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	713	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783	update_now = 1;	714	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784		715	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		716	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	717	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786	update_now = 1;
787
788	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789	update_now = 1;
790
791	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792	update_now = 1;
793
794	if ((move_on | op->move_on) != move_on)	718	|| (m.move_on | op->move_on ) != m.move_on
795	update_now = 1;
796
797	if ((move_off | op->move_off) != move_off)	719	|| (m.move_off | op->move_off ) != m.move_off
798	update_now = 1;	720	|| (m.move_slow | op->move_slow) != m.move_slow
799
800	/* This isn't perfect, but I don't expect a lot of objects to	721	/* This isn't perfect, but I don't expect a lot of objects to
801	* to have move_allow right now.	722	* to have move_allow right now.
802	*/	723	*/
803	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804	update_now = 1;	725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805		726	m.flags_ = P_NEED_UPDATE;
806	if ((move_slow | op->move_slow) != move_slow)
807	update_now = 1;
808	}	727	}
809	/* if the object is being removed, we can't make intelligent	728	/* if the object is being removed, we can't make intelligent
810	* decisions, because remove_ob can't really pass the object	729	* decisions, because remove_ob can't really pass the object
811	* that is being removed.	730	* that is being removed.
812	*/	731	*/
813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814	update_now = 1;	733	m.flags_ = P_NEED_UPDATE;
815	else if (action == UP_OBJ_FACE)	734	else if (action == UP_OBJ_FACE)
816	/* Nothing to do for that case */ ;	735	/* Nothing to do for that case */ ;
817	else	736	else
818	LOG (llevError, "update_object called with invalid action: %d\n", action);	737	LOG (llevError, "update_object called with invalid action: %d\n", action);
819		738
820	if (update_now)
821	{
822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823	update_position (op->map, op->x, op->y);
824	}
825
826	if (op->more != NULL)	739	if (op->more)
827	update_object (op->more, action);	740	update_object (op->more, action);
828	}	741	}
829		742
830	object::vector object::mortals;
831	object::vector object::objects; // not yet used	743	object::vector object::objects; // not yet used
832	object *object::first;	744	object *object::first;
833
834	void object::free_mortals ()
835	{
836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837	if ((*i)->refcnt)
838	++i; // further delay freeing
839	else
840	{
841	delete *i;
842	mortals.erase (i);
843	}
844
845	static int lastmortals = 0;//D
846
847	if (mortals.size() != lastmortals && lastmortals > 100)//D
848	{
849	lastmortals = mortals.size ();//D
850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851	}
852	}
853		745
854	object::object ()	746	object::object ()
855	{	747	{
856	SET_FLAG (this, FLAG_REMOVED);	748	SET_FLAG (this, FLAG_REMOVED);
857		749
…		…
906	* this function to succeed.	798	* this function to succeed.
907	*	799	*
908	* If destroy_inventory is set, free inventory as well. Else drop items in	800	* If destroy_inventory is set, free inventory as well. Else drop items in
909	* inventory to the ground.	801	* inventory to the ground.
910	*/	802	*/
911	void object::destroy (bool destroy_inventory)	803	void
		804	object::do_destroy ()
912	{	805	{
913	if (QUERY_FLAG (this, FLAG_FREED))	806	attachable::do_destroy ();
		807
		808	if (flag [FLAG_IS_LINKED])
		809	remove_button_link (this);
		810
		811	if (flag [FLAG_FRIENDLY])
		812	remove_friendly_object (this);
		813
		814	if (!flag [FLAG_REMOVED])
		815	remove ();
		816
		817	if (flag [FLAG_FREED])
914	return;	818	return;
915		819
916	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	flag [FLAG_FREED] = 1;
917	remove_friendly_object (this);
918		821
919	if (!QUERY_FLAG (this, FLAG_REMOVED))	822	// hack to ensure that freed objects still have a valid map
920	remove_ob (this);
921
922	SET_FLAG (this, FLAG_FREED);
923
924	if (more)
925	{	823	{
926	more->destroy (destroy_inventory);	824	static maptile *freed_map; // freed objects are moved here to avoid crashes
927	more = 0;
928	}
929		825
930	if (inv)	826	if (!freed_map)
931	{
932	/* Only if the space blocks everything do we not process -
933	* if some form of movement is allowed, let objects
934	* drop on that space.
935	*/
936	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
937	{	827	{
938	object *op = inv;	828	freed_map = new maptile;
939		829
940	while (op)	830	freed_map->name = "/internal/freed_objects_map";
941	{	831	freed_map->width = 3;
942	object *tmp = op->below;	832	freed_map->height = 3;
943	op->destroy (destroy_inventory);	833
944	op = tmp;	834	freed_map->allocate ();
945	}
946	}	835	}
947	else
948	{ /* Put objects in inventory onto this space */
949	object *op = inv;
950		836
951	while (op)	837	map = freed_map;
952	{	838	x = 1;
953	object *tmp = op->below;	839	y = 1;
954
955	remove_ob (op);
956
957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959	free_object (op);
960	else
961	{
962	op->x = x;
963	op->y = y;
964	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
965	}
966
967	op = tmp;
968	}
969	}
970	}	840	}
		841
		842	more = 0;
		843	head = 0;
		844	inv = 0;
971		845
972	// clear those pointers that likely might have circular references to us	846	// clear those pointers that likely might have circular references to us
973	owner = 0;	847	owner = 0;
974	enemy = 0;	848	enemy = 0;
975	attacked_by = 0;	849	attacked_by = 0;
…		…
980	/* Remove object from the active list */	854	/* Remove object from the active list */
981	speed = 0;	855	speed = 0;
982	update_ob_speed (this);	856	update_ob_speed (this);
983		857
984	unlink ();	858	unlink ();
		859	}
985		860
986	mortals.push_back (this);	861	/*
		862	* Remove and free all objects in the inventory of the given object.
		863	* object.c ?
		864	*/
		865	void
		866	object::destroy_inv (bool drop_to_ground)
		867	{
		868	if (!inv)
		869	return;
		870
		871	/* Only if the space blocks everything do we not process -
		872	* if some form of movement is allowed, let objects
		873	* drop on that space.
		874	*/
		875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		876	{
		877	while (inv)
		878	{
		879	inv->destroy_inv (drop_to_ground);
		880	inv->destroy ();
		881	}
		882	}
		883	else
		884	{ /* Put objects in inventory onto this space */
		885	while (inv)
		886	{
		887	object *op = inv;
		888
		889	if (op->flag [FLAG_STARTEQUIP]
		890	|| op->flag [FLAG_NO_DROP]
		891	|| op->type == RUNE
		892	|| op->type == TRAP
		893	|| op->flag [FLAG_IS_A_TEMPLATE])
		894	op->destroy ();
		895	else
		896	{
		897	op->remove ();
		898	op->x = x;
		899	op->y = y;
		900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		901	}
		902	}
		903	}
		904	}
		905
		906	void
		907	object::destroy (bool destroy_inventory)
		908	{
		909	if (destroyed ())
		910	return;
		911
		912	if (more)
		913	{
		914	//TODO: non-head objects must not have inventory
		915	more->destroy (destroy_inventory);
		916	more = 0;
		917	}
		918
		919	if (destroy_inventory)
		920	destroy_inv (true);
		921
		922	attachable::destroy ();
987	}	923	}
988		924
989	/*	925	/*
990	* sub_weight() recursively (outwards) subtracts a number from the	926	* sub_weight() recursively (outwards) subtracts a number from the
991	* weight of an object (and what is carried by it's environment(s)).	927	* weight of an object (and what is carried by it's environment(s)).
992	*/	928	*/
993
994	void	929	void
995	sub_weight (object *op, signed long weight)	930	sub_weight (object *op, signed long weight)
996	{	931	{
997	while (op != NULL)	932	while (op != NULL)
998	{	933	{
…		…
1002	op->carrying -= weight;	937	op->carrying -= weight;
1003	op = op->env;	938	op = op->env;
1004	}	939	}
1005	}	940	}
1006		941
1007	/* remove_ob(op):	942	/* op->remove ():
1008	* This function removes the object op from the linked list of objects	943	* This function removes the object op from the linked list of objects
1009	* which it is currently tied to. When this function is done, the	944	* which it is currently tied to. When this function is done, the
1010	* object will have no environment. If the object previously had an	945	* object will have no environment. If the object previously had an
1011	* environment, the x and y coordinates will be updated to	946	* environment, the x and y coordinates will be updated to
1012	* the previous environment.	947	* the previous environment.
1013	* Beware: This function is called from the editor as well!	948	* Beware: This function is called from the editor as well!
1014	*/	949	*/
1015
1016	void	950	void
1017	remove_ob (object *op)	951	object::remove ()
1018	{	952	{
1019	object *tmp, *last = 0;	953	object *tmp, *last = 0;
1020	object *otmp;	954	object *otmp;
1021		955
1022	int check_walk_off;
1023	maptile *m;
1024
1025	sint16 x, y;
1026
1027	if (QUERY_FLAG (op, FLAG_REMOVED))	956	if (QUERY_FLAG (this, FLAG_REMOVED))
1028	return;	957	return;
1029		958
1030	SET_FLAG (op, FLAG_REMOVED);	959	SET_FLAG (this, FLAG_REMOVED);
		960	INVOKE_OBJECT (REMOVE, this);
1031		961
1032	if (op->more != NULL)	962	if (more)
1033	remove_ob (op->more);	963	more->remove ();
1034		964
1035	/*	965	/*
1036	* In this case, the object to be removed is in someones	966	* In this case, the object to be removed is in someones
1037	* inventory.	967	* inventory.
1038	*/	968	*/
1039	if (op->env != NULL)	969	if (env)
1040	{	970	{
1041	if (op->nrof)	971	if (nrof)
1042	sub_weight (op->env, op->weight * op->nrof);	972	sub_weight (env, weight * nrof);
1043	else	973	else
1044	sub_weight (op->env, op->weight + op->carrying);	974	sub_weight (env, weight + carrying);
1045		975
1046	/* NO_FIX_PLAYER is set when a great many changes are being	976	/* NO_FIX_PLAYER is set when a great many changes are being
1047	* made to players inventory. If set, avoiding the call	977	* made to players inventory. If set, avoiding the call
1048	* to save cpu time.	978	* to save cpu time.
1049	*/	979	*/
1050	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051	fix_player (otmp);	981	otmp->update_stats ();
1052		982
1053	if (op->above != NULL)	983	if (above != NULL)
1054	op->above->below = op->below;	984	above->below = below;
1055	else	985	else
1056	op->env->inv = op->below;	986	env->inv = below;
1057		987
1058	if (op->below != NULL)	988	if (below != NULL)
1059	op->below->above = op->above;	989	below->above = above;
1060		990
1061	/* we set up values so that it could be inserted into	991	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	992	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	993	* to the caller to decide what we want to do.
1064	*/	994	*/
1065	op->x = op->env->x, op->y = op->env->y;	995	x = env->x, y = env->y;
1066	op->map = op->env->map;	996	map = env->map;
1067	op->above = NULL, op->below = NULL;	997	above = 0, below = 0;
1068	op->env = NULL;	998	env = 0;
1069	}	999	}
1070	else if (op->map)	1000	else if (map)
1071	{	1001	{
1072	x = op->x;
1073	y = op->y;
1074	m = get_map_from_coord (op->map, &x, &y);
1075
1076	if (!m)
1077	{
1078	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079	op->map->path, op->x, op->y);
1080	/* in old days, we used to set x and y to 0 and continue.
1081	* it seems if we get into this case, something is probablye
1082	* screwed up and should be fixed.
1083	*/
1084	abort ();
1085	}
1086
1087	if (op->map != m)
1088	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089	op->map->path, m->path, op->x, op->y, x, y);
1090
1091	/* Re did the following section of code - it looks like it had	1002	/* Re did the following section of code - it looks like it had
1092	* lots of logic for things we no longer care about	1003	* lots of logic for things we no longer care about
1093	*/	1004	*/
1094		1005
1095	/* link the object above us */	1006	/* link the object above us */
1096	if (op->above)	1007	if (above)
1097	op->above->below = op->below;	1008	above->below = below;
1098	else	1009	else
1099	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1010	map->at (x, y).top = below; /* we were top, set new top */
1100		1011
1101	/* Relink the object below us, if there is one */	1012	/* Relink the object below us, if there is one */
1102	if (op->below)	1013	if (below)
1103	op->below->above = op->above;	1014	below->above = above;
1104	else	1015	else
1105	{	1016	{
1106	/* Nothing below, which means we need to relink map object for this space	1017	/* Nothing below, which means we need to relink map object for this space
1107	* use translated coordinates in case some oddness with map tiling is	1018	* use translated coordinates in case some oddness with map tiling is
1108	* evident	1019	* evident
1109	*/	1020	*/
1110	if (GET_MAP_OB (m, x, y) != op)	1021	if (GET_MAP_OB (map, x, y) != this)
1111	{	1022	{
1112	char *dump = dump_object (op);	1023	char *dump = dump_object (this);
1113	LOG (llevError,	1024	LOG (llevError,
1114	"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);	1025	"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);
1115	free (dump);	1026	free (dump);
1116	dump = dump_object (GET_MAP_OB (m, x, y));	1027	dump = dump_object (GET_MAP_OB (map, x, y));
1117	LOG (llevError, "%s\n", dump);	1028	LOG (llevError, "%s\n", dump);
1118	free (dump);	1029	free (dump);
1119	}	1030	}
1120		1031
1121	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1032	map->at (x, y).bottom = above; /* goes on above it. */
1122	}	1033	}
1123		1034
1124	op->above = 0;	1035	above = 0;
1125	op->below = 0;	1036	below = 0;
1126		1037
1127	if (op->map->in_memory == MAP_SAVING)	1038	if (map->in_memory == MAP_SAVING)
1128	return;	1039	return;
1129		1040
1130	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1041	int check_walk_off = !flag [FLAG_NO_APPLY];
1131		1042
1132	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1133	{	1044	{
1134	/* No point updating the players look faces if he is the object	1045	/* No point updating the players look faces if he is the object
1135	* being removed.	1046	* being removed.
1136	*/	1047	*/
1137		1048
1138	if (tmp->type == PLAYER && tmp != op)	1049	if (tmp->type == PLAYER && tmp != this)
1139	{	1050	{
1140	/* If a container that the player is currently using somehow gets	1051	/* If a container that the player is currently using somehow gets
1141	* removed (most likely destroyed), update the player view	1052	* removed (most likely destroyed), update the player view
1142	* appropriately.	1053	* appropriately.
1143	*/	1054	*/
1144	if (tmp->container == op)	1055	if (tmp->container == this)
1145	{	1056	{
1146	CLEAR_FLAG (op, FLAG_APPLIED);	1057	flag [FLAG_APPLIED] = 0;
1147	tmp->container = NULL;	1058	tmp->container = 0;
1148	}	1059	}
1149		1060
1150	tmp->contr->socket.update_look = 1;	1061	if (tmp->contr->ns)
		1062	tmp->contr->ns->floorbox_update ();
1151	}	1063	}
1152		1064
1153	/* See if player moving off should effect something */	1065	/* See if player moving off should effect something */
1154	if (check_walk_off	1066	if (check_walk_off
1155	&& ((op->move_type & tmp->move_off)	1067	&& ((move_type & tmp->move_off)
1156	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157	{	1069	{
1158	move_apply (tmp, op, NULL);	1070	move_apply (tmp, this, 0);
1159		1071
1160	if (op->destroyed ())	1072	if (destroyed ())
1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162	}	1074	}
1163		1075
1164	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165		1077
1166	if (tmp->above == tmp)	1078	if (tmp->above == tmp)
1167	tmp->above = NULL;	1079	tmp->above = 0;
1168		1080
1169	last = tmp;	1081	last = tmp;
1170	}	1082	}
1171		1083
1172	/* last == NULL of there are no objects on this space */	1084	/* last == NULL of there are no objects on this space */
1173	if (last == NULL)	1085	if (!last)
1174	{	1086	map->at (x, y).flags_ = P_NEED_UPDATE;
1175	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177	* those out anyways, and if there are any flags set right now, they won't
1178	* be correct anyways.
1179	*/
1180	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1181	update_position (op->map, op->x, op->y);
1182	}
1183	else	1087	else
1184	update_object (last, UP_OBJ_REMOVE);	1088	update_object (last, UP_OBJ_REMOVE);
1185		1089
1186	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1187	update_all_los (op->map, op->x, op->y);	1091	update_all_los (map, x, y);
1188	}	1092	}
1189	}	1093	}
1190		1094
1191	/*	1095	/*
1192	* merge_ob(op,top):	1096	* merge_ob(op,top):
…		…
1200	merge_ob (object *op, object *top)	1104	merge_ob (object *op, object *top)
1201	{	1105	{
1202	if (!op->nrof)	1106	if (!op->nrof)
1203	return 0;	1107	return 0;
1204		1108
1205	if (top == NULL)	1109	if (top)
1206	for (top = op; top != NULL && top->above != NULL; top = top->above);	1110	for (top = op; top && top->above; top = top->above)
		1111	;
1207		1112
1208	for (; top != NULL; top = top->below)	1113	for (; top; top = top->below)
1209	{	1114	{
1210	if (top == op)	1115	if (top == op)
1211	continue;	1116	continue;
1212	if (CAN_MERGE (op, top))	1117
		1118	if (object::can_merge (op, top))
1213	{	1119	{
1214	top->nrof += op->nrof;	1120	top->nrof += op->nrof;
1215		1121
1216	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1122	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217	op->weight = 0; /* Don't want any adjustements now */	1123	op->weight = 0; /* Don't want any adjustements now */
1218	remove_ob (op);	1124	op->destroy ();
1219	free_object (op);
1220	return top;	1125	return top;
1221	}	1126	}
1222	}	1127	}
1223		1128
1224	return 0;	1129	return 0;
…		…
1263	* Return value:	1168	* Return value:
1264	* new object if 'op' was merged with other object	1169	* new object if 'op' was merged with other object
1265	* NULL if 'op' was destroyed	1170	* NULL if 'op' was destroyed
1266	* just 'op' otherwise	1171	* just 'op' otherwise
1267	*/	1172	*/
1268
1269	object *	1173	object *
1270	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271	{	1175	{
1272	object *tmp, *top, *floor = NULL;	1176	object *tmp, *top, *floor = NULL;
1273	sint16 x, y;	1177	sint16 x, y;
…		…
1307	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1308	free (dump);	1212	free (dump);
1309	return op;	1213	return op;
1310	}	1214	}
1311		1215
1312	if (op->more != NULL)	1216	if (op->more)
1313	{	1217	{
1314	/* The part may be on a different map. */	1218	/* The part may be on a different map. */
1315		1219
1316	object *more = op->more;	1220	object *more = op->more;
1317		1221
…		…
1333	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1334	{	1238	{
1335	if (!op->head)	1239	if (!op->head)
1336	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1337		1241
1338	return NULL;	1242	return 0;
1339	}	1243	}
1340	}	1244	}
1341		1245
1342	CLEAR_FLAG (op, FLAG_REMOVED);	1246	CLEAR_FLAG (op, FLAG_REMOVED);
1343		1247
…		…
1351		1255
1352	/* this has to be done after we translate the coordinates.	1256	/* this has to be done after we translate the coordinates.
1353	*/	1257	*/
1354	if (op->nrof && !(flag & INS_NO_MERGE))	1258	if (op->nrof && !(flag & INS_NO_MERGE))
1355	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1356	if (CAN_MERGE (op, tmp))	1260	if (object::can_merge (op, tmp))
1357	{	1261	{
1358	op->nrof += tmp->nrof;	1262	op->nrof += tmp->nrof;
1359	remove_ob (tmp);	1263	tmp->destroy ();
1360	free_object (tmp);
1361	}	1264	}
1362		1265
1363	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1266	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1267	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365		1268
…		…
1378	op->below = originator->below;	1281	op->below = originator->below;
1379		1282
1380	if (op->below)	1283	if (op->below)
1381	op->below->above = op;	1284	op->below->above = op;
1382	else	1285	else
1383	SET_MAP_OB (op->map, op->x, op->y, op);	1286	op->ms ().bottom = op;
1384		1287
1385	/* since *below* originator, no need to update top */	1288	/* since *below* originator, no need to update top */
1386	originator->below = op;	1289	originator->below = op;
1387	}	1290	}
1388	else	1291	else
…		…
1434	* If INS_ON_TOP is used, don't do this processing	1337	* If INS_ON_TOP is used, don't do this processing
1435	* Need to find the object that in fact blocks view, otherwise	1338	* Need to find the object that in fact blocks view, otherwise
1436	* stacking is a bit odd.	1339	* stacking is a bit odd.
1437	*/	1340	*/
1438	if (!(flag & INS_ON_TOP) &&	1341	if (!(flag & INS_ON_TOP) &&
1439	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1440	{	1343	{
1441	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1442	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1443	break;	1346	break;
1444	/* Check to see if we found the object that blocks view,	1347	/* Check to see if we found the object that blocks view,
…		…
1467		1370
1468	if (op->above)	1371	if (op->above)
1469	op->above->below = op;	1372	op->above->below = op;
1470		1373
1471	op->below = NULL;	1374	op->below = NULL;
1472	SET_MAP_OB (op->map, op->x, op->y, op);	1375	op->ms ().bottom = op;
1473	}	1376	}
1474	else	1377	else
1475	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1476	op->above = top->above;	1379	op->above = top->above;
1477		1380
…		…
1481	op->below = top;	1384	op->below = top;
1482	top->above = op;	1385	top->above = op;
1483	}	1386	}
1484		1387
1485	if (op->above == NULL)	1388	if (op->above == NULL)
1486	SET_MAP_TOP (op->map, op->x, op->y, op);	1389	op->ms ().top = op;
1487	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1488		1391
1489	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
1490	op->contr->do_los = 1;	1393	op->contr->do_los = 1;
1491		1394
1492	/* If we have a floor, we know the player, if any, will be above	1395	/* If we have a floor, we know the player, if any, will be above
1493	* it, so save a few ticks and start from there.	1396	* it, so save a few ticks and start from there.
1494	*/	1397	*/
1495	if (!(flag & INS_MAP_LOAD))	1398	if (!(flag & INS_MAP_LOAD))
1496	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1399	if (object *pl = op->ms ().player ())
1497	if (tmp->type == PLAYER)	1400	if (pl->contr->ns)
1498	tmp->contr->socket.update_look = 1;	1401	pl->contr->ns->floorbox_update ();
1499		1402
1500	/* If this object glows, it may affect lighting conditions that are	1403	/* If this object glows, it may affect lighting conditions that are
1501	* visible to others on this map. But update_all_los is really	1404	* visible to others on this map. But update_all_los is really
1502	* an inefficient way to do this, as it means los for all players	1405	* an inefficient way to do this, as it means los for all players
1503	* on the map will get recalculated. The players could very well	1406	* on the map will get recalculated. The players could very well
…		…
1510	update_all_los (op->map, op->x, op->y);	1413	update_all_los (op->map, op->x, op->y);
1511		1414
1512	/* updates flags (blocked, alive, no magic, etc) for this map space */	1415	/* updates flags (blocked, alive, no magic, etc) for this map space */
1513	update_object (op, UP_OBJ_INSERT);	1416	update_object (op, UP_OBJ_INSERT);
1514		1417
		1418	INVOKE_OBJECT (INSERT, op);
		1419
1515	/* Don't know if moving this to the end will break anything. However,	1420	/* Don't know if moving this to the end will break anything. However,
1516	* we want to have update_look set above before calling this.	1421	* we want to have floorbox_update called before calling this.
1517	*	1422	*
1518	* check_move_on() must be after this because code called from	1423	* check_move_on() must be after this because code called from
1519	* check_move_on() depends on correct map flags (so functions like	1424	* check_move_on() depends on correct map flags (so functions like
1520	* blocked() and wall() work properly), and these flags are updated by	1425	* blocked() and wall() work properly), and these flags are updated by
1521	* update_object().	1426	* update_object().
…		…
1523		1428
1524	/* if this is not the head or flag has been passed, don't check walk on status */	1429	/* if this is not the head or flag has been passed, don't check walk on status */
1525	if (!(flag & INS_NO_WALK_ON) && !op->head)	1430	if (!(flag & INS_NO_WALK_ON) && !op->head)
1526	{	1431	{
1527	if (check_move_on (op, originator))	1432	if (check_move_on (op, originator))
1528	return NULL;	1433	return 0;
1529		1434
1530	/* If we are a multi part object, lets work our way through the check	1435	/* If we are a multi part object, lets work our way through the check
1531	* walk on's.	1436	* walk on's.
1532	*/	1437	*/
1533	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1534	if (check_move_on (tmp, originator))	1439	if (check_move_on (tmp, originator))
1535	return NULL;	1440	return 0;
1536	}	1441	}
1537		1442
1538	return op;	1443	return op;
1539	}	1444	}
1540		1445
1541	/* this function inserts an object in the map, but if it	1446	/* this function inserts an object in the map, but if it
1542	* finds an object of its own type, it'll remove that one first.	1447	* finds an object of its own type, it'll remove that one first.
1543	* op is the object to insert it under: supplies x and the map.	1448	* op is the object to insert it under: supplies x and the map.
1544	*/	1449	*/
1545	void	1450	void
1546	replace_insert_ob_in_map (const char *arch_string, object *op)	1451	replace_insert_ob_in_map (const char *arch_string, object *op)
1547	{	1452	{
1548	object *	1453	object *tmp, *tmp1;
1549	tmp;
1550	object *
1551	tmp1;
1552		1454
1553	/* first search for itself and remove any old instances */	1455	/* first search for itself and remove any old instances */
1554		1456
1555	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1556	{
1557	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558	{	1459	tmp->destroy ();
1559	remove_ob (tmp);
1560	free_object (tmp);
1561	}
1562	}
1563		1460
1564	tmp1 = arch_to_object (archetype::find (arch_string));	1461	tmp1 = arch_to_object (archetype::find (arch_string));
1565		1462
1566	tmp1->x = op->x;	1463	tmp1->x = op->x;
1567	tmp1->y = op->y;	1464	tmp1->y = op->y;
…		…
1577	*/	1474	*/
1578		1475
1579	object *	1476	object *
1580	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1581	{	1478	{
1582	object *	1479	object *newob;
1583	newob;
1584	int
1585	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586		1481
1587	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1588	{	1483	{
1589	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1484	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590	return NULL;	1485	return NULL;
1591	}	1486	}
1592		1487
1593	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
1594		1489
1595	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1596	{	1491	orig_ob->destroy (1);
1597	if (!is_removed)
1598	remove_ob (orig_ob);
1599	free_object2 (orig_ob, 1);
1600	}
1601	else if (!is_removed)	1492	else if (!is_removed)
1602	{	1493	{
1603	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1604	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1605	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1496	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1625		1516
1626	object *	1517	object *
1627	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1628	{	1519	{
1629	object *tmp;	1520	object *tmp;
1630	player *pl;
1631		1521
1632	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1633	return op;	1523	return op;
1634		1524
1635	if (i > op->nrof)	1525	if (i > op->nrof)
1636	i = op->nrof;	1526	i = op->nrof;
1637		1527
1638	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1639	op->nrof -= i;	1529	op->nrof -= i;
1640	else if (op->env != NULL)	1530	else if (op->env)
1641	{	1531	{
1642	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1643	* therein?	1533	* therein?
1644	*/	1534	*/
1645	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1646	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1647	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1648	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1649	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1650	* and then searching the map for a player.	1540	* and then searching the map for a player.
1651	*/	1541	*/
1652	if (!tmp)	1542	if (!tmp)
1653	{	1543	for_all_players (pl)
1654	for (pl = first_player; pl; pl = pl->next)
1655	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1656	break;	1547	break;
1657	if (pl)
1658	tmp = pl->ob;
1659	else
1660	tmp = NULL;
1661	}	1548	}
1662		1549
1663	if (i < op->nrof)	1550	if (i < op->nrof)
1664	{	1551	{
1665	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1666	op->nrof -= i;	1553	op->nrof -= i;
1667	if (tmp)	1554	if (tmp)
1668	{
1669	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1670	}
1671	}	1556	}
1672	else	1557	else
1673	{	1558	{
1674	remove_ob (op);	1559	op->remove ();
1675	op->nrof = 0;	1560	op->nrof = 0;
1676	if (tmp)	1561	if (tmp)
1677	{
1678	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1679	}
1680	}	1563	}
1681	}	1564	}
1682	else	1565	else
1683	{	1566	{
1684	object *above = op->above;	1567	object *above = op->above;
1685		1568
1686	if (i < op->nrof)	1569	if (i < op->nrof)
1687	op->nrof -= i;	1570	op->nrof -= i;
1688	else	1571	else
1689	{	1572	{
1690	remove_ob (op);	1573	op->remove ();
1691	op->nrof = 0;	1574	op->nrof = 0;
1692	}	1575	}
1693		1576
1694	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1695	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1696	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1697	{	1580	{
1698	if (op->nrof)	1581	if (op->nrof)
1699	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1700	else	1583	else
…		…
1704		1587
1705	if (op->nrof)	1588	if (op->nrof)
1706	return op;	1589	return op;
1707	else	1590	else
1708	{	1591	{
1709	free_object (op);	1592	op->destroy ();
1710	return NULL;	1593	return 0;
1711	}	1594	}
1712	}	1595	}
1713		1596
1714	/*	1597	/*
1715	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1727	op->carrying += weight;	1610	op->carrying += weight;
1728	op = op->env;	1611	op = op->env;
1729	}	1612	}
1730	}	1613	}
1731		1614
1732	/*
1733	* insert_ob_in_ob(op,environment):
1734	* This function inserts the object op in the linked list
1735	* inside the object environment.
1736	*
1737	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738	* the inventory at the last position or next to other objects of the same
1739	* type.
1740	* Frank: Now sorted by type, archetype and magic!
1741	*
1742	* The function returns now pointer to inserted item, and return value can
1743	* be != op, if items are merged. -Tero
1744	*/
1745
1746	object *	1615	object *
1747	insert_ob_in_ob (object *op, object *where)	1616	insert_ob_in_ob (object *op, object *where)
1748	{	1617	{
1749	object *	1618	if (!where)
1750	tmp, *
1751	otmp;
1752
1753	if (!QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	char *dump = dump_object (op);
1756	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757	free (dump);
1758	return op;
1759	}
1760
1761	if (where == NULL)
1762	{	1619	{
1763	char *dump = dump_object (op);	1620	char *dump = dump_object (op);
1764	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765	free (dump);	1622	free (dump);
1766	return op;	1623	return op;
1767	}	1624	}
1768		1625
1769	if (where->head)	1626	if (where->head)
1770	{	1627	{
1771	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772	where = where->head;	1629	where = where->head;
1773	}	1630	}
		1631
		1632	return where->insert (op);
		1633	}
		1634
		1635	/*
		1636	* env->insert (op)
		1637	* This function inserts the object op in the linked list
		1638	* inside the object environment.
		1639	*
		1640	* The function returns now pointer to inserted item, and return value can
		1641	* be != op, if items are merged. -Tero
		1642	*/
		1643
		1644	object *
		1645	object::insert (object *op)
		1646	{
		1647	object *tmp, *otmp;
		1648
		1649	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1650	op->remove ();
1774		1651
1775	if (op->more)	1652	if (op->more)
1776	{	1653	{
1777	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1654	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778	return op;	1655	return op;
…		…
1780		1657
1781	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1783	if (op->nrof)	1660	if (op->nrof)
1784	{	1661	{
1785	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1787	{	1664	{
1788	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1789	(client needs the original object) */	1666	(client needs the original object) */
1790	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1791	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
1792	* tmp->nrof, we need to increase the weight.	1669	* tmp->nrof, we need to increase the weight.
1793	*/	1670	*/
1794	add_weight (where, op->weight * op->nrof);	1671	add_weight (this, op->weight * op->nrof);
1795	SET_FLAG (op, FLAG_REMOVED);	1672	SET_FLAG (op, FLAG_REMOVED);
1796	free_object (op); /* free the inserted object */	1673	op->destroy (); /* free the inserted object */
1797	op = tmp;	1674	op = tmp;
1798	remove_ob (op); /* and fix old object's links */	1675	op->remove (); /* and fix old object's links */
1799	CLEAR_FLAG (op, FLAG_REMOVED);	1676	CLEAR_FLAG (op, FLAG_REMOVED);
1800	break;	1677	break;
1801	}	1678	}
1802		1679
1803	/* I assume combined objects have no inventory	1680	/* I assume combined objects have no inventory
1804	* We add the weight - this object could have just been removed	1681	* We add the weight - this object could have just been removed
1805	* (if it was possible to merge). calling remove_ob will subtract	1682	* (if it was possible to merge). calling remove_ob will subtract
1806	* the weight, so we need to add it in again, since we actually do	1683	* the weight, so we need to add it in again, since we actually do
1807	* the linking below	1684	* the linking below
1808	*/	1685	*/
1809	add_weight (where, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1810	}	1687	}
1811	else	1688	else
1812	add_weight (where, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1813		1690
1814	otmp = is_player_inv (where);	1691	otmp = this->in_player ();
1815	if (otmp && otmp->contr != NULL)	1692	if (otmp && otmp->contr)
1816	{
1817	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818	fix_player (otmp);	1694	otmp->update_stats ();
1819	}
1820		1695
1821	op->map = NULL;	1696	op->map = 0;
1822	op->env = where;	1697	op->env = this;
1823	op->above = NULL;	1698	op->above = 0;
1824	op->below = NULL;	1699	op->below = 0;
1825	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1826		1701
1827	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1828	if ((op->glow_radius != 0) && where->map)	1703	if ((op->glow_radius != 0) && map)
1829	{	1704	{
1830	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1831	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1833	if (MAP_DARKNESS (where->map))	1708	if (MAP_DARKNESS (map))
1834	update_all_los (where->map, where->x, where->y);	1709	update_all_los (map, x, y);
1835	}	1710	}
1836		1711
1837	/* Client has no idea of ordering so lets not bother ordering it here.	1712	/* Client has no idea of ordering so lets not bother ordering it here.
1838	* It sure simplifies this function...	1713	* It sure simplifies this function...
1839	*/	1714	*/
1840	if (where->inv == NULL)	1715	if (!inv)
1841	where->inv = op;	1716	inv = op;
1842	else	1717	else
1843	{	1718	{
1844	op->below = where->inv;	1719	op->below = inv;
1845	op->below->above = op;	1720	op->below->above = op;
1846	where->inv = op;	1721	inv = op;
1847	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
		1725
1848	return op;	1726	return op;
1849	}	1727	}
1850		1728
1851	/*	1729	/*
1852	* Checks if any objects has a move_type that matches objects	1730	* Checks if any objects has a move_type that matches objects
…		…
2041	* str is the string to match against. Note that we match against	1919	* str is the string to match against. Note that we match against
2042	* the object name, not the archetype name. this is so that the	1920	* the object name, not the archetype name. this is so that the
2043	* spell code can use one object type (force), but change it's name	1921	* spell code can use one object type (force), but change it's name
2044	* to be unique.	1922	* to be unique.
2045	*/	1923	*/
2046
2047	object *	1924	object *
2048	present_in_ob_by_name (int type, const char *str, const object *op)	1925	present_in_ob_by_name (int type, const char *str, const object *op)
2049	{	1926	{
2050	object *	1927	object *tmp;
2051	tmp;
2052		1928
2053	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1929	for (tmp = op->inv; tmp; tmp = tmp->below)
2054	{
2055	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2056	return tmp;	1931	return tmp;
2057	}	1932
2058	return NULL;	1933	return 0;
2059	}	1934	}
2060		1935
2061	/*	1936	/*
2062	* present_arch_in_ob(archetype, object) searches for any objects with	1937	* present_arch_in_ob(archetype, object) searches for any objects with
2063	* a matching archetype in the inventory of the given object.	1938	* a matching archetype in the inventory of the given object.
2064	* The first matching object is returned, or NULL if none.	1939	* The first matching object is returned, or NULL if none.
2065	*/	1940	*/
2066
2067	object *	1941	object *
2068	present_arch_in_ob (const archetype *at, const object *op)	1942	present_arch_in_ob (const archetype *at, const object *op)
2069	{	1943	{
2070	object *
2071	tmp;
2072
2073	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2074	if (tmp->arch == at)	1945	if (tmp->arch == at)
2075	return tmp;	1946	return tmp;
		1947
2076	return NULL;	1948	return NULL;
2077	}	1949	}
2078		1950
2079	/*	1951	/*
2080	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
2081	*/	1953	*/
2082	void	1954	void
2083	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
2084	{	1956	{
2085	object *
2086	tmp;
2087
2088	if (op->inv)	1957	if (op->inv)
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2090	{	1959	{
2091	SET_FLAG (tmp, flag);	1960	SET_FLAG (tmp, flag);
2092	flag_inv (tmp, flag);	1961	flag_inv (tmp, flag);
2093	}	1962	}
2094	} /*	1963	}
		1964
		1965	/*
2095	* desactivate recursively a flag on an object inventory	1966	* deactivate recursively a flag on an object inventory
2096	*/	1967	*/
2097	void	1968	void
2098	unflag_inv (object *op, int flag)	1969	unflag_inv (object *op, int flag)
2099	{	1970	{
2100	object *
2101	tmp;
2102
2103	if (op->inv)	1971	if (op->inv)
2104	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2105	{	1973	{
2106	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
2107	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
2108	}	1976	}
2109	}	1977	}
…		…
2112	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2113	* all it's inventory (recursively).	1981	* all it's inventory (recursively).
2114	* If checksums are used, a player will get set_cheat called for	1982	* If checksums are used, a player will get set_cheat called for
2115	* him/her-self and all object carried by a call to this function.	1983	* him/her-self and all object carried by a call to this function.
2116	*/	1984	*/
2117
2118	void	1985	void
2119	set_cheat (object *op)	1986	set_cheat (object *op)
2120	{	1987	{
2121	SET_FLAG (op, FLAG_WAS_WIZ);	1988	SET_FLAG (op, FLAG_WAS_WIZ);
2122	flag_inv (op, FLAG_WAS_WIZ);	1989	flag_inv (op, FLAG_WAS_WIZ);
…		…
2141	* because arch_blocked (now ob_blocked) needs to know the movement type	2008	* because arch_blocked (now ob_blocked) needs to know the movement type
2142	* to know if the space in question will block the object. We can't use	2009	* to know if the space in question will block the object. We can't use
2143	* the archetype because that isn't correct if the monster has been	2010	* the archetype because that isn't correct if the monster has been
2144	* customized, changed states, etc.	2011	* customized, changed states, etc.
2145	*/	2012	*/
2146
2147	int	2013	int
2148	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2014	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2149	{	2015	{
2150	int
2151	i,
2152	index = 0, flag;	2016	int index = 0, flag;
2153	static int
2154	altern[SIZEOFFREE];	2017	int altern[SIZEOFFREE];
2155		2018
2156	for (i = start; i < stop; i++)	2019	for (int i = start; i < stop; i++)
2157	{	2020	{
2158	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2021	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2159	if (!flag)	2022	if (!flag)
2160	altern[index++] = i;	2023	altern [index++] = i;
2161		2024
2162	/* Basically, if we find a wall on a space, we cut down the search size.	2025	/* Basically, if we find a wall on a space, we cut down the search size.
2163	* In this way, we won't return spaces that are on another side of a wall.	2026	* In this way, we won't return spaces that are on another side of a wall.
2164	* This mostly work, but it cuts down the search size in all directions -	2027	* This mostly work, but it cuts down the search size in all directions -
2165	* if the space being examined only has a wall to the north and empty	2028	* if the space being examined only has a wall to the north and empty
2166	* spaces in all the other directions, this will reduce the search space	2029	* spaces in all the other directions, this will reduce the search space
2167	* to only the spaces immediately surrounding the target area, and	2030	* to only the spaces immediately surrounding the target area, and
2168	* won't look 2 spaces south of the target space.	2031	* won't look 2 spaces south of the target space.
2169	*/	2032	*/
2170	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2033	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2171	stop = maxfree[i];	2034	stop = maxfree[i];
2172	}	2035	}
		2036
2173	if (!index)	2037	if (!index)
2174	return -1;	2038	return -1;
		2039
2175	return altern[RANDOM () % index];	2040	return altern[RANDOM () % index];
2176	}	2041	}
2177		2042
2178	/*	2043	/*
2179	* find_first_free_spot(archetype, maptile, x, y) works like	2044	* find_first_free_spot(archetype, maptile, x, y) works like
2180	* find_free_spot(), but it will search max number of squares.	2045	* find_free_spot(), but it will search max number of squares.
2181	* But it will return the first available spot, not a random choice.	2046	* But it will return the first available spot, not a random choice.
2182	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2047	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2183	*/	2048	*/
2184
2185	int	2049	int
2186	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2050	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2187	{	2051	{
2188	int
2189	i;
2190
2191	for (i = 0; i < SIZEOFFREE; i++)	2052	for (int i = 0; i < SIZEOFFREE; i++)
2192	{
2193	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2053	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2194	return i;	2054	return i;
2195	}	2055
2196	return -1;	2056	return -1;
2197	}	2057	}
2198		2058
2199	/*	2059	/*
2200	* The function permute(arr, begin, end) randomly reorders the array	2060	* The function permute(arr, begin, end) randomly reorders the array
2201	* arr[begin..end-1].	2061	* arr[begin..end-1].
		2062	* now uses a fisher-yates shuffle, old permute was broken
2202	*/	2063	*/
2203	static void	2064	static void
2204	permute (int *arr, int begin, int end)	2065	permute (int *arr, int begin, int end)
2205	{	2066	{
2206	int	2067	arr += begin;
2207	i,
2208	j,
2209	tmp,
2210	len;
2211
2212	len = end - begin;	2068	end -= begin;
2213	for (i = begin; i < end; i++)
2214	{
2215	j = begin + RANDOM () % len;
2216		2069
2217	tmp = arr[i];	2070	while (--end)
2218	arr[i] = arr[j];	2071	swap (arr [end], arr [RANDOM () % (end + 1)]);
2219	arr[j] = tmp;
2220	}
2221	}	2072	}
2222		2073
2223	/* new function to make monster searching more efficient, and effective!	2074	/* new function to make monster searching more efficient, and effective!
2224	* This basically returns a randomized array (in the passed pointer) of	2075	* This basically returns a randomized array (in the passed pointer) of
2225	* the spaces to find monsters. In this way, it won't always look for	2076	* the spaces to find monsters. In this way, it won't always look for
…		…
2228	* the 3x3 area will be searched, just not in a predictable order.	2079	* the 3x3 area will be searched, just not in a predictable order.
2229	*/	2080	*/
2230	void	2081	void
2231	get_search_arr (int *search_arr)	2082	get_search_arr (int *search_arr)
2232	{	2083	{
2233	int	2084	int i;
2234	i;
2235		2085
2236	for (i = 0; i < SIZEOFFREE; i++)	2086	for (i = 0; i < SIZEOFFREE; i++)
2237	{
2238	search_arr[i] = i;	2087	search_arr[i] = i;
2239	}
2240		2088
2241	permute (search_arr, 1, SIZEOFFREE1 + 1);	2089	permute (search_arr, 1, SIZEOFFREE1 + 1);
2242	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2090	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2243	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2091	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2244	}	2092	}
…		…
2253	* Perhaps incorrectly, but I'm making the assumption that exclude	2101	* Perhaps incorrectly, but I'm making the assumption that exclude
2254	* is actually want is going to try and move there. We need this info	2102	* is actually want is going to try and move there. We need this info
2255	* because we have to know what movement the thing looking to move	2103	* because we have to know what movement the thing looking to move
2256	* there is capable of.	2104	* there is capable of.
2257	*/	2105	*/
2258
2259	int	2106	int
2260	find_dir (maptile *m, int x, int y, object *exclude)	2107	find_dir (maptile *m, int x, int y, object *exclude)
2261	{	2108	{
2262	int
2263	i,
2264	max = SIZEOFFREE, mflags;	2109	int i, max = SIZEOFFREE, mflags;
2265		2110
2266	sint16 nx, ny;	2111	sint16 nx, ny;
2267	object *	2112	object *tmp;
2268	tmp;
2269	maptile *	2113	maptile *mp;
2270	mp;
2271		2114
2272	MoveType blocked, move_type;	2115	MoveType blocked, move_type;
2273		2116
2274	if (exclude && exclude->head)	2117	if (exclude && exclude->head)
2275	{	2118	{
…		…
2287	mp = m;	2130	mp = m;
2288	nx = x + freearr_x[i];	2131	nx = x + freearr_x[i];
2289	ny = y + freearr_y[i];	2132	ny = y + freearr_y[i];
2290		2133
2291	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2134	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2135
2292	if (mflags & P_OUT_OF_MAP)	2136	if (mflags & P_OUT_OF_MAP)
2293	{
2294	max = maxfree[i];	2137	max = maxfree[i];
2295	}
2296	else	2138	else
2297	{	2139	{
2298	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2140	mapspace &ms = mp->at (nx, ny);
		2141
		2142	blocked = ms.move_block;
2299		2143
2300	if ((move_type & blocked) == move_type)	2144	if ((move_type & blocked) == move_type)
2301	{
2302	max = maxfree[i];	2145	max = maxfree[i];
2303	}
2304	else if (mflags & P_IS_ALIVE)	2146	else if (mflags & P_IS_ALIVE)
2305	{	2147	{
2306	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)
2307	{	2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2308	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2309	{
2310	break;	2151	break;
2311	}	2152
2312	}
2313	if (tmp)	2153	if (tmp)
2314	{
2315	return freedir[i];	2154	return freedir[i];
2316	}
2317	}	2155	}
2318	}	2156	}
2319	}	2157	}
		2158
2320	return 0;	2159	return 0;
2321	}	2160	}
2322		2161
2323	/*	2162	/*
2324	* distance(object 1, object 2) will return the square of the	2163	* distance(object 1, object 2) will return the square of the
2325	* distance between the two given objects.	2164	* distance between the two given objects.
2326	*/	2165	*/
2327
2328	int	2166	int
2329	distance (const object *ob1, const object *ob2)	2167	distance (const object *ob1, const object *ob2)
2330	{	2168	{
2331	int
2332	i;
2333
2334	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2169	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2335	return i;
2336	}	2170	}
2337		2171
2338	/*	2172	/*
2339	* find_dir_2(delta-x,delta-y) will return a direction in which	2173	* find_dir_2(delta-x,delta-y) will return a direction in which
2340	* an object which has subtracted the x and y coordinates of another	2174	* an object which has subtracted the x and y coordinates of another
2341	* object, needs to travel toward it.	2175	* object, needs to travel toward it.
2342	*/	2176	*/
2343
2344	int	2177	int
2345	find_dir_2 (int x, int y)	2178	find_dir_2 (int x, int y)
2346	{	2179	{
2347	int	2180	int q;
2348	q;
2349		2181
2350	if (y)	2182	if (y)
2351	q = x * 100 / y;	2183	q = x * 100 / y;
2352	else if (x)	2184	else if (x)
2353	q = -300 * x;	2185	q = -300 * x;
…		…
2388	int	2220	int
2389	absdir (int d)	2221	absdir (int d)
2390	{	2222	{
2391	while (d < 1)	2223	while (d < 1)
2392	d += 8;	2224	d += 8;
		2225
2393	while (d > 8)	2226	while (d > 8)
2394	d -= 8;	2227	d -= 8;
		2228
2395	return d;	2229	return d;
2396	}	2230	}
2397		2231
2398	/*	2232	/*
2399	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2401	*/	2235	*/
2402		2236
2403	int	2237	int
2404	dirdiff (int dir1, int dir2)	2238	dirdiff (int dir1, int dir2)
2405	{	2239	{
2406	int	2240	int d;
2407	d;
2408		2241
2409	d = abs (dir1 - dir2);	2242	d = abs (dir1 - dir2);
2410	if (d > 4)	2243	if (d > 4)
2411	d = 8 - d;	2244	d = 8 - d;
		2245
2412	return d;	2246	return d;
2413	}	2247	}
2414		2248
2415	/* peterm:	2249	/* peterm:
2416	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2250	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2419	* This basically means that if direction is 15, then it could either go	2253	* This basically means that if direction is 15, then it could either go
2420	* direction 4, 14, or 16 to get back to where we are.	2254	* direction 4, 14, or 16 to get back to where we are.
2421	* Moved from spell_util.c to object.c with the other related direction	2255	* Moved from spell_util.c to object.c with the other related direction
2422	* functions.	2256	* functions.
2423	*/	2257	*/
2424
2425	int
2426	reduction_dir[SIZEOFFREE][3] = {	2258	int reduction_dir[SIZEOFFREE][3] = {
2427	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2428	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2429	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2430	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2431	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2479	* find a path to that monster that we found. If not,	2311	* find a path to that monster that we found. If not,
2480	* we don't bother going toward it. Returns 1 if we	2312	* we don't bother going toward it. Returns 1 if we
2481	* can see a direct way to get it	2313	* can see a direct way to get it
2482	* Modified to be map tile aware -.MSW	2314	* Modified to be map tile aware -.MSW
2483	*/	2315	*/
2484
2485
2486	int	2316	int
2487	can_see_monsterP (maptile *m, int x, int y, int dir)	2317	can_see_monsterP (maptile *m, int x, int y, int dir)
2488	{	2318	{
2489	sint16 dx, dy;	2319	sint16 dx, dy;
2490	int
2491	mflags;	2320	int mflags;
2492		2321
2493	if (dir < 0)	2322	if (dir < 0)
2494	return 0; /* exit condition: invalid direction */	2323	return 0; /* exit condition: invalid direction */
2495		2324
2496	dx = x + freearr_x[dir];	2325	dx = x + freearr_x[dir];
…		…
2509	return 0;	2338	return 0;
2510		2339
2511	/* yes, can see. */	2340	/* yes, can see. */
2512	if (dir < 9)	2341	if (dir < 9)
2513	return 1;	2342	return 1;
		2343
2514	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2344	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2515	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2345	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2346	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2516	}	2347	}
2517
2518
2519		2348
2520	/*	2349	/*
2521	* can_pick(picker, item): finds out if an object is possible to be	2350	* can_pick(picker, item): finds out if an object is possible to be
2522	* picked up by the picker. Returnes 1 if it can be	2351	* picked up by the picker. Returnes 1 if it can be
2523	* picked up, otherwise 0.	2352	* picked up, otherwise 0.
…		…
2534	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2363	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2535	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2364	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2536	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2365	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2537	}	2366	}
2538		2367
2539
2540	/*	2368	/*
2541	* create clone from object to another	2369	* create clone from object to another
2542	*/	2370	*/
2543	object *	2371	object *
2544	object_create_clone (object *asrc)	2372	object_create_clone (object *asrc)
2545	{	2373	{
2546	object *
2547	dst = NULL, *tmp, *src, *part, *prev, *item;	2374	object *dst = 0, *tmp, *src, *part, *prev, *item;
2548		2375
2549	if (!asrc)	2376	if (!asrc)
2550	return NULL;	2377	return 0;
		2378
2551	src = asrc;	2379	src = asrc;
2552	if (src->head)	2380	if (src->head)
2553	src = src->head;	2381	src = src->head;
2554		2382
2555	prev = NULL;	2383	prev = 0;
2556	for (part = src; part; part = part->more)	2384	for (part = src; part; part = part->more)
2557	{	2385	{
2558	tmp = get_object ();	2386	tmp = part->clone ();
2559	copy_object (part, tmp);
2560	tmp->x -= src->x;	2387	tmp->x -= src->x;
2561	tmp->y -= src->y;	2388	tmp->y -= src->y;
		2389
2562	if (!part->head)	2390	if (!part->head)
2563	{	2391	{
2564	dst = tmp;	2392	dst = tmp;
2565	tmp->head = NULL;	2393	tmp->head = 0;
2566	}	2394	}
2567	else	2395	else
2568	{
2569	tmp->head = dst;	2396	tmp->head = dst;
2570	}	2397
2571	tmp->more = NULL;	2398	tmp->more = 0;
		2399
2572	if (prev)	2400	if (prev)
2573	prev->more = tmp;	2401	prev->more = tmp;
		2402
2574	prev = tmp;	2403	prev = tmp;
2575	}	2404	}
2576		2405
2577	for (item = src->inv; item; item = item->below)	2406	for (item = src->inv; item; item = item->below)
2578	insert_ob_in_ob (object_create_clone (item), dst);	2407	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2584	/* Basically, we save the content of the string to a temp file, then call */	2413	/* Basically, we save the content of the string to a temp file, then call */
2585	/* load_object on it. I admit it is a highly inefficient way to make things, */	2414	/* load_object on it. I admit it is a highly inefficient way to make things, */
2586	/* but it was simple to make and allows reusing the load_object function. */	2415	/* but it was simple to make and allows reusing the load_object function. */
2587	/* Remember not to use load_object_str in a time-critical situation. */	2416	/* Remember not to use load_object_str in a time-critical situation. */
2588	/* Also remember that multiparts objects are not supported for now. */	2417	/* Also remember that multiparts objects are not supported for now. */
2589
2590	object *	2418	object *
2591	load_object_str (const char *obstr)	2419	load_object_str (const char *obstr)
2592	{	2420	{
2593	object *op;	2421	object *op;
2594	char filename[MAX_BUF];	2422	char filename[MAX_BUF];
…		…
2604	}	2432	}
2605		2433
2606	fprintf (tempfile, obstr);	2434	fprintf (tempfile, obstr);
2607	fclose (tempfile);	2435	fclose (tempfile);
2608		2436
2609	op = get_object ();	2437	op = object::create ();
2610		2438
2611	object_thawer thawer (filename);	2439	object_thawer thawer (filename);
2612		2440
2613	if (thawer)	2441	if (thawer)
2614	load_object (thawer, op, 0);	2442	load_object (thawer, op, 0);
…		…
2624	* returns NULL if no match.	2452	* returns NULL if no match.
2625	*/	2453	*/
2626	object *	2454	object *
2627	find_obj_by_type_subtype (const object *who, int type, int subtype)	2455	find_obj_by_type_subtype (const object *who, int type, int subtype)
2628	{	2456	{
2629	object *tmp;
2630
2631	for (tmp = who->inv; tmp; tmp = tmp->below)	2457	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2632	if (tmp->type == type && tmp->subtype == subtype)	2458	if (tmp->type == type && tmp->subtype == subtype)
2633	return tmp;	2459	return tmp;
2634		2460
2635	return NULL;	2461	return 0;
2636	}	2462	}
2637		2463
2638	/* If ob has a field named key, return the link from the list,	2464	/* If ob has a field named key, return the link from the list,
2639	* otherwise return NULL.	2465	* otherwise return NULL.
2640	*	2466	*
…		…
2642	* do the desired thing.	2468	* do the desired thing.
2643	*/	2469	*/
2644	key_value *	2470	key_value *
2645	get_ob_key_link (const object *ob, const char *key)	2471	get_ob_key_link (const object *ob, const char *key)
2646	{	2472	{
2647	key_value *link;
2648
2649	for (link = ob->key_values; link != NULL; link = link->next)	2473	for (key_value *link = ob->key_values; link; link = link->next)
2650	if (link->key == key)	2474	if (link->key == key)
2651	return link;	2475	return link;
2652		2476
2653	return NULL;	2477	return 0;
2654	}	2478	}
2655		2479
2656	/*	2480	/*
2657	* Returns the value of op has an extra_field for key, or NULL.	2481	* Returns the value of op has an extra_field for key, or NULL.
2658	*	2482	*
…		…
2698	* Returns TRUE on success.	2522	* Returns TRUE on success.
2699	*/	2523	*/
2700	int	2524	int
2701	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2525	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2702	{	2526	{
2703	key_value *
2704	field = NULL, *last = NULL;	2527	key_value *field = NULL, *last = NULL;
2705		2528
2706	for (field = op->key_values; field != NULL; field = field->next)	2529	for (field = op->key_values; field != NULL; field = field->next)
2707	{	2530	{
2708	if (field->key != canonical_key)	2531	if (field->key != canonical_key)
2709	{	2532	{
…		…
2737	/* IF we get here, key doesn't exist */	2560	/* IF we get here, key doesn't exist */
2738		2561
2739	/* No field, we'll have to add it. */	2562	/* No field, we'll have to add it. */
2740		2563
2741	if (!add_key)	2564	if (!add_key)
2742	{
2743	return FALSE;	2565	return FALSE;
2744	}	2566
2745	/* There isn't any good reason to store a null	2567	/* There isn't any good reason to store a null
2746	* value in the key/value list. If the archetype has	2568	* value in the key/value list. If the archetype has
2747	* this key, then we should also have it, so shouldn't	2569	* this key, then we should also have it, so shouldn't
2748	* be here. If user wants to store empty strings,	2570	* be here. If user wants to store empty strings,
2749	* should pass in ""	2571	* should pass in ""

Diff Legend

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