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.77 by root, Thu Dec 21 23:37:05 2006 UTC vs.
Revision 1.128 by root, Mon Feb 5 01:24:45 2007 UTC

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

Diff Legend

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