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.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.133 by root, Fri Feb 16 19:43:40 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
…		…
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
356	/*	357	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	359	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
360	*/	361	*/
361
362	char *	362	char *
363	dump_object (object *op)	363	dump_object (object *op)
364	{	364	{
365	if (!op)	365	if (!op)
366	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
367		367
368	object_freezer freezer;	368	object_freezer freezer;
369	save_object (freezer, op, 3);	369	op->write (freezer);
370	return freezer.as_string ();	370	return freezer.as_string ();
371	}	371	}
372		372
373	/*	373	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	391	}
392		392
393	/*	393	/*
394	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
395	*/	395	*/
396
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
401	if (op->count == i)	400	if (op->count == i)
402	return op;	401	return op;
403		402
404	return 0;	403	return 0;
405	}	404	}
406		405
407	/*	406	/*
408	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
411	*/	410	*/
412
413	object *	411	object *
414	find_object_name (const char *str)	412	find_object_name (const char *str)
415	{	413	{
416	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
417	object *op;	415	object *op;
418		416
419	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
420	if (op->name == str_)	418	if (op->name == str_)
421	break;	419	break;
422		420
423	return op;	421	return op;
424	}	422	}
…		…
490		488
491	if (is_removed)	489	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);	490	SET_FLAG (dst, FLAG_REMOVED);
493		491
494	if (speed < 0)	492	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	493	dst->speed_left = speed_left - rndm ();
496		494
497	/* Copy over key_values, if any. */	495	/* Copy over key_values, if any. */
498	if (key_values)	496	if (key_values)
499	{	497	{
500	key_value *tail = 0;	498	key_value *tail = 0;
…		…
522	tail = new_link;	520	tail = new_link;
523	}	521	}
524	}	522	}
525	}	523	}
526		524
527	update_ob_speed (dst);	525	dst->set_speed (dst->speed);
		526	}
		527
		528	void
		529	object::instantiate ()
		530	{
		531	if (!uuid.seq) // HACK
		532	uuid = gen_uuid ();
		533
		534	speed_left = -0.1f;
		535	/* copy the body_info to the body_used - this is only really
		536	* need for monsters, but doesn't hurt to do it for everything.
		537	* by doing so, when a monster is created, it has good starting
		538	* values for the body_used info, so when items are created
		539	* for it, they can be properly equipped.
		540	*/
		541	memcpy (body_used, body_info, sizeof (body_used));
		542
		543	attachable::instantiate ();
528	}	544	}
529		545
530	object *	546	object *
531	object::clone ()	547	object::clone ()
532	{	548	{
…		…
538	/*	554	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	555	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	556	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	557	* be called to update the face variable, _and_ how it looks on the map.
542	*/	558	*/
543
544	void	559	void
545	update_turn_face (object *op)	560	update_turn_face (object *op)
546	{	561	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	562	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	563	return;
		564
549	SET_ANIMATION (op, op->direction);	565	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	566	update_object (op, UP_OBJ_FACE);
551	}	567	}
552		568
553	/*	569	/*
554	* Updates the speed of an object. If the speed changes from 0 to another	570	* Updates the speed of an object. If the speed changes from 0 to another
555	* value, or vice versa, then add/remove the object from the active list.	571	* value, or vice versa, then add/remove the object from the active list.
556	* This function needs to be called whenever the speed of an object changes.	572	* This function needs to be called whenever the speed of an object changes.
557	*/	573	*/
558	void	574	void
559	update_ob_speed (object *op)	575	object::set_speed (float speed)
560	{	576	{
561	extern int arch_init;	577	if (flag [FLAG_FREED] && speed)
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566
567	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568	{	578	{
569	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	579	LOG (llevError, "Object %s is freed but has speed.\n", &name);
570	#ifdef MANY_CORES
571	abort ();
572	#else
573	op->speed = 0;	580	speed = 0;
574	#endif
575	}
576
577	if (arch_init)
578	return;
579
580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581	{	581	}
582	/* If already on active list, don't do anything */
583	if (op->active_next || op->active_prev || op == active_objects)
584	return;
585		582
586	/* process_events() expects us to insert the object at the beginning	583	this->speed = speed;
587	* of the list. */
588	op->active_next = active_objects;
589		584
590	if (op->active_next != NULL)	585	if (has_active_speed ())
591	op->active_next->active_prev = op;	586	activate ();
592
593	active_objects = op;
594	}
595	else	587	else
596	{	588	deactivate ();
597	/* If not on the active list, nothing needs to be done */
598	if (!op->active_next && !op->active_prev && op != active_objects)
599	return;
600
601	if (op->active_prev == NULL)
602	{
603	active_objects = op->active_next;
604
605	if (op->active_next != NULL)
606	op->active_next->active_prev = NULL;
607	}
608	else
609	{
610	op->active_prev->active_next = op->active_next;
611
612	if (op->active_next)
613	op->active_next->active_prev = op->active_prev;
614	}
615
616	op->active_next = NULL;
617	op->active_prev = NULL;
618	}
619	}
620
621	/* This function removes object 'op' from the list of active
622	* objects.
623	* This should only be used for style maps or other such
624	* reference maps where you don't want an object that isn't
625	* in play chewing up cpu time getting processed.
626	* The reverse of this is to call update_ob_speed, which
627	* will do the right thing based on the speed of the object.
628	*/
629	void
630	remove_from_active_list (object *op)
631	{
632	/* If not on the active list, nothing needs to be done */
633	if (!op->active_next && !op->active_prev && op != active_objects)
634	return;
635
636	if (op->active_prev == NULL)
637	{
638	active_objects = op->active_next;
639	if (op->active_next != NULL)
640	op->active_next->active_prev = NULL;
641	}
642	else
643	{
644	op->active_prev->active_next = op->active_next;
645	if (op->active_next)
646	op->active_next->active_prev = op->active_prev;
647	}
648	op->active_next = NULL;
649	op->active_prev = NULL;
650	}	589	}
651		590
652	/*	591	/*
653	* update_object() updates the the map.	592	* update_object() updates the the map.
654	* It takes into account invisible objects (and represent squares covered	593	* It takes into account invisible objects (and represent squares covered
…		…
691	*/	630	*/
692	if (!op->map || op->map->in_memory == MAP_SAVING)	631	if (!op->map || op->map->in_memory == MAP_SAVING)
693	return;	632	return;
694		633
695	/* make sure the object is within map boundaries */	634	/* make sure the object is within map boundaries */
696	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	635	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
697	{	636	{
698	LOG (llevError, "update_object() called for object out of map!\n");	637	LOG (llevError, "update_object() called for object out of map!\n");
699	#ifdef MANY_CORES	638	#ifdef MANY_CORES
700	abort ();	639	abort ();
701	#endif	640	#endif
702	return;	641	return;
703	}	642	}
704		643
705	mapspace &m = op->ms ();	644	mapspace &m = op->ms ();
706		645
707	if (m.flags_ & P_NEED_UPDATE)	646	if (!(m.flags_ & P_UPTODATE))
708	/* nop */;	647	/* nop */;
709	else if (action == UP_OBJ_INSERT)	648	else if (action == UP_OBJ_INSERT)
710	{	649	{
711	// this is likely overkill, TODO: revisit (schmorp)	650	// this is likely overkill, TODO: revisit (schmorp)
712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	651	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
721	/* This isn't perfect, but I don't expect a lot of objects to	660	/* This isn't perfect, but I don't expect a lot of objects to
722	* to have move_allow right now.	661	* to have move_allow right now.
723	*/	662	*/
724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	663	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	664	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726	m.flags_ = P_NEED_UPDATE;	665	m.flags_ = 0;
727	}	666	}
728	/* if the object is being removed, we can't make intelligent	667	/* if the object is being removed, we can't make intelligent
729	* decisions, because remove_ob can't really pass the object	668	* decisions, because remove_ob can't really pass the object
730	* that is being removed.	669	* that is being removed.
731	*/	670	*/
732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	671	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733	m.flags_ = P_NEED_UPDATE;	672	m.flags_ = 0;
734	else if (action == UP_OBJ_FACE)	673	else if (action == UP_OBJ_FACE)
735	/* Nothing to do for that case */ ;	674	/* Nothing to do for that case */ ;
736	else	675	else
737	LOG (llevError, "update_object called with invalid action: %d\n", action);	676	LOG (llevError, "update_object called with invalid action: %d\n", action);
738		677
739	if (op->more)	678	if (op->more)
740	update_object (op->more, action);	679	update_object (op->more, action);
741	}	680	}
742		681
743	object::vector object::objects; // not yet used
744	object *object::first;
745
746	object::object ()	682	object::object ()
747	{	683	{
748	SET_FLAG (this, FLAG_REMOVED);	684	SET_FLAG (this, FLAG_REMOVED);
749		685
750	expmul = 1.0;	686	expmul = 1.0;
751	face = blank_face;	687	face = blank_face;
752	}	688	}
753		689
754	object::~object ()	690	object::~object ()
755	{	691	{
		692	unlink ();
		693
756	free_key_values (this);	694	free_key_values (this);
757	}	695	}
758		696
		697	static int object_count;
		698
759	void object::link ()	699	void object::link ()
760	{	700	{
761	count = ++ob_count;	701	assert (!index);//D
762	uuid = gen_uuid ();	702	uuid = gen_uuid ();
		703	count = ++object_count;
763		704
764	prev = 0;	705	refcnt_inc ();
765	next = object::first;	706	objects.insert (this);
766
767	if (object::first)
768	object::first->prev = this;
769
770	object::first = this;
771	}	707	}
772		708
773	void object::unlink ()	709	void object::unlink ()
774	{	710	{
775	if (this == object::first)	711	if (!index)
776	object::first = next;	712	return;
777		713
778	/* Remove this object from the list of used objects */	714	objects.erase (this);
779	if (prev) prev->next = next;	715	refcnt_dec ();
780	if (next) next->prev = prev;	716	}
781		717
782	prev = 0;	718	void
783	next = 0;	719	object::activate ()
		720	{
		721	/* If already on active list, don't do anything */
		722	if (active)
		723	return;
		724
		725	if (has_active_speed ())
		726	actives.insert (this);
		727	}
		728
		729	void
		730	object::activate_recursive ()
		731	{
		732	activate ();
		733
		734	for (object *op = inv; op; op = op->below)
		735	op->activate_recursive ();
		736	}
		737
		738	/* This function removes object 'op' from the list of active
		739	* objects.
		740	* This should only be used for style maps or other such
		741	* reference maps where you don't want an object that isn't
		742	* in play chewing up cpu time getting processed.
		743	* The reverse of this is to call update_ob_speed, which
		744	* will do the right thing based on the speed of the object.
		745	*/
		746	void
		747	object::deactivate ()
		748	{
		749	/* If not on the active list, nothing needs to be done */
		750	if (!active)
		751	return;
		752
		753	actives.erase (this);
		754	}
		755
		756	void
		757	object::deactivate_recursive ()
		758	{
		759	for (object *op = inv; op; op = op->below)
		760	op->deactivate_recursive ();
		761
		762	deactivate ();
		763	}
		764
		765	void
		766	object::set_flag_inv (int flag, int value)
		767	{
		768	for (object *op = inv; op; op = op->below)
		769	{
		770	op->flag [flag] = value;
		771	op->set_flag_inv (flag, value);
		772	}
		773	}
		774
		775	/*
		776	* Remove and free all objects in the inventory of the given object.
		777	* object.c ?
		778	*/
		779	void
		780	object::destroy_inv (bool drop_to_ground)
		781	{
		782	// need to check first, because the checks below might segfault
		783	// as we might be on an invalid mapspace and crossfire code
		784	// is too buggy to ensure that the inventory is empty.
		785	// corollary: if you create arrows etc. with stuff in tis inventory,
		786	// cf will crash below with off-map x and y
		787	if (!inv)
		788	return;
		789
		790	/* Only if the space blocks everything do we not process -
		791	* if some form of movement is allowed, let objects
		792	* drop on that space.
		793	*/
		794	if (!drop_to_ground
		795	|| !map
		796	|| map->in_memory != MAP_IN_MEMORY
		797	|| map->nodrop
		798	|| ms ().move_block == MOVE_ALL)
		799	{
		800	while (inv)
		801	{
		802	inv->destroy_inv (drop_to_ground);
		803	inv->destroy ();
		804	}
		805	}
		806	else
		807	{ /* Put objects in inventory onto this space */
		808	while (inv)
		809	{
		810	object *op = inv;
		811
		812	if (op->flag [FLAG_STARTEQUIP]
		813	|| op->flag [FLAG_NO_DROP]
		814	|| op->type == RUNE
		815	|| op->type == TRAP
		816	|| op->flag [FLAG_IS_A_TEMPLATE]
		817	|| op->flag [FLAG_DESTROY_ON_DEATH])
		818	op->destroy ();
		819	else
		820	map->insert (op, x, y);
		821	}
		822	}
784	}	823	}
785		824
786	object *object::create ()	825	object *object::create ()
787	{	826	{
788	object *op = new object;	827	object *op = new object;
789	op->link ();	828	op->link ();
790	return op;	829	return op;
791	}	830	}
792		831
793	/*
794	* free_object() frees everything allocated by an object, removes
795	* it from the list of used objects, and puts it on the list of
796	* free objects. The IS_FREED() flag is set in the object.
797	* The object must have been removed by remove_ob() first for
798	* this function to succeed.
799	*
800	* If destroy_inventory is set, free inventory as well. Else drop items in
801	* inventory to the ground.
802	*/
803	void	832	void
804	object::do_destroy ()	833	object::do_destroy ()
805	{	834	{
806	attachable::do_destroy ();	835	attachable::do_destroy ();
807		836
808	if (flag [FLAG_IS_LINKED])	837	if (flag [FLAG_IS_LINKED])
809	remove_button_link (this);	838	remove_button_link (this);
810		839
811	if (flag [FLAG_FRIENDLY])	840	if (flag [FLAG_FRIENDLY])
		841	{
812	remove_friendly_object (this);	842	remove_friendly_object (this);
		843
		844	if (type == GOLEM
		845	&& owner
		846	&& owner->type == PLAYER
		847	&& owner->contr->ranges[range_golem] == this)
		848	owner->contr->ranges[range_golem] = 0;
		849	}
813		850
814	if (!flag [FLAG_REMOVED])	851	if (!flag [FLAG_REMOVED])
815	remove ();	852	remove ();
816		853
817	if (flag [FLAG_FREED])	854	destroy_inv (true);
818	return;	855
		856	deactivate ();
		857	unlink ();
819		858
820	flag [FLAG_FREED] = 1;	859	flag [FLAG_FREED] = 1;
821		860
822	// hack to ensure that freed objects still have a valid map	861	// hack to ensure that freed objects still have a valid map
823	{	862	{
…		…
829		868
830	freed_map->name = "/internal/freed_objects_map";	869	freed_map->name = "/internal/freed_objects_map";
831	freed_map->width = 3;	870	freed_map->width = 3;
832	freed_map->height = 3;	871	freed_map->height = 3;
833		872
834	freed_map->allocate ();	873	freed_map->alloc ();
		874	freed_map->in_memory = MAP_IN_MEMORY;
835	}	875	}
836		876
837	map = freed_map;	877	map = freed_map;
838	x = 1;	878	x = 1;
839	y = 1;	879	y = 1;
840	}	880	}
841		881
842	more = 0;
843	head = 0;	882	head = 0;
844	inv = 0;	883
		884	if (more)
		885	{
		886	more->destroy ();
		887	more = 0;
		888	}
845		889
846	// clear those pointers that likely might have circular references to us	890	// clear those pointers that likely might have circular references to us
847	owner = 0;	891	owner = 0;
848	enemy = 0;	892	enemy = 0;
849	attacked_by = 0;	893	attacked_by = 0;
850
851	// only relevant for players(?), but make sure of it anyways
852	contr = 0;
853
854	/* Remove object from the active list */
855	speed = 0;
856	update_ob_speed (this);
857
858	unlink ();
859	}
860
861	/*
862	* Remove and free all objects in the inventory of the given object.
863	* object.c ?
864	*/
865	void
866	object::destroy_inv (bool drop_to_ground)
867	{
868	if (!inv)
869	return;
870
871	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects
873	* drop on that space.
874	*/
875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
876	{
877	while (inv)
878	{
879	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();
881	}
882	}
883	else
884	{ /* Put objects in inventory onto this space */
885	while (inv)
886	{
887	object *op = inv;
888
889	if (op->flag [FLAG_STARTEQUIP]
890	|| op->flag [FLAG_NO_DROP]
891	|| op->type == RUNE
892	|| op->type == TRAP
893	|| op->flag [FLAG_IS_A_TEMPLATE])
894	op->destroy ();
895	else
896	{
897	op->remove ();
898	op->x = x;
899	op->y = y;
900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901	}
902	}
903	}
904	}	894	}
905		895
906	void	896	void
907	object::destroy (bool destroy_inventory)	897	object::destroy (bool destroy_inventory)
908	{	898	{
909	if (destroyed ())	899	if (destroyed ())
910	return;	900	return;
911		901
912	if (more)
913	{
914	//TODO: non-head objects must not have inventory
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918
919	if (destroy_inventory)	902	if (destroy_inventory)
920	destroy_inv (true);	903	destroy_inv (false);
921		904
922	attachable::destroy ();	905	attachable::destroy ();
923	}	906	}
924		907
925	/*	908	/*
…		…
943	* This function removes the object op from the linked list of objects	926	* This function removes the object op from the linked list of objects
944	* which it is currently tied to. When this function is done, the	927	* which it is currently tied to. When this function is done, the
945	* object will have no environment. If the object previously had an	928	* object will have no environment. If the object previously had an
946	* environment, the x and y coordinates will be updated to	929	* environment, the x and y coordinates will be updated to
947	* the previous environment.	930	* the previous environment.
948	* Beware: This function is called from the editor as well!
949	*/	931	*/
950	void	932	void
951	object::remove ()	933	object::do_remove ()
952	{	934	{
953	object *tmp, *last = 0;	935	object *tmp, *last = 0;
954	object *otmp;	936	object *otmp;
955		937
956	if (QUERY_FLAG (this, FLAG_REMOVED))	938	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
978	* to save cpu time.	960	* to save cpu time.
979	*/	961	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	962	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	963	otmp->update_stats ();
982		964
983	if (above != NULL)	965	if (above)
984	above->below = below;	966	above->below = below;
985	else	967	else
986	env->inv = below;	968	env->inv = below;
987		969
988	if (below != NULL)	970	if (below)
989	below->above = above;	971	below->above = above;
990		972
991	/* we set up values so that it could be inserted into	973	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	974	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	975	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	979	above = 0, below = 0;
998	env = 0;	980	env = 0;
999	}	981	}
1000	else if (map)	982	else if (map)
1001	{	983	{
1002	/* Re did the following section of code - it looks like it had	984	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	985	{
		986	// leaving a spot always closes any open container on the ground
		987	if (container && !container->env)
		988	// this causes spurious floorbox updates, but it ensures
		989	// that the CLOSE event is being sent.
		990	close_container ();
		991
		992	--map->players;
		993	map->touch ();
		994	}
		995
		996	map->dirty = true;
		997	mapspace &ms = this->ms ();
1005		998
1006	/* link the object above us */	999	/* link the object above us */
1007	if (above)	1000	if (above)
1008	above->below = below;	1001	above->below = below;
1009	else	1002	else
1010	map->at (x, y).top = below; /* we were top, set new top */	1003	ms.top = below; /* we were top, set new top */
1011		1004
1012	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1013	if (below)	1006	if (below)
1014	below->above = above;	1007	below->above = above;
1015	else	1008	else
…		…
1017	/* Nothing below, which means we need to relink map object for this space	1010	/* Nothing below, which means we need to relink map object for this space
1018	* use translated coordinates in case some oddness with map tiling is	1011	* use translated coordinates in case some oddness with map tiling is
1019	* evident	1012	* evident
1020	*/	1013	*/
1021	if (GET_MAP_OB (map, x, y) != this)	1014	if (GET_MAP_OB (map, x, y) != this)
1022	{
1023	char *dump = dump_object (this);
1024	LOG (llevError,
1025	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1015	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 ());
1026	free (dump);
1027	dump = dump_object (GET_MAP_OB (map, x, y));
1028	LOG (llevError, "%s\n", dump);
1029	free (dump);
1030	}
1031		1016
1032	map->at (x, y).bottom = above; /* goes on above it. */	1017	ms.bot = above; /* goes on above it. */
1033	}	1018	}
1034		1019
1035	above = 0;	1020	above = 0;
1036	below = 0;	1021	below = 0;
1037		1022
1038	if (map->in_memory == MAP_SAVING)	1023	if (map->in_memory == MAP_SAVING)
1039	return;	1024	return;
1040		1025
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	1026	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		1027
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1028	for (tmp = ms.bot; tmp; tmp = tmp->above)
1044	{	1029	{
1045	/* No point updating the players look faces if he is the object	1030	/* No point updating the players look faces if he is the object
1046	* being removed.	1031	* being removed.
1047	*/	1032	*/
1048		1033
…		…
1060		1045
1061	if (tmp->contr->ns)	1046	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();	1047	tmp->contr->ns->floorbox_update ();
1063	}	1048	}
1064		1049
1065	/* See if player moving off should effect something */	1050	/* See if object moving off should effect something */
1066	if (check_walk_off	1051	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1052	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1053	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1054	{
1070	move_apply (tmp, this, 0);	1055	move_apply (tmp, this, 0);
…		…
1072	if (destroyed ())	1057	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1058	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1059	}
1075		1060
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1061	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077		1062	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078	if (tmp->above == tmp)	1063	if (tmp->above == tmp)
1079	tmp->above = 0;	1064	tmp->above = 0;
1080		1065
1081	last = tmp;	1066	last = tmp;
1082	}	1067	}
1083		1068
1084	/* last == NULL of there are no objects on this space */	1069	/* last == NULL if there are no objects on this space */
		1070	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1071	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1072	map->at (x, y).flags_ = 0;
1087	else	1073	else
1088	update_object (last, UP_OBJ_REMOVE);	1074	update_object (last, UP_OBJ_REMOVE);
1089		1075
1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091	update_all_los (map, x, y);	1077	update_all_los (map, x, y);
…		…
1128		1114
1129	return 0;	1115	return 0;
1130	}	1116	}
1131		1117
1132	/*	1118	/*
1133	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1119	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1134	* job preparing multi-part monsters	1120	* job preparing multi-part monsters.
1135	*/	1121	*/
1136	object *	1122	object *
1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138	{	1124	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1126	{
1146	tmp->x = x + tmp->arch->clone.x;	1127	tmp->x = x + tmp->arch->clone.x;
1147	tmp->y = y + tmp->arch->clone.y;	1128	tmp->y = y + tmp->arch->clone.y;
1148	}	1129	}
1149		1130
…		…
1172	*/	1153	*/
1173	object *	1154	object *
1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175	{	1156	{
1176	object *tmp, *top, *floor = NULL;	1157	object *tmp, *top, *floor = NULL;
1177	sint16 x, y;
1178		1158
1179	if (QUERY_FLAG (op, FLAG_FREED))	1159	if (QUERY_FLAG (op, FLAG_FREED))
1180	{	1160	{
1181	LOG (llevError, "Trying to insert freed object!\n");	1161	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;	1162	return NULL;
1183	}	1163	}
1184		1164
1185	if (m == NULL)	1165	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1166	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1167
		1168	op->remove ();
		1169
		1170	if (!m)
1186	{	1171	{
1187	char *dump = dump_object (op);	1172	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1173	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1189	free (dump);	1174	free (dump);
1190	return op;	1175	return op;
…		…
1203	#endif	1188	#endif
1204	free (dump);	1189	free (dump);
1205	return op;	1190	return op;
1206	}	1191	}
1207		1192
1208	if (!QUERY_FLAG (op, FLAG_REMOVED))
1209	{
1210	char *dump = dump_object (op);
1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1212	free (dump);
1213	return op;
1214	}
1215
1216	if (op->more)
1217	{
1218	/* The part may be on a different map. */
1219
1220	object *more = op->more;	1193	if (object *more = op->more)
1221		1194	{
1222	/* We really need the caller to normalize coordinates - if
1223	* we set the map, that doesn't work if the location is within
1224	* a map and this is straddling an edge. So only if coordinate
1225	* is clear wrong do we normalize it.
1226	*/
1227	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228	more->map = get_map_from_coord (m, &more->x, &more->y);
1229	else if (!more->map)
1230	{
1231	/* For backwards compatibility - when not dealing with tiled maps,
1232	* more->map should always point to the parent.
1233	*/
1234	more->map = m;
1235	}
1236
1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1195	if (!insert_ob_in_map (more, m, originator, flag))
1238	{	1196	{
1239	if (!op->head)	1197	if (!op->head)
1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1198	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241		1199
1242	return 0;	1200	return 0;
…		…
1247		1205
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1206	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1207	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1208	* need extra work
1251	*/	1209	*/
1252	op->map = get_map_from_coord (m, &op->x, &op->y);	1210	if (!xy_normalise (m, op->x, op->y))
1253	x = op->x;	1211	return 0;
1254	y = op->y;	1212
		1213	op->map = m;
		1214	mapspace &ms = op->ms ();
1255		1215
1256	/* this has to be done after we translate the coordinates.	1216	/* this has to be done after we translate the coordinates.
1257	*/	1217	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1218	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1219	for (tmp = ms.bot; tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1220	if (object::can_merge (op, tmp))
1261	{	1221	{
1262	op->nrof += tmp->nrof;	1222	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1223	tmp->destroy ();
1264	}	1224	}
…		…
1281	op->below = originator->below;	1241	op->below = originator->below;
1282		1242
1283	if (op->below)	1243	if (op->below)
1284	op->below->above = op;	1244	op->below->above = op;
1285	else	1245	else
1286	op->ms ().bottom = op;	1246	ms.bot = op;
1287		1247
1288	/* since *below* originator, no need to update top */	1248	/* since *below* originator, no need to update top */
1289	originator->below = op;	1249	originator->below = op;
1290	}	1250	}
1291	else	1251	else
1292	{	1252	{
		1253	top = ms.bot;
		1254
1293	/* If there are other objects, then */	1255	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1256	if ((!(flag & INS_MAP_LOAD)) && top)
1295	{	1257	{
1296	object *last = NULL;	1258	object *last = 0;
1297		1259
1298	/*	1260	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1261	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1262	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1263	* Generally, we want to put the new object on top. But if
…		…
1305	* once we get to them. This reduces the need to traverse over all of	1267	* once we get to them. This reduces the need to traverse over all of
1306	* them when adding another one - this saves quite a bit of cpu time	1268	* them when adding another one - this saves quite a bit of cpu time
1307	* when lots of spells are cast in one area. Currently, it is presumed	1269	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1270	* that flying non pickable objects are spell objects.
1309	*/	1271	*/
1310		1272	for (top = ms.bot; top; top = top->above)
1311	while (top != NULL)
1312	{	1273	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1274	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1275	floor = top;
1315		1276
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1277	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1319	top = top->below;	1280	top = top->below;
1320	break;	1281	break;
1321	}	1282	}
1322		1283
1323	last = top;	1284	last = top;
1324	top = top->above;
1325	}	1285	}
1326		1286
1327	/* Don't want top to be NULL, so set it to the last valid object */	1287	/* Don't want top to be NULL, so set it to the last valid object */
1328	top = last;	1288	top = last;
1329		1289
…		…
1336	* Unless those objects are exits, type 66	1296	* Unless those objects are exits, type 66
1337	* If INS_ON_TOP is used, don't do this processing	1297	* If INS_ON_TOP is used, don't do this processing
1338	* Need to find the object that in fact blocks view, otherwise	1298	* Need to find the object that in fact blocks view, otherwise
1339	* stacking is a bit odd.	1299	* stacking is a bit odd.
1340	*/	1300	*/
1341	if (!(flag & INS_ON_TOP) &&	1301	if (!(flag & INS_ON_TOP)
1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1302	&& ms.flags () & P_BLOCKSVIEW
		1303	&& (op->face && !op->face->visibility))
1343	{	1304	{
1344	for (last = top; last != floor; last = last->below)	1305	for (last = top; last != floor; last = last->below)
1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1306	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346	break;	1307	break;
		1308
1347	/* Check to see if we found the object that blocks view,	1309	/* Check to see if we found the object that blocks view,
1348	* and make sure we have a below pointer for it so that	1310	* and make sure we have a below pointer for it so that
1349	* we can get inserted below this one, which requires we	1311	* we can get inserted below this one, which requires we
1350	* set top to the object below us.	1312	* set top to the object below us.
1351	*/	1313	*/
…		…
1353	top = last->below;	1315	top = last->below;
1354	}	1316	}
1355	} /* If objects on this space */	1317	} /* If objects on this space */
1356		1318
1357	if (flag & INS_MAP_LOAD)	1319	if (flag & INS_MAP_LOAD)
1358	top = GET_MAP_TOP (op->map, op->x, op->y);	1320	top = ms.top;
1359		1321
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1322	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1323	top = floor;
1362		1324
1363	/* Top is the object that our object (op) is going to get inserted above.	1325	/* Top is the object that our object (op) is going to get inserted above.
1364	*/	1326	*/
1365		1327
1366	/* First object on this space */	1328	/* First object on this space */
1367	if (!top)	1329	if (!top)
1368	{	1330	{
1369	op->above = GET_MAP_OB (op->map, op->x, op->y);	1331	op->above = ms.bot;
1370		1332
1371	if (op->above)	1333	if (op->above)
1372	op->above->below = op;	1334	op->above->below = op;
1373		1335
1374	op->below = NULL;	1336	op->below = 0;
1375	op->ms ().bottom = op;	1337	ms.bot = op;
1376	}	1338	}
1377	else	1339	else
1378	{ /* get inserted into the stack above top */	1340	{ /* get inserted into the stack above top */
1379	op->above = top->above;	1341	op->above = top->above;
1380		1342
…		…
1383		1345
1384	op->below = top;	1346	op->below = top;
1385	top->above = op;	1347	top->above = op;
1386	}	1348	}
1387		1349
1388	if (op->above == NULL)	1350	if (!op->above)
1389	op->ms ().top = op;	1351	ms.top = op;
1390	} /* else not INS_BELOW_ORIGINATOR */	1352	} /* else not INS_BELOW_ORIGINATOR */
1391		1353
1392	if (op->type == PLAYER)	1354	if (op->type == PLAYER)
		1355	{
1393	op->contr->do_los = 1;	1356	op->contr->do_los = 1;
		1357	++op->map->players;
		1358	op->map->touch ();
		1359	}
		1360
		1361	op->map->dirty = true;
1394		1362
1395	/* If we have a floor, we know the player, if any, will be above	1363	/* If we have a floor, we know the player, if any, will be above
1396	* it, so save a few ticks and start from there.	1364	* it, so save a few ticks and start from there.
1397	*/	1365	*/
1398	if (!(flag & INS_MAP_LOAD))	1366	if (!(flag & INS_MAP_LOAD))
1399	if (object *pl = op->ms ().player ())	1367	if (object *pl = ms.player ())
1400	if (pl->contr->ns)	1368	if (pl->contr->ns)
1401	pl->contr->ns->floorbox_update ();	1369	pl->contr->ns->floorbox_update ();
1402		1370
1403	/* If this object glows, it may affect lighting conditions that are	1371	/* If this object glows, it may affect lighting conditions that are
1404	* visible to others on this map. But update_all_los is really	1372	* visible to others on this map. But update_all_los is really
1405	* an inefficient way to do this, as it means los for all players	1373	* an inefficient way to do this, as it means los for all players
1406	* on the map will get recalculated. The players could very well	1374	* on the map will get recalculated. The players could very well
1407	* be far away from this change and not affected in any way -	1375	* be far away from this change and not affected in any way -
1408	* this should get redone to only look for players within range,	1376	* this should get redone to only look for players within range,
1409	* or just updating the P_NEED_UPDATE for spaces within this area	1377	* or just updating the P_UPTODATE for spaces within this area
1410	* of effect may be sufficient.	1378	* of effect may be sufficient.
1411	*/	1379	*/
1412	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1380	if (op->map->darkness && (op->glow_radius != 0))
1413	update_all_los (op->map, op->x, op->y);	1381	update_all_los (op->map, op->x, op->y);
1414		1382
1415	/* updates flags (blocked, alive, no magic, etc) for this map space */	1383	/* updates flags (blocked, alive, no magic, etc) for this map space */
1416	update_object (op, UP_OBJ_INSERT);	1384	update_object (op, UP_OBJ_INSERT);
1417		1385
…		…
1452	{	1420	{
1453	object *tmp, *tmp1;	1421	object *tmp, *tmp1;
1454		1422
1455	/* first search for itself and remove any old instances */	1423	/* first search for itself and remove any old instances */
1456		1424
1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1425	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1426	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459	tmp->destroy ();	1427	tmp->destroy ();
1460		1428
1461	tmp1 = arch_to_object (archetype::find (arch_string));	1429	tmp1 = arch_to_object (archetype::find (arch_string));
1462		1430
1463	tmp1->x = op->x;	1431	tmp1->x = op->x;
1464	tmp1->y = op->y;	1432	tmp1->y = op->y;
1465	insert_ob_in_map (tmp1, op->map, op, 0);	1433	insert_ob_in_map (tmp1, op->map, op, 0);
		1434	}
		1435
		1436	object *
		1437	object::insert_at (object *where, object *originator, int flags)
		1438	{
		1439	where->map->insert (this, where->x, where->y, originator, flags);
1466	}	1440	}
1467		1441
1468	/*	1442	/*
1469	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1443	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1470	* is returned contains nr objects, and the remaining parts contains	1444	* is returned contains nr objects, and the remaining parts contains
1471	* the rest (or is removed and freed if that number is 0).	1445	* the rest (or is removed and freed if that number is 0).
1472	* On failure, NULL is returned, and the reason put into the	1446	* On failure, NULL is returned, and the reason put into the
1473	* global static errmsg array.	1447	* global static errmsg array.
1474	*/	1448	*/
1475
1476	object *	1449	object *
1477	get_split_ob (object *orig_ob, uint32 nr)	1450	get_split_ob (object *orig_ob, uint32 nr)
1478	{	1451	{
1479	object *newob;	1452	object *newob;
1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1453	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1703	if ((op->glow_radius != 0) && map)	1676	if ((op->glow_radius != 0) && map)
1704	{	1677	{
1705	#ifdef DEBUG_LIGHTS	1678	#ifdef DEBUG_LIGHTS
1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1679	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707	#endif /* DEBUG_LIGHTS */	1680	#endif /* DEBUG_LIGHTS */
1708	if (MAP_DARKNESS (map))	1681	if (map->darkness)
1709	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1710	}	1683	}
1711		1684
1712	/* Client has no idea of ordering so lets not bother ordering it here.	1685	/* Client has no idea of ordering so lets not bother ordering it here.
1713	* It sure simplifies this function...	1686	* It sure simplifies this function...
…		…
1744	*	1717	*
1745	* MSW 2001-07-08: Check all objects on space, not just those below	1718	* MSW 2001-07-08: Check all objects on space, not just those below
1746	* object being inserted. insert_ob_in_map may not put new objects	1719	* object being inserted. insert_ob_in_map may not put new objects
1747	* on top.	1720	* on top.
1748	*/	1721	*/
1749
1750	int	1722	int
1751	check_move_on (object *op, object *originator)	1723	check_move_on (object *op, object *originator)
1752	{	1724	{
1753	object *tmp;	1725	object *tmp;
1754	maptile *m = op->map;	1726	maptile *m = op->map;
…		…
1781		1753
1782	/* The objects have to be checked from top to bottom.	1754	/* The objects have to be checked from top to bottom.
1783	* Hence, we first go to the top:	1755	* Hence, we first go to the top:
1784	*/	1756	*/
1785		1757
1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1758	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787	{	1759	{
1788	/* Trim the search when we find the first other spell effect	1760	/* Trim the search when we find the first other spell effect
1789	* this helps performance so that if a space has 50 spell objects,	1761	* this helps performance so that if a space has 50 spell objects,
1790	* we don't need to check all of them.	1762	* we don't need to check all of them.
1791	*/	1763	*/
…		…
1809	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1781	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1810	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1782	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1811	{	1783	{
1812		1784
1813	float	1785	float
1814	diff = tmp->move_slow_penalty * FABS (op->speed);	1786	diff = tmp->move_slow_penalty * fabs (op->speed);
1815		1787
1816	if (op->type == PLAYER)	1788	if (op->type == PLAYER)
1817	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1789	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1818	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1790	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1819	diff /= 4.0;	1791	diff /= 4.0;
…		…
1846	/*	1818	/*
1847	* present_arch(arch, map, x, y) searches for any objects with	1819	* present_arch(arch, map, x, y) searches for any objects with
1848	* a matching archetype at the given map and coordinates.	1820	* a matching archetype at the given map and coordinates.
1849	* The first matching object is returned, or NULL if none.	1821	* The first matching object is returned, or NULL if none.
1850	*/	1822	*/
1851
1852	object *	1823	object *
1853	present_arch (const archetype *at, maptile *m, int x, int y)	1824	present_arch (const archetype *at, maptile *m, int x, int y)
1854	{	1825	{
1855	object *
1856	tmp;
1857
1858	if (m == NULL || out_of_map (m, x, y))	1826	if (!m || out_of_map (m, x, y))
1859	{	1827	{
1860	LOG (llevError, "Present_arch called outside map.\n");	1828	LOG (llevError, "Present_arch called outside map.\n");
1861	return NULL;	1829	return NULL;
1862	}	1830	}
1863	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1831
		1832	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1864	if (tmp->arch == at)	1833	if (tmp->arch == at)
1865	return tmp;	1834	return tmp;
		1835
1866	return NULL;	1836	return NULL;
1867	}	1837	}
1868		1838
1869	/*	1839	/*
1870	* present(type, map, x, y) searches for any objects with	1840	* present(type, map, x, y) searches for any objects with
1871	* a matching type variable at the given map and coordinates.	1841	* a matching type variable at the given map and coordinates.
1872	* The first matching object is returned, or NULL if none.	1842	* The first matching object is returned, or NULL if none.
1873	*/	1843	*/
1874
1875	object *	1844	object *
1876	present (unsigned char type, maptile *m, int x, int y)	1845	present (unsigned char type, maptile *m, int x, int y)
1877	{	1846	{
1878	object *
1879	tmp;
1880
1881	if (out_of_map (m, x, y))	1847	if (out_of_map (m, x, y))
1882	{	1848	{
1883	LOG (llevError, "Present called outside map.\n");	1849	LOG (llevError, "Present called outside map.\n");
1884	return NULL;	1850	return NULL;
1885	}	1851	}
1886	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1852
		1853	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1887	if (tmp->type == type)	1854	if (tmp->type == type)
1888	return tmp;	1855	return tmp;
		1856
1889	return NULL;	1857	return NULL;
1890	}	1858	}
1891		1859
1892	/*	1860	/*
1893	* present_in_ob(type, object) searches for any objects with	1861	* present_in_ob(type, object) searches for any objects with
1894	* a matching type variable in the inventory of the given object.	1862	* a matching type variable in the inventory of the given object.
1895	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
1896	*/	1864	*/
1897
1898	object *	1865	object *
1899	present_in_ob (unsigned char type, const object *op)	1866	present_in_ob (unsigned char type, const object *op)
1900	{	1867	{
1901	object *
1902	tmp;
1903
1904	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1868	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905	if (tmp->type == type)	1869	if (tmp->type == type)
1906	return tmp;	1870	return tmp;
		1871
1907	return NULL;	1872	return NULL;
1908	}	1873	}
1909		1874
1910	/*	1875	/*
1911	* present_in_ob (type, str, object) searches for any objects with	1876	* present_in_ob (type, str, object) searches for any objects with
…		…
1922	* to be unique.	1887	* to be unique.
1923	*/	1888	*/
1924	object *	1889	object *
1925	present_in_ob_by_name (int type, const char *str, const object *op)	1890	present_in_ob_by_name (int type, const char *str, const object *op)
1926	{	1891	{
1927	object *tmp;
1928
1929	for (tmp = op->inv; tmp; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1893	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931	return tmp;	1894	return tmp;
1932		1895
1933	return 0;	1896	return 0;
1934	}	1897	}
…		…
2035	}	1998	}
2036		1999
2037	if (!index)	2000	if (!index)
2038	return -1;	2001	return -1;
2039		2002
2040	return altern[RANDOM () % index];	2003	return altern [rndm (index)];
2041	}	2004	}
2042		2005
2043	/*	2006	/*
2044	* find_first_free_spot(archetype, maptile, x, y) works like	2007	* find_first_free_spot(archetype, maptile, x, y) works like
2045	* find_free_spot(), but it will search max number of squares.	2008	* find_free_spot(), but it will search max number of squares.
…		…
2066	{	2029	{
2067	arr += begin;	2030	arr += begin;
2068	end -= begin;	2031	end -= begin;
2069		2032
2070	while (--end)	2033	while (--end)
2071	swap (arr [end], arr [RANDOM () % (end + 1)]);	2034	swap (arr [end], arr [rndm (end + 1)]);
2072	}	2035	}
2073		2036
2074	/* new function to make monster searching more efficient, and effective!	2037	/* new function to make monster searching more efficient, and effective!
2075	* This basically returns a randomized array (in the passed pointer) of	2038	* This basically returns a randomized array (in the passed pointer) of
2076	* the spaces to find monsters. In this way, it won't always look for	2039	* the spaces to find monsters. In this way, it won't always look for
…		…
2143		2106
2144	if ((move_type & blocked) == move_type)	2107	if ((move_type & blocked) == move_type)
2145	max = maxfree[i];	2108	max = maxfree[i];
2146	else if (mflags & P_IS_ALIVE)	2109	else if (mflags & P_IS_ALIVE)
2147	{	2110	{
2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)	2111	for (tmp = ms.bot; tmp; tmp = tmp->above)
2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2112	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2113	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2151	break;	2114	break;
2152		2115
2153	if (tmp)	2116	if (tmp)
…		…
2210		2173
2211	return 3;	2174	return 3;
2212	}	2175	}
2213		2176
2214	/*	2177	/*
2215	* absdir(int): Returns a number between 1 and 8, which represent
2216	* the "absolute" direction of a number (it actually takes care of
2217	* "overflow" in previous calculations of a direction).
2218	*/
2219
2220	int
2221	absdir (int d)
2222	{
2223	while (d < 1)
2224	d += 8;
2225
2226	while (d > 8)
2227	d -= 8;
2228
2229	return d;
2230	}
2231
2232	/*
2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2178	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234	* between two directions (which are expected to be absolute (see absdir())	2179	* between two directions (which are expected to be absolute (see absdir())
2235	*/	2180	*/
2236
2237	int	2181	int
2238	dirdiff (int dir1, int dir2)	2182	dirdiff (int dir1, int dir2)
2239	{	2183	{
2240	int d;	2184	int d;
2241		2185
…		…
2407	insert_ob_in_ob (object_create_clone (item), dst);	2351	insert_ob_in_ob (object_create_clone (item), dst);
2408		2352
2409	return dst;	2353	return dst;
2410	}	2354	}
2411		2355
2412	/* GROS - Creates an object using a string representing its content. */
2413	/* Basically, we save the content of the string to a temp file, then call */
2414	/* load_object on it. I admit it is a highly inefficient way to make things, */
2415	/* but it was simple to make and allows reusing the load_object function. */
2416	/* Remember not to use load_object_str in a time-critical situation. */
2417	/* Also remember that multiparts objects are not supported for now. */
2418	object *
2419	load_object_str (const char *obstr)
2420	{
2421	object *op;
2422	char filename[MAX_BUF];
2423
2424	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2425
2426	FILE *tempfile = fopen (filename, "w");
2427
2428	if (tempfile == NULL)
2429	{
2430	LOG (llevError, "Error - Unable to access load object temp file\n");
2431	return NULL;
2432	}
2433
2434	fprintf (tempfile, obstr);
2435	fclose (tempfile);
2436
2437	op = object::create ();
2438
2439	object_thawer thawer (filename);
2440
2441	if (thawer)
2442	load_object (thawer, op, 0);
2443
2444	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2445	CLEAR_FLAG (op, FLAG_REMOVED);
2446
2447	return op;
2448	}
2449
2450	/* This returns the first object in who's inventory that	2356	/* This returns the first object in who's inventory that
2451	* has the same type and subtype match.	2357	* has the same type and subtype match.
2452	* returns NULL if no match.	2358	* returns NULL if no match.
2453	*/	2359	*/
2454	object *	2360	object *
…		…
2620	}	2526	}
2621	else	2527	else
2622	item = item->env;	2528	item = item->env;
2623	}	2529	}
2624		2530
		2531
		2532	const char *
		2533	object::flag_desc (char *desc, int len) const
		2534	{
		2535	char *p = desc;
		2536	bool first = true;
		2537
		2538	*p = 0;
		2539
		2540	for (int i = 0; i < NUM_FLAGS; i++)
		2541	{
		2542	if (len <= 10) // magic constant!
		2543	{
		2544	snprintf (p, len, ",...");
		2545	break;
		2546	}
		2547
		2548	if (flag [i])
		2549	{
		2550	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2551	len -= cnt;
		2552	p += cnt;
		2553	first = false;
		2554	}
		2555	}
		2556
		2557	return desc;
		2558	}
		2559
2625	// return a suitable string describing an objetc in enough detail to find it	2560	// return a suitable string describing an object in enough detail to find it
2626	const char *	2561	const char *
2627	object::debug_desc (char *info) const	2562	object::debug_desc (char *info) const
2628	{	2563	{
		2564	char flagdesc[512];
2629	char info2[256 * 3];	2565	char info2[256 * 4];
2630	char *p = info;	2566	char *p = info;
2631		2567
2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2568	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2633	count,	2569	count, uuid.seq,
2634	&name,	2570	&name,
2635	title ? " " : "",	2571	title ? "\",title:\"" : "",
2636	title ? (const char *)title : "");	2572	title ? (const char *)title : "",
		2573	flag_desc (flagdesc, 512), type);
2637		2574
2638	if (env)	2575	if (env)
2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2576	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640		2577
2641	if (map)	2578	if (map)
2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2579	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643		2580
2644	return info;	2581	return info;
2645	}	2582	}
2646		2583
2647	const char *	2584	const char *
2648	object::debug_desc () const	2585	object::debug_desc () const
2649	{	2586	{
2650	static char info[256 * 3];	2587	static char info[256 * 4];
2651	return debug_desc (info);	2588	return debug_desc (info);
2652	}	2589	}
2653		2590
		2591	const char *
		2592	object::debug_desc2 () const
		2593	{
		2594	static char info[256 * 4];
		2595	return debug_desc (info);
		2596	}
		2597
		2598	struct region *
		2599	object::region () const
		2600	{
		2601	return map ? map->region (x, y)
		2602	: region::default_region ();
		2603	}
		2604
		2605	const materialtype_t *
		2606	object::dominant_material () const
		2607	{
		2608	if (materialtype_t *mat = name_to_material (materialname))
		2609	return mat;
		2610
		2611	// omfg this is slow, this has to be temporary :)
		2612	shstr unknown ("unknown");
		2613
		2614	return name_to_material (unknown);
		2615	}
		2616
		2617	void
		2618	object::open_container (object *new_container)
		2619	{
		2620	if (container == new_container)
		2621	return;
		2622
		2623	if (object *old_container = container)
		2624	{
		2625	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2626	return;
		2627
		2628	#if 0
		2629	// remove the "Close old_container" object.
		2630	if (object *closer = old_container->inv)
		2631	if (closer->type == CLOSE_CON)
		2632	closer->destroy ();
		2633	#endif
		2634
		2635	old_container->flag [FLAG_APPLIED] = 0;
		2636	container = 0;
		2637
		2638	esrv_update_item (UPD_FLAGS, this, old_container);
		2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2640	}
		2641
		2642	if (new_container)
		2643	{
		2644	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2645	return;
		2646
		2647	// TODO: this does not seem to serve any purpose anymore?
		2648	#if 0
		2649	// insert the "Close Container" object.
		2650	if (archetype *closer = new_container->other_arch)
		2651	{
		2652	object *closer = arch_to_object (new_container->other_arch);
		2653	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2654	new_container->insert (closer);
		2655	}
		2656	#endif
		2657
		2658	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2659
		2660	new_container->flag [FLAG_APPLIED] = 1;
		2661	container = new_container;
		2662
		2663	esrv_update_item (UPD_FLAGS, this, new_container);
		2664	esrv_send_inventory (this, new_container);
		2665	}
		2666	}
		2667
		2668

Diff Legend

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