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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
…		…
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	return ((unsigned int)i) < objects.size ()
401	if (op->count == i)	401	? objects [i]
402	return op;	402	: 0;
403
404	return 0;
405	}	403	}
406		404
407	/*	405	/*
408	* Returns the first object which has a name equal to the argument.	406	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	407	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	408	* Enables features like "patch <name-of-other-player> food 999"
411	*/	409	*/
412
413	object *	410	object *
414	find_object_name (const char *str)	411	find_object_name (const char *str)
415	{	412	{
416	shstr_cmp str_ (str);	413	shstr_cmp str_ (str);
417	object *op;	414	object *op;
418		415
419	for (op = object::first; op != NULL; op = op->next)	416	for_all_objects (op)
420	if (op->name == str_)	417	if (op->name == str_)
421	break;	418	break;
422		419
423	return op;	420	return op;
424	}	421	}
…		…
467	}	464	}
468		465
469	op->key_values = 0;	466	op->key_values = 0;
470	}	467	}
471		468
472	void object::clear ()
473	{
474	attachable_base::clear ();
475
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*	469	/*
515	* copy_to first frees everything allocated by the dst object,	470	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second	471	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any	472	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
524	{	479	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527		482
528	*(object_copy *)dst = *this;	483	*(object_copy *)dst = *this;
529	*(object_pod *)dst = *this;
530
531	if (self || cb)
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533		484
534	if (is_freed)	485	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);	486	SET_FLAG (dst, FLAG_FREED);
536		487
537	if (is_removed)	488	if (is_removed)
…		…
568	tail = new_link;	519	tail = new_link;
569	}	520	}
570	}	521	}
571	}	522	}
572		523
573	update_ob_speed (dst);	524	dst->set_speed (dst->speed);
574	}	525	}
575		526
576	object *	527	object *
577	object::clone ()	528	object::clone ()
578	{	529	{
…		…
584	/*	535	/*
585	* If an object with the IS_TURNABLE() flag needs to be turned due	536	* If an object with the IS_TURNABLE() flag needs to be turned due
586	* to the closest player being on the other side, this function can	537	* to the closest player being on the other side, this function can
587	* be called to update the face variable, _and_ how it looks on the map.	538	* be called to update the face variable, _and_ how it looks on the map.
588	*/	539	*/
589
590	void	540	void
591	update_turn_face (object *op)	541	update_turn_face (object *op)
592	{	542	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	544	return;
		545
595	SET_ANIMATION (op, op->direction);	546	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	547	update_object (op, UP_OBJ_FACE);
597	}	548	}
598		549
599	/*	550	/*
600	* Updates the speed of an object. If the speed changes from 0 to another	551	* Updates the speed of an object. If the speed changes from 0 to another
601	* value, or vice versa, then add/remove the object from the active list.	552	* value, or vice versa, then add/remove the object from the active list.
602	* This function needs to be called whenever the speed of an object changes.	553	* This function needs to be called whenever the speed of an object changes.
603	*/	554	*/
604	void	555	void
605	update_ob_speed (object *op)	556	object::set_speed (float speed)
606	{	557	{
607	extern int arch_init;	558	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	559	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	561	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	562	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		563
632	/* process_events() expects us to insert the object at the beginning	564	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		565
636	if (op->active_next != NULL)	566	if (has_active_speed ())
637	op->active_next->active_prev = op;	567	activate ();
638
639	active_objects = op;
640	}
641	else	568	else
642	{	569	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}
666
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}	570	}
697		571
698	/*	572	/*
699	* update_object() updates the the map.	573	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	574	* It takes into account invisible objects (and represent squares covered
…		…
737	*/	611	*/
738	if (!op->map || op->map->in_memory == MAP_SAVING)	612	if (!op->map || op->map->in_memory == MAP_SAVING)
739	return;	613	return;
740		614
741	/* make sure the object is within map boundaries */	615	/* make sure the object is within map boundaries */
742	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	616	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743	{	617	{
744	LOG (llevError, "update_object() called for object out of map!\n");	618	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	619	#ifdef MANY_CORES
746	abort ();	620	abort ();
747	#endif	621	#endif
748	return;	622	return;
749	}	623	}
750		624
751	mapspace &m = op->map->at (op->x, op->y);	625	mapspace &m = op->ms ();
752		626
753	if (m.flags_ & P_NEED_UPDATE)	627	if (!(m.flags_ & P_UPTODATE))
754	/* nop */;	628	/* nop */;
755	else if (action == UP_OBJ_INSERT)	629	else if (action == UP_OBJ_INSERT)
756	{	630	{
757	// this is likely overkill, TODO: revisit (schmorp)	631	// this is likely overkill, TODO: revisit (schmorp)
758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
767	/* This isn't perfect, but I don't expect a lot of objects to	641	/* This isn't perfect, but I don't expect a lot of objects to
768	* to have move_allow right now.	642	* to have move_allow right now.
769	*/	643	*/
770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	644	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	645	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
772	m.flags_ = P_NEED_UPDATE;	646	m.flags_ = 0;
773	}	647	}
774	/* if the object is being removed, we can't make intelligent	648	/* if the object is being removed, we can't make intelligent
775	* decisions, because remove_ob can't really pass the object	649	* decisions, because remove_ob can't really pass the object
776	* that is being removed.	650	* that is being removed.
777	*/	651	*/
778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	652	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779	m.flags_ = P_NEED_UPDATE;	653	m.flags_ = 0;
780	else if (action == UP_OBJ_FACE)	654	else if (action == UP_OBJ_FACE)
781	/* Nothing to do for that case */ ;	655	/* Nothing to do for that case */ ;
782	else	656	else
783	LOG (llevError, "update_object called with invalid action: %d\n", action);	657	LOG (llevError, "update_object called with invalid action: %d\n", action);
784		658
785	if (op->more)	659	if (op->more)
786	update_object (op->more, action);	660	update_object (op->more, action);
787	}	661	}
788		662
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used
791	object *object::first;	663	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804		664
805	object::object ()	665	object::object ()
806	{	666	{
807	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
808		668
…		…
815	free_key_values (this);	675	free_key_values (this);
816	}	676	}
817		677
818	void object::link ()	678	void object::link ()
819	{	679	{
820	count = ++ob_count;
821	uuid = gen_uuid ();	680	uuid = gen_uuid ();
822		681
823	prev = 0;	682	refcnt_inc ();
824	next = object::first;	683	objects.insert (this);
825
826	if (object::first)
827	object::first->prev = this;
828
829	object::first = this;
830	}	684	}
831		685
832	void object::unlink ()	686	void object::unlink ()
833	{	687	{
834	if (this == object::first)	688	objects.erase (this);
835	object::first = next;	689	refcnt_dec ();
		690	}
836		691
837	/* Remove this object from the list of used objects */	692	void
838	if (prev) prev->next = next;	693	object::activate ()
839	if (next) next->prev = prev;	694	{
		695	/* If already on active list, don't do anything */
		696	if (active)
		697	return;
840		698
841	prev = 0;	699	if (has_active_speed ())
842	next = 0;	700	actives.insert (this);
		701	}
		702
		703	void
		704	object::activate_recursive ()
		705	{
		706	activate ();
		707
		708	for (object *op = inv; op; op = op->below)
		709	op->activate_recursive ();
		710	}
		711
		712	/* This function removes object 'op' from the list of active
		713	* objects.
		714	* This should only be used for style maps or other such
		715	* reference maps where you don't want an object that isn't
		716	* in play chewing up cpu time getting processed.
		717	* The reverse of this is to call update_ob_speed, which
		718	* will do the right thing based on the speed of the object.
		719	*/
		720	void
		721	object::deactivate ()
		722	{
		723	/* If not on the active list, nothing needs to be done */
		724	if (!active)
		725	return;
		726
		727	actives.erase (this);
		728	}
		729
		730	void
		731	object::deactivate_recursive ()
		732	{
		733	for (object *op = inv; op; op = op->below)
		734	op->deactivate_recursive ();
		735
		736	deactivate ();
		737	}
		738
		739	void
		740	object::set_flag_inv (int flag, int value)
		741	{
		742	for (object *op = inv; op; op = op->below)
		743	{
		744	op->flag [flag] = value;
		745	op->set_flag_inv (flag, value);
		746	}
		747	}
		748
		749	/*
		750	* Remove and free all objects in the inventory of the given object.
		751	* object.c ?
		752	*/
		753	void
		754	object::destroy_inv (bool drop_to_ground)
		755	{
		756	// need to check first, because the checks below might segfault
		757	// as we might be on an invalid mapspace and crossfire code
		758	// is too buggy to ensure that the inventory is empty.
		759	// corollary: if you create arrows etc. with stuff in tis inventory,
		760	// cf will crash below with off-map x and y
		761	if (!inv)
		762	return;
		763
		764	/* Only if the space blocks everything do we not process -
		765	* if some form of movement is allowed, let objects
		766	* drop on that space.
		767	*/
		768	if (!drop_to_ground
		769	|| !map
		770	|| map->in_memory != MAP_IN_MEMORY
		771	|| ms ().move_block == MOVE_ALL)
		772	{
		773	while (inv)
		774	{
		775	inv->destroy_inv (drop_to_ground);
		776	inv->destroy ();
		777	}
		778	}
		779	else
		780	{ /* Put objects in inventory onto this space */
		781	while (inv)
		782	{
		783	object *op = inv;
		784
		785	if (op->flag [FLAG_STARTEQUIP]
		786	|| op->flag [FLAG_NO_DROP]
		787	|| op->type == RUNE
		788	|| op->type == TRAP
		789	|| op->flag [FLAG_IS_A_TEMPLATE]
		790	|| op->flag [FLAG_DESTROY_ON_DEATH])
		791	op->destroy ();
		792	else
		793	map->insert (op, x, y);
		794	}
		795	}
843	}	796	}
844		797
845	object *object::create ()	798	object *object::create ()
846	{	799	{
847	object *op = new object;	800	object *op = new object;
848	op->link ();	801	op->link ();
849	return op;	802	return op;
850	}	803	}
851		804
852	/*	805	void
853	* free_object() frees everything allocated by an object, removes	806	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	807	{
864	if (QUERY_FLAG (this, FLAG_FREED))	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])
865	return;	818	return;
866		819
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	set_speed (0);
868	remove_friendly_object (this);
869		821
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	822	flag [FLAG_FREED] = 1;
871	remove ();
872		823
873	SET_FLAG (this, FLAG_FREED);	824	attachable::do_destroy ();
874		825
875	if (more)	826	destroy_inv (true);
876	{	827	unlink ();
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880
881	if (inv)
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		828
923	// hack to ensure that freed objects still have a valid map	829	// hack to ensure that freed objects still have a valid map
924	{	830	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes	831	static maptile *freed_map; // freed objects are moved here to avoid crashes
926		832
…		…
930		836
931	freed_map->name = "/internal/freed_objects_map";	837	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	838	freed_map->width = 3;
933	freed_map->height = 3;	839	freed_map->height = 3;
934		840
935	freed_map->allocate ();	841	freed_map->alloc ();
		842	freed_map->in_memory = MAP_IN_MEMORY;
936	}	843	}
937		844
938	map = freed_map;	845	map = freed_map;
939	x = 1;	846	x = 1;
940	y = 1;	847	y = 1;
941	}	848	}
942		849
		850	head = 0;
		851
		852	if (more)
		853	{
		854	more->destroy ();
		855	more = 0;
		856	}
		857
943	// clear those pointers that likely might have circular references to us	858	// clear those pointers that likely might have circular references to us
944	owner = 0;	859	owner = 0;
945	enemy = 0;	860	enemy = 0;
946	attacked_by = 0;	861	attacked_by = 0;
		862	}
947		863
948	// only relevant for players(?), but make sure of it anyways	864	void
949	contr = 0;	865	object::destroy (bool destroy_inventory)
		866	{
		867	if (destroyed ())
		868	return;
950		869
951	/* Remove object from the active list */	870	if (destroy_inventory)
952	speed = 0;	871	destroy_inv (false);
953	update_ob_speed (this);
954		872
955	unlink ();	873	attachable::destroy ();
956
957	mortals.push_back (this);
958	}	874	}
959		875
960	/*	876	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	877	* sub_weight() recursively (outwards) subtracts a number from the
962	* weight of an object (and what is carried by it's environment(s)).	878	* weight of an object (and what is carried by it's environment(s)).
…		…
986	object::remove ()	902	object::remove ()
987	{	903	{
988	object *tmp, *last = 0;	904	object *tmp, *last = 0;
989	object *otmp;	905	object *otmp;
990		906
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	907	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	908	return;
995		909
996	SET_FLAG (this, FLAG_REMOVED);	910	SET_FLAG (this, FLAG_REMOVED);
		911	INVOKE_OBJECT (REMOVE, this);
997		912
998	if (more)	913	if (more)
999	more->remove ();	914	more->remove ();
1000		915
1001	/*	916	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	927	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	928	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	929	* to save cpu time.
1015	*/	930	*/
1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	931	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017	fix_player (otmp);	932	otmp->update_stats ();
1018		933
1019	if (above != NULL)	934	if (above)
1020	above->below = below;	935	above->below = below;
1021	else	936	else
1022	env->inv = below;	937	env->inv = below;
1023		938
1024	if (below != NULL)	939	if (below)
1025	below->above = above;	940	below->above = above;
1026		941
1027	/* we set up values so that it could be inserted into	942	/* we set up values so that it could be inserted into
1028	* the map, but we don't actually do that - it is up	943	* the map, but we don't actually do that - it is up
1029	* to the caller to decide what we want to do.	944	* to the caller to decide what we want to do.
…		…
1033	above = 0, below = 0;	948	above = 0, below = 0;
1034	env = 0;	949	env = 0;
1035	}	950	}
1036	else if (map)	951	else if (map)
1037	{	952	{
1038	/* Re did the following section of code - it looks like it had	953	if (type == PLAYER)
1039	* lots of logic for things we no longer care about
1040	*/	954	{
		955	--map->players;
		956	map->touch ();
		957	}
		958
		959	map->dirty = true;
1041		960
1042	/* link the object above us */	961	/* link the object above us */
1043	if (above)	962	if (above)
1044	above->below = below;	963	above->below = below;
1045	else	964	else
…		…
1063	dump = dump_object (GET_MAP_OB (map, x, y));	982	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);	983	LOG (llevError, "%s\n", dump);
1065	free (dump);	984	free (dump);
1066	}	985	}
1067		986
1068	map->at (x, y).bottom = above; /* goes on above it. */	987	map->at (x, y).bot = above; /* goes on above it. */
1069	}	988	}
1070		989
1071	above = 0;	990	above = 0;
1072	below = 0;	991	below = 0;
1073		992
1074	if (map->in_memory == MAP_SAVING)	993	if (map->in_memory == MAP_SAVING)
1075	return;	994	return;
1076		995
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	996	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		997
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	998	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1080	{	999	{
1081	/* No point updating the players look faces if he is the object	1000	/* No point updating the players look faces if he is the object
1082	* being removed.	1001	* being removed.
1083	*/	1002	*/
1084		1003
…		…
1088	* removed (most likely destroyed), update the player view	1007	* removed (most likely destroyed), update the player view
1089	* appropriately.	1008	* appropriately.
1090	*/	1009	*/
1091	if (tmp->container == this)	1010	if (tmp->container == this)
1092	{	1011	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);	1012	flag [FLAG_APPLIED] = 0;
1094	tmp->container = 0;	1013	tmp->container = 0;
1095	}	1014	}
1096		1015
		1016	if (tmp->contr->ns)
1097	tmp->contr->socket->floorbox_update ();	1017	tmp->contr->ns->floorbox_update ();
1098	}	1018	}
1099		1019
1100	/* See if player moving off should effect something */	1020	/* See if object moving off should effect something */
1101	if (check_walk_off	1021	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1022	&& ((move_type & tmp->move_off)
1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1023	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104	{	1024	{
1105	move_apply (tmp, this, 0);	1025	move_apply (tmp, this, 0);
…		…
1107	if (destroyed ())	1027	if (destroyed ())
1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1028	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1109	}	1029	}
1110		1030
1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1031	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112		1032	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1113	if (tmp->above == tmp)	1033	if (tmp->above == tmp)
1114	tmp->above = 0;	1034	tmp->above = 0;
1115		1035
1116	last = tmp;	1036	last = tmp;
1117	}	1037	}
1118		1038
1119	/* last == NULL of there are no objects on this space */	1039	/* last == NULL if there are no objects on this space */
		1040	//TODO: this makes little sense, why only update the topmost object?
1120	if (!last)	1041	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1042	map->at (x, y).flags_ = 0;
1122	else	1043	else
1123	update_object (last, UP_OBJ_REMOVE);	1044	update_object (last, UP_OBJ_REMOVE);
1124		1045
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1046	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126	update_all_los (map, x, y);	1047	update_all_los (map, x, y);
1127	}	1048	}
1128	}	1049	}
1129		1050
1130	/*	1051	/*
…		…
1139	merge_ob (object *op, object *top)	1060	merge_ob (object *op, object *top)
1140	{	1061	{
1141	if (!op->nrof)	1062	if (!op->nrof)
1142	return 0;	1063	return 0;
1143		1064
1144	if (top == NULL)	1065	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1066	for (top = op; top && top->above; top = top->above)
		1067	;
1146		1068
1147	for (; top != NULL; top = top->below)	1069	for (; top; top = top->below)
1148	{	1070	{
1149	if (top == op)	1071	if (top == op)
1150	continue;	1072	continue;
1151		1073
1152	if (object::can_merge (op, top))	1074	if (object::can_merge (op, top))
…		…
1168	* job preparing multi-part monsters	1090	* job preparing multi-part monsters
1169	*/	1091	*/
1170	object *	1092	object *
1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1093	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172	{	1094	{
1173	object *tmp;
1174
1175	if (op->head)
1176	op = op->head;
1177
1178	for (tmp = op; tmp; tmp = tmp->more)	1095	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179	{	1096	{
1180	tmp->x = x + tmp->arch->clone.x;	1097	tmp->x = x + tmp->arch->clone.x;
1181	tmp->y = y + tmp->arch->clone.y;	1098	tmp->y = y + tmp->arch->clone.y;
1182	}	1099	}
1183		1100
…		…
1202	* Return value:	1119	* Return value:
1203	* new object if 'op' was merged with other object	1120	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1121	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1122	* just 'op' otherwise
1206	*/	1123	*/
1207
1208	object *	1124	object *
1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1125	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210	{	1126	{
1211	object *tmp, *top, *floor = NULL;	1127	object *tmp, *top, *floor = NULL;
1212	sint16 x, y;	1128	sint16 x, y;
…		…
1215	{	1131	{
1216	LOG (llevError, "Trying to insert freed object!\n");	1132	LOG (llevError, "Trying to insert freed object!\n");
1217	return NULL;	1133	return NULL;
1218	}	1134	}
1219		1135
1220	if (m == NULL)	1136	if (!m)
1221	{	1137	{
1222	char *dump = dump_object (op);	1138	char *dump = dump_object (op);
1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1139	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1224	free (dump);	1140	free (dump);
1225	return op;	1141	return op;
…		…
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1162	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);	1163	free (dump);
1248	return op;	1164	return op;
1249	}	1165	}
1250		1166
1251	if (op->more != NULL)	1167	if (op->more)
1252	{	1168	{
1253	/* The part may be on a different map. */	1169	/* The part may be on a different map. */
1254		1170
1255	object *more = op->more;	1171	object *more = op->more;
1256		1172
1257	/* We really need the caller to normalize coordinates - if	1173	/* We really need the caller to normalise coordinates - if
1258	* we set the map, that doesn't work if the location is within	1174	* we set the map, that doesn't work if the location is within
1259	* a map and this is straddling an edge. So only if coordinate	1175	* a map and this is straddling an edge. So only if coordinate
1260	* is clear wrong do we normalize it.	1176	* is clear wrong do we normalise it.
1261	*/	1177	*/
1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1178	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263	more->map = get_map_from_coord (m, &more->x, &more->y);	1179	more->map = get_map_from_coord (m, &more->x, &more->y);
1264	else if (!more->map)	1180	else if (!more->map)
1265	{	1181	{
…		…
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1188	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273	{	1189	{
1274	if (!op->head)	1190	if (!op->head)
1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1191	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276		1192
1277	return NULL;	1193	return 0;
1278	}	1194	}
1279	}	1195	}
1280		1196
1281	CLEAR_FLAG (op, FLAG_REMOVED);	1197	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1198
…		…
1289	y = op->y;	1205	y = op->y;
1290		1206
1291	/* this has to be done after we translate the coordinates.	1207	/* this has to be done after we translate the coordinates.
1292	*/	1208	*/
1293	if (op->nrof && !(flag & INS_NO_MERGE))	1209	if (op->nrof && !(flag & INS_NO_MERGE))
1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1210	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1295	if (object::can_merge (op, tmp))	1211	if (object::can_merge (op, tmp))
1296	{	1212	{
1297	op->nrof += tmp->nrof;	1213	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1214	tmp->destroy ();
1299	}	1215	}
…		…
1316	op->below = originator->below;	1232	op->below = originator->below;
1317		1233
1318	if (op->below)	1234	if (op->below)
1319	op->below->above = op;	1235	op->below->above = op;
1320	else	1236	else
1321	op->map->at (op->x, op->y).bottom = op;	1237	op->ms ().bot = op;
1322		1238
1323	/* since *below* originator, no need to update top */	1239	/* since *below* originator, no need to update top */
1324	originator->below = op;	1240	originator->below = op;
1325	}	1241	}
1326	else	1242	else
1327	{	1243	{
1328	/* If there are other objects, then */	1244	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1245	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1330	{	1246	{
1331	object *last = NULL;	1247	object *last = 0;
1332		1248
1333	/*	1249	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1250	* If there are multiple objects on this space, we do some trickier handling.
1335	* We've already dealt with merging if appropriate.	1251	* We've already dealt with merging if appropriate.
1336	* Generally, we want to put the new object on top. But if	1252	* Generally, we want to put the new object on top. But if
…		…
1340	* once we get to them. This reduces the need to traverse over all of	1256	* once we get to them. This reduces the need to traverse over all of
1341	* them when adding another one - this saves quite a bit of cpu time	1257	* them when adding another one - this saves quite a bit of cpu time
1342	* when lots of spells are cast in one area. Currently, it is presumed	1258	* when lots of spells are cast in one area. Currently, it is presumed
1343	* that flying non pickable objects are spell objects.	1259	* that flying non pickable objects are spell objects.
1344	*/	1260	*/
1345
1346	while (top != NULL)	1261	while (top)
1347	{	1262	{
1348	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1263	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1349	floor = top;	1264	floor = top;
1350		1265
1351	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1266	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1404	op->above = GET_MAP_OB (op->map, op->x, op->y);	1319	op->above = GET_MAP_OB (op->map, op->x, op->y);
1405		1320
1406	if (op->above)	1321	if (op->above)
1407	op->above->below = op;	1322	op->above->below = op;
1408		1323
1409	op->below = NULL;	1324	op->below = 0;
1410	op->map->at (op->x, op->y).bottom = op;	1325	op->ms ().bot = op;
1411	}	1326	}
1412	else	1327	else
1413	{ /* get inserted into the stack above top */	1328	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1329	op->above = top->above;
1415		1330
…		…
1418		1333
1419	op->below = top;	1334	op->below = top;
1420	top->above = op;	1335	top->above = op;
1421	}	1336	}
1422		1337
1423	if (op->above == NULL)	1338	if (!op->above)
1424	op->map->at (op->x, op->y).top = op;	1339	op->ms ().top = op;
1425	} /* else not INS_BELOW_ORIGINATOR */	1340	} /* else not INS_BELOW_ORIGINATOR */
1426		1341
1427	if (op->type == PLAYER)	1342	if (op->type == PLAYER)
		1343	{
1428	op->contr->do_los = 1;	1344	op->contr->do_los = 1;
		1345	++op->map->players;
		1346	op->map->touch ();
		1347	}
		1348
		1349	op->map->dirty = true;
1429		1350
1430	/* If we have a floor, we know the player, if any, will be above	1351	/* If we have a floor, we know the player, if any, will be above
1431	* it, so save a few ticks and start from there.	1352	* it, so save a few ticks and start from there.
1432	*/	1353	*/
1433	if (!(flag & INS_MAP_LOAD))	1354	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->map->at (op->x, op->y).player ())	1355	if (object *pl = op->ms ().player ())
		1356	if (pl->contr->ns)
1435	pl->contr->socket->floorbox_update ();	1357	pl->contr->ns->floorbox_update ();
1436		1358
1437	/* If this object glows, it may affect lighting conditions that are	1359	/* If this object glows, it may affect lighting conditions that are
1438	* visible to others on this map. But update_all_los is really	1360	* visible to others on this map. But update_all_los is really
1439	* an inefficient way to do this, as it means los for all players	1361	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1362	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1363	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1364	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1365	* or just updating the P_UPTODATE for spaces within this area
1444	* of effect may be sufficient.	1366	* of effect may be sufficient.
1445	*/	1367	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1368	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1369	update_all_los (op->map, op->x, op->y);
1448		1370
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1371	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1372	update_object (op, UP_OBJ_INSERT);
		1373
		1374	INVOKE_OBJECT (INSERT, op);
1451		1375
1452	/* Don't know if moving this to the end will break anything. However,	1376	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1377	* we want to have floorbox_update called before calling this.
1454	*	1378	*
1455	* check_move_on() must be after this because code called from	1379	* check_move_on() must be after this because code called from
…		…
1460		1384
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1385	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1386	if (!(flag & INS_NO_WALK_ON) && !op->head)
1463	{	1387	{
1464	if (check_move_on (op, originator))	1388	if (check_move_on (op, originator))
1465	return NULL;	1389	return 0;
1466		1390
1467	/* If we are a multi part object, lets work our way through the check	1391	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1392	* walk on's.
1469	*/	1393	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1394	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1395	if (check_move_on (tmp, originator))
1472	return NULL;	1396	return 0;
1473	}	1397	}
1474		1398
1475	return op;	1399	return op;
1476	}	1400	}
1477		1401
…		…
1484	{	1408	{
1485	object *tmp, *tmp1;	1409	object *tmp, *tmp1;
1486		1410
1487	/* first search for itself and remove any old instances */	1411	/* first search for itself and remove any old instances */
1488		1412
1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1413	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1414	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1491	tmp->destroy ();	1415	tmp->destroy ();
1492		1416
1493	tmp1 = arch_to_object (archetype::find (arch_string));	1417	tmp1 = arch_to_object (archetype::find (arch_string));
1494		1418
1495	tmp1->x = op->x;	1419	tmp1->x = op->x;
1496	tmp1->y = op->y;	1420	tmp1->y = op->y;
1497	insert_ob_in_map (tmp1, op->map, op, 0);	1421	insert_ob_in_map (tmp1, op->map, op, 0);
		1422	}
		1423
		1424	object *
		1425	object::insert_at (object *where, object *originator, int flags)
		1426	{
		1427	where->map->insert (this, where->x, where->y, originator, flags);
1498	}	1428	}
1499		1429
1500	/*	1430	/*
1501	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1431	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1502	* is returned contains nr objects, and the remaining parts contains	1432	* is returned contains nr objects, and the remaining parts contains
1503	* the rest (or is removed and freed if that number is 0).	1433	* the rest (or is removed and freed if that number is 0).
1504	* On failure, NULL is returned, and the reason put into the	1434	* On failure, NULL is returned, and the reason put into the
1505	* global static errmsg array.	1435	* global static errmsg array.
1506	*/	1436	*/
1507
1508	object *	1437	object *
1509	get_split_ob (object *orig_ob, uint32 nr)	1438	get_split_ob (object *orig_ob, uint32 nr)
1510	{	1439	{
1511	object *newob;	1440	object *newob;
1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1441	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1548		1477
1549	object *	1478	object *
1550	decrease_ob_nr (object *op, uint32 i)	1479	decrease_ob_nr (object *op, uint32 i)
1551	{	1480	{
1552	object *tmp;	1481	object *tmp;
1553	player *pl;
1554		1482
1555	if (i == 0) /* objects with op->nrof require this check */	1483	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1484	return op;
1557		1485
1558	if (i > op->nrof)	1486	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1499	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1500	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1501	* and then searching the map for a player.
1574	*/	1502	*/
1575	if (!tmp)	1503	if (!tmp)
1576	{	1504	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1505	if (pl->ob->container == op->env)
1579	{	1506	{
1580	tmp = pl->ob;	1507	tmp = pl->ob;
1581	break;	1508	break;
1582	}	1509	}
1583	}
1584		1510
1585	if (i < op->nrof)	1511	if (i < op->nrof)
1586	{	1512	{
1587	sub_weight (op->env, op->weight * i);	1513	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1514	op->nrof -= i;
…		…
1724	add_weight (this, (op->weight + op->carrying));	1650	add_weight (this, (op->weight + op->carrying));
1725		1651
1726	otmp = this->in_player ();	1652	otmp = this->in_player ();
1727	if (otmp && otmp->contr)	1653	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1654	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1655	otmp->update_stats ();
1730		1656
1731	op->map = 0;	1657	op->map = 0;
1732	op->env = this;	1658	op->env = this;
1733	op->above = 0;	1659	op->above = 0;
1734	op->below = 0;	1660	op->below = 0;
…		…
1738	if ((op->glow_radius != 0) && map)	1664	if ((op->glow_radius != 0) && map)
1739	{	1665	{
1740	#ifdef DEBUG_LIGHTS	1666	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1667	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1668	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1669	if (map->darkness)
1744	update_all_los (map, x, y);	1670	update_all_los (map, x, y);
1745	}	1671	}
1746		1672
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1673	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1674	* It sure simplifies this function...
…		…
1753	{	1679	{
1754	op->below = inv;	1680	op->below = inv;
1755	op->below->above = op;	1681	op->below->above = op;
1756	inv = op;	1682	inv = op;
1757	}	1683	}
		1684
		1685	INVOKE_OBJECT (INSERT, this);
1758		1686
1759	return op;	1687	return op;
1760	}	1688	}
1761		1689
1762	/*	1690	/*
…		…
1777	*	1705	*
1778	* MSW 2001-07-08: Check all objects on space, not just those below	1706	* MSW 2001-07-08: Check all objects on space, not just those below
1779	* object being inserted. insert_ob_in_map may not put new objects	1707	* object being inserted. insert_ob_in_map may not put new objects
1780	* on top.	1708	* on top.
1781	*/	1709	*/
1782
1783	int	1710	int
1784	check_move_on (object *op, object *originator)	1711	check_move_on (object *op, object *originator)
1785	{	1712	{
1786	object *tmp;	1713	object *tmp;
1787	maptile *m = op->map;	1714	maptile *m = op->map;
…		…
1814		1741
1815	/* The objects have to be checked from top to bottom.	1742	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1743	* Hence, we first go to the top:
1817	*/	1744	*/
1818		1745
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1746	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820	{	1747	{
1821	/* Trim the search when we find the first other spell effect	1748	/* Trim the search when we find the first other spell effect
1822	* this helps performance so that if a space has 50 spell objects,	1749	* this helps performance so that if a space has 50 spell objects,
1823	* we don't need to check all of them.	1750	* we don't need to check all of them.
1824	*/	1751	*/
…		…
1879	/*	1806	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1807	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1808	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1809	* The first matching object is returned, or NULL if none.
1883	*/	1810	*/
1884
1885	object *	1811	object *
1886	present_arch (const archetype *at, maptile *m, int x, int y)	1812	present_arch (const archetype *at, maptile *m, int x, int y)
1887	{	1813	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL || out_of_map (m, x, y))	1814	if (!m || out_of_map (m, x, y))
1892	{	1815	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1816	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1817	return NULL;
1895	}	1818	}
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1819
		1820	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897	if (tmp->arch == at)	1821	if (tmp->arch == at)
1898	return tmp;	1822	return tmp;
		1823
1899	return NULL;	1824	return NULL;
1900	}	1825	}
1901		1826
1902	/*	1827	/*
1903	* present(type, map, x, y) searches for any objects with	1828	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1829	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1830	* The first matching object is returned, or NULL if none.
1906	*/	1831	*/
1907
1908	object *	1832	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1833	present (unsigned char type, maptile *m, int x, int y)
1910	{	1834	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1835	if (out_of_map (m, x, y))
1915	{	1836	{
1916	LOG (llevError, "Present called outside map.\n");	1837	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1838	return NULL;
1918	}	1839	}
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1840
		1841	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920	if (tmp->type == type)	1842	if (tmp->type == type)
1921	return tmp;	1843	return tmp;
		1844
1922	return NULL;	1845	return NULL;
1923	}	1846	}
1924		1847
1925	/*	1848	/*
1926	* present_in_ob(type, object) searches for any objects with	1849	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1850	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
1929	*/	1852	*/
1930
1931	object *	1853	object *
1932	present_in_ob (unsigned char type, const object *op)	1854	present_in_ob (unsigned char type, const object *op)
1933	{	1855	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1856	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1857	if (tmp->type == type)
1939	return tmp;	1858	return tmp;
		1859
1940	return NULL;	1860	return NULL;
1941	}	1861	}
1942		1862
1943	/*	1863	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1864	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1872	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1873	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1874	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1875	* to be unique.
1956	*/	1876	*/
1957
1958	object *	1877	object *
1959	present_in_ob_by_name (int type, const char *str, const object *op)	1878	present_in_ob_by_name (int type, const char *str, const object *op)
1960	{	1879	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1880	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1881	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1882	return tmp;
1968	}	1883
1969	return NULL;	1884	return 0;
1970	}	1885	}
1971		1886
1972	/*	1887	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1888	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1889	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1890	* The first matching object is returned, or NULL if none.
1976	*/	1891	*/
1977
1978	object *	1892	object *
1979	present_arch_in_ob (const archetype *at, const object *op)	1893	present_arch_in_ob (const archetype *at, const object *op)
1980	{	1894	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1895	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1896	if (tmp->arch == at)
1986	return tmp;	1897	return tmp;
		1898
1987	return NULL;	1899	return NULL;
1988	}	1900	}
1989		1901
1990	/*	1902	/*
1991	* activate recursively a flag on an object inventory	1903	* activate recursively a flag on an object inventory
1992	*/	1904	*/
1993	void	1905	void
1994	flag_inv (object *op, int flag)	1906	flag_inv (object *op, int flag)
1995	{	1907	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1908	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1910	{
2002	SET_FLAG (tmp, flag);	1911	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1912	flag_inv (tmp, flag);
2004	}	1913	}
2005	} /*	1914	}
		1915
		1916	/*
2006	* desactivate recursively a flag on an object inventory	1917	* deactivate recursively a flag on an object inventory
2007	*/	1918	*/
2008	void	1919	void
2009	unflag_inv (object *op, int flag)	1920	unflag_inv (object *op, int flag)
2010	{	1921	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1922	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	1924	{
2017	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
2019	}	1927	}
2020	}	1928	}
…		…
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1931	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).	1932	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for	1933	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.	1934	* him/her-self and all object carried by a call to this function.
2027	*/	1935	*/
2028
2029	void	1936	void
2030	set_cheat (object *op)	1937	set_cheat (object *op)
2031	{	1938	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);	1939	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);	1940	flag_inv (op, FLAG_WAS_WIZ);
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	1959	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	1960	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	1961	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	1962	* customized, changed states, etc.
2056	*/	1963	*/
2057
2058	int	1964	int
2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1965	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060	{	1966	{
2061	int
2062	i,
2063	index = 0, flag;	1967	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	1968	int altern[SIZEOFFREE];
2066		1969
2067	for (i = start; i < stop; i++)	1970	for (int i = start; i < stop; i++)
2068	{	1971	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1972	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070	if (!flag)	1973	if (!flag)
2071	altern[index++] = i;	1974	altern [index++] = i;
2072		1975
2073	/* Basically, if we find a wall on a space, we cut down the search size.	1976	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	1977	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	1978	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	1979	* if the space being examined only has a wall to the north and empty
…		…
2092	* find_first_free_spot(archetype, maptile, x, y) works like	1995	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	1996	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	1997	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1998	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	1999	*/
2097
2098	int	2000	int
2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2001	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100	{	2002	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2003	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2004	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2005	return i;
2108	}	2006
2109	return -1;	2007	return -1;
2110	}	2008	}
2111		2009
2112	/*	2010	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2011	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2012	* arr[begin..end-1].
		2013	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2014	*/
2116	static void	2015	static void
2117	permute (int *arr, int begin, int end)	2016	permute (int *arr, int begin, int end)
2118	{	2017	{
2119	int	2018	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2019	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2020
2130	tmp = arr[i];	2021	while (--end)
2131	arr[i] = arr[j];	2022	swap (arr [end], arr [RANDOM () % (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2023	}
2135		2024
2136	/* new function to make monster searching more efficient, and effective!	2025	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2026	* This basically returns a randomized array (in the passed pointer) of
2138	* the spaces to find monsters. In this way, it won't always look for	2027	* the spaces to find monsters. In this way, it won't always look for
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2030	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2031	*/
2143	void	2032	void
2144	get_search_arr (int *search_arr)	2033	get_search_arr (int *search_arr)
2145	{	2034	{
2146	int	2035	int i;
2147	i;
2148		2036
2149	for (i = 0; i < SIZEOFFREE; i++)	2037	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2038	search_arr[i] = i;
2152	}
2153		2039
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2040	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2041	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2042	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2043	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2052	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2053	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2054	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2055	* there is capable of.
2170	*/	2056	*/
2171
2172	int	2057	int
2173	find_dir (maptile *m, int x, int y, object *exclude)	2058	find_dir (maptile *m, int x, int y, object *exclude)
2174	{	2059	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2060	int i, max = SIZEOFFREE, mflags;
2178		2061
2179	sint16 nx, ny;	2062	sint16 nx, ny;
2180	object *	2063	object *tmp;
2181	tmp;
2182	maptile *	2064	maptile *mp;
2183	mp;
2184		2065
2185	MoveType blocked, move_type;	2066	MoveType blocked, move_type;
2186		2067
2187	if (exclude && exclude->head)	2068	if (exclude && exclude->head)
2188	{	2069	{
…		…
2205		2086
2206	if (mflags & P_OUT_OF_MAP)	2087	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2088	max = maxfree[i];
2208	else	2089	else
2209	{	2090	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2091	mapspace &ms = mp->at (nx, ny);
		2092
		2093	blocked = ms.move_block;
2211		2094
2212	if ((move_type & blocked) == move_type)	2095	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2096	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2097	else if (mflags & P_IS_ALIVE)
2215	{	2098	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2099	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2100	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2101	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218	break;	2102	break;
2219		2103
2220	if (tmp)	2104	if (tmp)
2221	return freedir[i];	2105	return freedir[i];
2222	}	2106	}
…		…
2228		2112
2229	/*	2113	/*
2230	* distance(object 1, object 2) will return the square of the	2114	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2115	* distance between the two given objects.
2232	*/	2116	*/
2233
2234	int	2117	int
2235	distance (const object *ob1, const object *ob2)	2118	distance (const object *ob1, const object *ob2)
2236	{	2119	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2120	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2121	}
2242		2122
2243	/*	2123	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2124	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2125	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2126	* object, needs to travel toward it.
2247	*/	2127	*/
2248
2249	int	2128	int
2250	find_dir_2 (int x, int y)	2129	find_dir_2 (int x, int y)
2251	{	2130	{
2252	int q;	2131	int q;
2253		2132
…		…
2292	int	2171	int
2293	absdir (int d)	2172	absdir (int d)
2294	{	2173	{
2295	while (d < 1)	2174	while (d < 1)
2296	d += 8;	2175	d += 8;
		2176
2297	while (d > 8)	2177	while (d > 8)
2298	d -= 8;	2178	d -= 8;
		2179
2299	return d;	2180	return d;
2300	}	2181	}
2301		2182
2302	/*	2183	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2184	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2305	*/	2186	*/
2306		2187
2307	int	2188	int
2308	dirdiff (int dir1, int dir2)	2189	dirdiff (int dir1, int dir2)
2309	{	2190	{
2310	int	2191	int d;
2311	d;
2312		2192
2313	d = abs (dir1 - dir2);	2193	d = abs (dir1 - dir2);
2314	if (d > 4)	2194	if (d > 4)
2315	d = 8 - d;	2195	d = 8 - d;
		2196
2316	return d;	2197	return d;
2317	}	2198	}
2318		2199
2319	/* peterm:	2200	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2201	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2204	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2205	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2206	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2207	* functions.
2327	*/	2208	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2209	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2210	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2211	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2212	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2213	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2214	{0, 0, 0}, /* 4 */
…		…
2485	/* Basically, we save the content of the string to a temp file, then call */	2364	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */	2365	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */	2366	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */	2367	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */	2368	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *	2369	object *
2492	load_object_str (const char *obstr)	2370	load_object_str (const char *obstr)
2493	{	2371	{
2494	object *op;	2372	object *op;
2495	char filename[MAX_BUF];	2373	char filename[MAX_BUF];
…		…
2525	* returns NULL if no match.	2403	* returns NULL if no match.
2526	*/	2404	*/
2527	object *	2405	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2406	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2407	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2408	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2409	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2410	return tmp;
2535		2411
2536	return NULL;	2412	return 0;
2537	}	2413	}
2538		2414
2539	/* If ob has a field named key, return the link from the list,	2415	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2416	* otherwise return NULL.
2541	*	2417	*
…		…
2543	* do the desired thing.	2419	* do the desired thing.
2544	*/	2420	*/
2545	key_value *	2421	key_value *
2546	get_ob_key_link (const object *ob, const char *key)	2422	get_ob_key_link (const object *ob, const char *key)
2547	{	2423	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2424	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2425	if (link->key == key)
2552	return link;	2426	return link;
2553		2427
2554	return NULL;	2428	return 0;
2555	}	2429	}
2556		2430
2557	/*	2431	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2432	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2433	*
…		…
2599	* Returns TRUE on success.	2473	* Returns TRUE on success.
2600	*/	2474	*/
2601	int	2475	int
2602	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2476	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603	{	2477	{
2604	key_value *
2605	field = NULL, *last = NULL;	2478	key_value *field = NULL, *last = NULL;
2606		2479
2607	for (field = op->key_values; field != NULL; field = field->next)	2480	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2481	{
2609	if (field->key != canonical_key)	2482	if (field->key != canonical_key)
2610	{	2483	{
…		…
2638	/* IF we get here, key doesn't exist */	2511	/* IF we get here, key doesn't exist */
2639		2512
2640	/* No field, we'll have to add it. */	2513	/* No field, we'll have to add it. */
2641		2514
2642	if (!add_key)	2515	if (!add_key)
2643	{
2644	return FALSE;	2516	return FALSE;
2645	}	2517
2646	/* There isn't any good reason to store a null	2518	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2519	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2520	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2521	* be here. If user wants to store empty strings,
2650	* should pass in ""	2522	* should pass in ""
…		…
2699	}	2571	}
2700	else	2572	else
2701	item = item->env;	2573	item = item->env;
2702	}	2574	}
2703		2575
		2576
		2577	const char *
		2578	object::flag_desc (char *desc, int len) const
		2579	{
		2580	char *p = desc;
		2581	bool first = true;
		2582
		2583	*p = 0;
		2584
		2585	for (int i = 0; i < NUM_FLAGS; i++)
		2586	{
		2587	if (len <= 10) // magic constant!
		2588	{
		2589	snprintf (p, len, ",...");
		2590	break;
		2591	}
		2592
		2593	if (flag [i])
		2594	{
		2595	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2596	len -= cnt;
		2597	p += cnt;
		2598	first = false;
		2599	}
		2600	}
		2601
		2602	return desc;
		2603	}
		2604
2704	// return a suitable string describing an objetc in enough detail to find it	2605	// return a suitable string describing an object in enough detail to find it
2705	const char *	2606	const char *
2706	object::debug_desc (char *info) const	2607	object::debug_desc (char *info) const
2707	{	2608	{
		2609	char flagdesc[512];
2708	char info2[256 * 3];	2610	char info2[256 * 4];
2709	char *p = info;	2611	char *p = info;
2710		2612
2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2712	count,	2614	count, uuid.seq,
2713	&name,	2615	&name,
2714	title ? " " : "",	2616	title ? "\",title:" : "",
2715	title ? (const char *)title : "");	2617	title ? (const char *)title : "",
		2618	flag_desc (flagdesc, 512), type);
2716		2619
2717	if (env)	2620	if (env)
2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719		2622
2720	if (map)	2623	if (map)
2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722		2625
2723	return info;	2626	return info;
2724	}	2627	}
2725		2628
2726	const char *	2629	const char *
2727	object::debug_desc () const	2630	object::debug_desc () const
2728	{	2631	{
2729	static char info[256 * 3];	2632	static char info[256 * 4];
2730	return debug_desc (info);	2633	return debug_desc (info);
2731	}	2634	}
2732		2635

Diff Legend

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