[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.134 by pippijn, Thu Mar 1 12:28:16 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,
…		…
355	/*	357	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	359	* Some error messages.
358	* 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.
359	*/	361	*/
360
361	char *	362	char *
362	dump_object (object *op)	363	dump_object (object *op)
363	{	364	{
364	if (!op)	365	if (!op)
365	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
366		367
367	object_freezer freezer;	368	object_freezer freezer;
368	save_object (freezer, op, 1);	369	op->write (freezer);
369	return freezer.as_string ();	370	return freezer.as_string ();
370	}	371	}
371		372
372	/*	373	/*
373	* 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
…		…
390	}	391	}
391		392
392	/*	393	/*
393	* 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.
394	*/	395	*/
395
396	object *	396	object *
397	find_object (tag_t i)	397	find_object (tag_t i)
398	{	398	{
399	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
400	if (op->count == i)	400	if (op->count == i)
401	return op;	401	return op;
402		402
403	return 0;	403	return 0;
404	}	404	}
405		405
406	/*	406	/*
407	* 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.
408	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
410	*/	410	*/
411
412	object *	411	object *
413	find_object_name (const char *str)	412	find_object_name (const char *str)
414	{	413	{
415	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
416	object *op;	415	object *op;
417		416
418	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
419	if (op->name == str_)	418	if (op->name == str_)
420	break;	419	break;
421		420
422	return op;	421	return op;
423	}	422	}
…		…
489		488
490	if (is_removed)	489	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);	490	SET_FLAG (dst, FLAG_REMOVED);
492		491
493	if (speed < 0)	492	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	493	dst->speed_left = speed_left - rndm ();
495		494
496	/* Copy over key_values, if any. */	495	/* Copy over key_values, if any. */
497	if (key_values)	496	if (key_values)
498	{	497	{
499	key_value *tail = 0;	498	key_value *tail = 0;
…		…
524	}	523	}
525		524
526	dst->set_speed (dst->speed);	525	dst->set_speed (dst->speed);
527	}	526	}
528		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 ();
		544	}
		545
529	object *	546	object *
530	object::clone ()	547	object::clone ()
531	{	548	{
532	object *neu = create ();	549	object *neu = create ();
533	copy_to (neu);	550	copy_to (neu);
…		…
564	}	581	}
565		582
566	this->speed = speed;	583	this->speed = speed;
567		584
568	if (has_active_speed ())	585	if (has_active_speed ())
569	activate (false);	586	activate ();
570	else	587	else
571	deactivate (false);	588	deactivate ();
572	}	589	}
573		590
574	/*	591	/*
575	* update_object() updates the the map.	592	* update_object() updates the the map.
576	* It takes into account invisible objects (and represent squares covered	593	* It takes into account invisible objects (and represent squares covered
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	606	* UP_OBJ_FACE: only the objects face has changed.
590	*/	607	*/
591	void	608	void
592	update_object (object *op, int action)	609	update_object (object *op, int action)
593	{	610	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	611	if (op == NULL)
597	{	612	{
598	/* this should never happen */	613	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	614	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	615	return;
…		…
624	return;	639	return;
625	}	640	}
626		641
627	mapspace &m = op->ms ();	642	mapspace &m = op->ms ();
628		643
629	if (m.flags_ & P_NEED_UPDATE)	644	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	645	/* nop */;
631	else if (action == UP_OBJ_INSERT)	646	else if (action == UP_OBJ_INSERT)
632	{	647	{
633	// this is likely overkill, TODO: revisit (schmorp)	648	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	649	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
643	/* This isn't perfect, but I don't expect a lot of objects to	658	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	659	* to have move_allow right now.
645	*/	660	*/
646	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	661	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
647	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	662	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = P_NEED_UPDATE;	663	m.flags_ = 0;
649	}	664	}
650	/* if the object is being removed, we can't make intelligent	665	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	666	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	667	* that is being removed.
653	*/	668	*/
654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	669	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	670	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	671	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	672	/* Nothing to do for that case */ ;
658	else	673	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	674	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		675
661	if (op->more)	676	if (op->more)
662	update_object (op->more, action);	677	update_object (op->more, action);
663	}	678	}
664		679
665	object::vector object::objects; // not yet used
666	object *object::first;
667
668	object::object ()	680	object::object ()
669	{	681	{
670	SET_FLAG (this, FLAG_REMOVED);	682	SET_FLAG (this, FLAG_REMOVED);
671		683
672	expmul = 1.0;	684	expmul = 1.0;
673	face = blank_face;	685	face = blank_face;
674	}	686	}
675		687
676	object::~object ()	688	object::~object ()
677	{	689	{
		690	unlink ();
		691
678	free_key_values (this);	692	free_key_values (this);
679	}	693	}
680		694
		695	static int object_count;
		696
681	void object::link ()	697	void object::link ()
682	{	698	{
683	count = ++ob_count;	699	assert (!index);//D
684	uuid = gen_uuid ();	700	uuid = gen_uuid ();
		701	count = ++object_count;
685		702
686	prev = 0;	703	refcnt_inc ();
687	next = object::first;	704	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	705	}
694		706
695	void object::unlink ()	707	void object::unlink ()
696	{	708	{
697	if (this == object::first)	709	if (!index)
698	object::first = next;	710	return;
699		711
700	/* Remove this object from the list of used objects */	712	objects.erase (this);
701	if (prev) prev->next = next;	713	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}	714	}
707		715
708	void	716	void
709	object::activate (bool recursive)	717	object::activate ()
710	{	718	{
		719	/* If already on active list, don't do anything */
		720	if (active)
		721	return;
		722
711	if (has_active_speed ())	723	if (has_active_speed ())
712	{	724	actives.insert (this);
713	/* If already on active list, don't do anything */	725	}
714	if (active_next \|\| active_prev \|\| this == active_objects)
715	return;
716		726
717	/* process_events() expects us to insert the object at the beginning	727	void
718	* of the list. */	728	object::activate_recursive ()
719	active_next = active_objects;	729	{
		730	activate ();
720		731
721	if (active_next)
722	active_next->active_prev = this;
723
724	active_objects = this;
725	}
726
727	if (recursive)
728	for (object *op = inv; op; op = op->above)	732	for (object *op = inv; op; op = op->below)
729	op->activate (1);	733	op->activate_recursive ();
730	}	734	}
731		735
732	/* This function removes object 'op' from the list of active	736	/* This function removes object 'op' from the list of active
733	* objects.	737	* objects.
734	* This should only be used for style maps or other such	738	* This should only be used for style maps or other such
…		…
736	* in play chewing up cpu time getting processed.	740	* in play chewing up cpu time getting processed.
737	* The reverse of this is to call update_ob_speed, which	741	* The reverse of this is to call update_ob_speed, which
738	* will do the right thing based on the speed of the object.	742	* will do the right thing based on the speed of the object.
739	*/	743	*/
740	void	744	void
741	object::deactivate (bool recursive)	745	object::deactivate ()
742	{	746	{
743	/* If not on the active list, nothing needs to be done */	747	/* If not on the active list, nothing needs to be done */
744	if (!active_next && !active_prev && this != active_objects)	748	if (!active)
745	return;	749	return;
746		750
747	if (active_prev == 0)	751	actives.erase (this);
748	{	752	}
749	active_objects = active_next;
750	if (active_next)
751	active_next->active_prev = 0;
752	}
753	else
754	{
755	active_prev->active_next = active_next;
756	if (active_next)
757	active_next->active_prev = active_prev;
758	}
759		753
760	active_next = 0;	754	void
761	active_prev = 0;	755	object::deactivate_recursive ()
762		756	{
763	if (recursive)
764	for (object *op = inv; op; op = op->above)	757	for (object *op = inv; op; op = op->below)
		758	op->deactivate_recursive ();
		759
765	op->deactivate (1);	760	deactivate ();
		761	}
		762
		763	void
		764	object::set_flag_inv (int flag, int value)
		765	{
		766	for (object *op = inv; op; op = op->below)
		767	{
		768	op->flag [flag] = value;
		769	op->set_flag_inv (flag, value);
		770	}
766	}	771	}
767		772
768	/*	773	/*
769	* Remove and free all objects in the inventory of the given object.	774	* Remove and free all objects in the inventory of the given object.
770	* object.c ?	775	* object.c ?
…		…
785	* drop on that space.	790	* drop on that space.
786	*/	791	*/
787	if (!drop_to_ground	792	if (!drop_to_ground
788	\|\| !map	793	\|\| !map
789	\|\| map->in_memory != MAP_IN_MEMORY	794	\|\| map->in_memory != MAP_IN_MEMORY
		795	\|\| map->nodrop
790	\|\| ms ().move_block == MOVE_ALL)	796	\|\| ms ().move_block == MOVE_ALL)
791	{	797	{
792	while (inv)	798	while (inv)
793	{	799	{
794	inv->destroy_inv (drop_to_ground);	800	inv->destroy_inv (drop_to_ground);
…		…
803		809
804	if (op->flag [FLAG_STARTEQUIP]	810	if (op->flag [FLAG_STARTEQUIP]
805	\|\| op->flag [FLAG_NO_DROP]	811	\|\| op->flag [FLAG_NO_DROP]
806	\|\| op->type == RUNE	812	\|\| op->type == RUNE
807	\|\| op->type == TRAP	813	\|\| op->type == TRAP
808	\|\| op->flag [FLAG_IS_A_TEMPLATE])	814	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		815	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
809	op->destroy ();	816	op->destroy ();
810	else	817	else
811	map->insert (op, x, y);	818	map->insert (op, x, y);
812	}	819	}
813	}	820	}
…		…
821	}	828	}
822		829
823	void	830	void
824	object::do_destroy ()	831	object::do_destroy ()
825	{	832	{
		833	attachable::do_destroy ();
		834
826	if (flag [FLAG_IS_LINKED])	835	if (flag [FLAG_IS_LINKED])
827	remove_button_link (this);	836	remove_button_link (this);
828		837
829	if (flag [FLAG_FRIENDLY])	838	if (flag [FLAG_FRIENDLY])
		839	{
830	remove_friendly_object (this);	840	remove_friendly_object (this);
		841
		842	if (type == GOLEM
		843	&& owner
		844	&& owner->type == PLAYER
		845	&& owner->contr->ranges[range_golem] == this)
		846	owner->contr->ranges[range_golem] = 0;
		847	}
831		848
832	if (!flag [FLAG_REMOVED])	849	if (!flag [FLAG_REMOVED])
833	remove ();	850	remove ();
834		851
835	if (flag [FLAG_FREED])	852	destroy_inv (true);
836	return;
837		853
838	set_speed (0);	854	deactivate ();
		855	unlink ();
839		856
840	flag [FLAG_FREED] = 1;	857	flag [FLAG_FREED] = 1;
841
842	attachable::do_destroy ();
843
844	destroy_inv (true);
845	unlink ();
846		858
847	// hack to ensure that freed objects still have a valid map	859	// hack to ensure that freed objects still have a valid map
848	{	860	{
849	static maptile *freed_map; // freed objects are moved here to avoid crashes	861	static maptile *freed_map; // freed objects are moved here to avoid crashes
850		862
…		…
855	freed_map->name = "/internal/freed_objects_map";	867	freed_map->name = "/internal/freed_objects_map";
856	freed_map->width = 3;	868	freed_map->width = 3;
857	freed_map->height = 3;	869	freed_map->height = 3;
858		870
859	freed_map->alloc ();	871	freed_map->alloc ();
		872	freed_map->in_memory = MAP_IN_MEMORY;
860	}	873	}
861		874
862	map = freed_map;	875	map = freed_map;
863	x = 1;	876	x = 1;
864	y = 1;	877	y = 1;
…		…
874		887
875	// clear those pointers that likely might have circular references to us	888	// clear those pointers that likely might have circular references to us
876	owner = 0;	889	owner = 0;
877	enemy = 0;	890	enemy = 0;
878	attacked_by = 0;	891	attacked_by = 0;
879
880	// only relevant for players(?), but make sure of it anyways
881	contr = 0;
882	}	892	}
883		893
884	void	894	void
885	object::destroy (bool destroy_inventory)	895	object::destroy (bool destroy_inventory)
886	{	896	{
…		…
914	* This function removes the object op from the linked list of objects	924	* This function removes the object op from the linked list of objects
915	* which it is currently tied to. When this function is done, the	925	* which it is currently tied to. When this function is done, the
916	* object will have no environment. If the object previously had an	926	* object will have no environment. If the object previously had an
917	* environment, the x and y coordinates will be updated to	927	* environment, the x and y coordinates will be updated to
918	* the previous environment.	928	* the previous environment.
919	* Beware: This function is called from the editor as well!
920	*/	929	*/
921	void	930	void
922	object::remove ()	931	object::do_remove ()
923	{	932	{
924	object tmp, last = 0;	933	object tmp, last = 0;
925	object *otmp;	934	object *otmp;
926		935
927	if (QUERY_FLAG (this, FLAG_REMOVED))	936	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
970	}	979	}
971	else if (map)	980	else if (map)
972	{	981	{
973	if (type == PLAYER)	982	if (type == PLAYER)
974	{	983	{
		984	// leaving a spot always closes any open container on the ground
		985	if (container && !container->env)
		986	// this causes spurious floorbox updates, but it ensures
		987	// that the CLOSE event is being sent.
		988	close_container ();
		989
975	--map->players;	990	--map->players;
976	map->last_access = runtime;	991	map->touch ();
977	}	992	}
978		993
		994	map->dirty = true;
		995	mapspace &ms = this->ms ();
979		996
980	/* link the object above us */	997	/* link the object above us */
981	if (above)	998	if (above)
982	above->below = below;	999	above->below = below;
983	else	1000	else
984	map->at (x, y).top = below; /* we were top, set new top */	1001	ms.top = below; /* we were top, set new top */
985		1002
986	/* Relink the object below us, if there is one */	1003	/* Relink the object below us, if there is one */
987	if (below)	1004	if (below)
988	below->above = above;	1005	below->above = above;
989	else	1006	else
…		…
991	/* Nothing below, which means we need to relink map object for this space	1008	/* Nothing below, which means we need to relink map object for this space
992	* use translated coordinates in case some oddness with map tiling is	1009	* use translated coordinates in case some oddness with map tiling is
993	* evident	1010	* evident
994	*/	1011	*/
995	if (GET_MAP_OB (map, x, y) != this)	1012	if (GET_MAP_OB (map, x, y) != this)
996	{
997	char *dump = dump_object (this);
998	LOG (llevError,
999	"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);	1013	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 ());
1000	free (dump);
1001	dump = dump_object (GET_MAP_OB (map, x, y));
1002	LOG (llevError, "%s\n", dump);
1003	free (dump);
1004	}
1005		1014
1006	map->at (x, y).bot = above; /* goes on above it. */	1015	ms.bot = above; /* goes on above it. */
1007	}	1016	}
1008		1017
1009	above = 0;	1018	above = 0;
1010	below = 0;	1019	below = 0;
1011		1020
1012	if (map->in_memory == MAP_SAVING)	1021	if (map->in_memory == MAP_SAVING)
1013	return;	1022	return;
1014		1023
1015	int check_walk_off = !flag [FLAG_NO_APPLY];	1024	int check_walk_off = !flag [FLAG_NO_APPLY];
1016		1025
1017	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1026	for (tmp = ms.bot; tmp; tmp = tmp->above)
1018	{	1027	{
1019	/* No point updating the players look faces if he is the object	1028	/* No point updating the players look faces if he is the object
1020	* being removed.	1029	* being removed.
1021	*/	1030	*/
1022		1031
…		…
1056	}	1065	}
1057		1066
1058	/* last == NULL if there are no objects on this space */	1067	/* last == NULL if there are no objects on this space */
1059	//TODO: this makes little sense, why only update the topmost object?	1068	//TODO: this makes little sense, why only update the topmost object?
1060	if (!last)	1069	if (!last)
1061	map->at (x, y).flags_ = P_NEED_UPDATE;	1070	map->at (x, y).flags_ = 0;
1062	else	1071	else
1063	update_object (last, UP_OBJ_REMOVE);	1072	update_object (last, UP_OBJ_REMOVE);
1064		1073
1065	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1074	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1066	update_all_los (map, x, y);	1075	update_all_los (map, x, y);
…		…
1103		1112
1104	return 0;	1113	return 0;
1105	}	1114	}
1106		1115
1107	/*	1116	/*
1108	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1117	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1109	* job preparing multi-part monsters	1118	* job preparing multi-part monsters.
1110	*/	1119	*/
1111	object *	1120	object *
1112	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1121	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1113	{	1122	{
1114	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1123	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1142	*/	1151	*/
1143	object *	1152	object *
1144	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1153	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1145	{	1154	{
1146	object tmp, top, *floor = NULL;	1155	object tmp, top, *floor = NULL;
1147	sint16 x, y;
1148		1156
1149	if (QUERY_FLAG (op, FLAG_FREED))	1157	if (QUERY_FLAG (op, FLAG_FREED))
1150	{	1158	{
1151	LOG (llevError, "Trying to insert freed object!\n");	1159	LOG (llevError, "Trying to insert freed object!\n");
1152	return NULL;	1160	return NULL;
1153	}	1161	}
		1162
		1163	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1164	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1165
		1166	op->remove ();
1154		1167
1155	if (!m)	1168	if (!m)
1156	{	1169	{
1157	char *dump = dump_object (op);	1170	char *dump = dump_object (op);
1158	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1171	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1173	#endif	1186	#endif
1174	free (dump);	1187	free (dump);
1175	return op;	1188	return op;
1176	}	1189	}
1177		1190
1178	if (!QUERY_FLAG (op, FLAG_REMOVED))
1179	{
1180	char *dump = dump_object (op);
1181	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182	free (dump);
1183	return op;
1184	}
1185
1186	if (op->more)
1187	{
1188	/* The part may be on a different map. */
1189
1190	object *more = op->more;	1191	if (object *more = op->more)
1191		1192	{
1192	/* We really need the caller to normalize coordinates - if
1193	* we set the map, that doesn't work if the location is within
1194	* a map and this is straddling an edge. So only if coordinate
1195	* is clear wrong do we normalize it.
1196	*/
1197	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198	more->map = get_map_from_coord (m, &more->x, &more->y);
1199	else if (!more->map)
1200	{
1201	/* For backwards compatibility - when not dealing with tiled maps,
1202	* more->map should always point to the parent.
1203	*/
1204	more->map = m;
1205	}
1206
1207	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1193	if (!insert_ob_in_map (more, m, originator, flag))
1208	{	1194	{
1209	if (!op->head)	1195	if (!op->head)
1210	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1196	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211		1197
1212	return 0;	1198	return 0;
…		…
1217		1203
1218	/* Ideally, the caller figures this out. However, it complicates a lot	1204	/* Ideally, the caller figures this out. However, it complicates a lot
1219	* of areas of callers (eg, anything that uses find_free_spot would now	1205	* of areas of callers (eg, anything that uses find_free_spot would now
1220	* need extra work	1206	* need extra work
1221	*/	1207	*/
1222	op->map = get_map_from_coord (m, &op->x, &op->y);	1208	if (!xy_normalise (m, op->x, op->y))
1223	x = op->x;	1209	return 0;
1224	y = op->y;	1210
		1211	op->map = m;
		1212	mapspace &ms = op->ms ();
1225		1213
1226	/* this has to be done after we translate the coordinates.	1214	/* this has to be done after we translate the coordinates.
1227	*/	1215	*/
1228	if (op->nrof && !(flag & INS_NO_MERGE))	1216	if (op->nrof && !(flag & INS_NO_MERGE))
1229	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1217	for (tmp = ms.bot; tmp; tmp = tmp->above)
1230	if (object::can_merge (op, tmp))	1218	if (object::can_merge (op, tmp))
1231	{	1219	{
1232	op->nrof += tmp->nrof;	1220	op->nrof += tmp->nrof;
1233	tmp->destroy ();	1221	tmp->destroy ();
1234	}	1222	}
…		…
1251	op->below = originator->below;	1239	op->below = originator->below;
1252		1240
1253	if (op->below)	1241	if (op->below)
1254	op->below->above = op;	1242	op->below->above = op;
1255	else	1243	else
1256	op->ms ().bot = op;	1244	ms.bot = op;
1257		1245
1258	/* since below originator, no need to update top */	1246	/* since below originator, no need to update top */
1259	originator->below = op;	1247	originator->below = op;
1260	}	1248	}
1261	else	1249	else
1262	{	1250	{
		1251	top = ms.bot;
		1252
1263	/* If there are other objects, then */	1253	/* If there are other objects, then */
1264	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1254	if ((!(flag & INS_MAP_LOAD)) && top)
1265	{	1255	{
1266	object *last = 0;	1256	object *last = 0;
1267		1257
1268	/*	1258	/*
1269	* If there are multiple objects on this space, we do some trickier handling.	1259	* If there are multiple objects on this space, we do some trickier handling.
…		…
1275	* once we get to them. This reduces the need to traverse over all of	1265	* once we get to them. This reduces the need to traverse over all of
1276	* them when adding another one - this saves quite a bit of cpu time	1266	* them when adding another one - this saves quite a bit of cpu time
1277	* when lots of spells are cast in one area. Currently, it is presumed	1267	* when lots of spells are cast in one area. Currently, it is presumed
1278	* that flying non pickable objects are spell objects.	1268	* that flying non pickable objects are spell objects.
1279	*/	1269	*/
1280	while (top)	1270	for (top = ms.bot; top; top = top->above)
1281	{	1271	{
1282	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1272	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283	floor = top;	1273	floor = top;
1284		1274
1285	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1275	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1288	top = top->below;	1278	top = top->below;
1289	break;	1279	break;
1290	}	1280	}
1291		1281
1292	last = top;	1282	last = top;
1293	top = top->above;
1294	}	1283	}
1295		1284
1296	/* Don't want top to be NULL, so set it to the last valid object */	1285	/* Don't want top to be NULL, so set it to the last valid object */
1297	top = last;	1286	top = last;
1298		1287
…		…
1305	* Unless those objects are exits, type 66	1294	* Unless those objects are exits, type 66
1306	* If INS_ON_TOP is used, don't do this processing	1295	* If INS_ON_TOP is used, don't do this processing
1307	* Need to find the object that in fact blocks view, otherwise	1296	* Need to find the object that in fact blocks view, otherwise
1308	* stacking is a bit odd.	1297	* stacking is a bit odd.
1309	*/	1298	*/
1310	if (!(flag & INS_ON_TOP) &&	1299	if (!(flag & INS_ON_TOP)
1311	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1300	&& ms.flags () & P_BLOCKSVIEW
		1301	&& (op->face && !op->face->visibility))
1312	{	1302	{
1313	for (last = top; last != floor; last = last->below)	1303	for (last = top; last != floor; last = last->below)
1314	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1304	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315	break;	1305	break;
		1306
1316	/* Check to see if we found the object that blocks view,	1307	/* Check to see if we found the object that blocks view,
1317	* and make sure we have a below pointer for it so that	1308	* and make sure we have a below pointer for it so that
1318	* we can get inserted below this one, which requires we	1309	* we can get inserted below this one, which requires we
1319	* set top to the object below us.	1310	* set top to the object below us.
1320	*/	1311	*/
…		…
1322	top = last->below;	1313	top = last->below;
1323	}	1314	}
1324	} /* If objects on this space */	1315	} /* If objects on this space */
1325		1316
1326	if (flag & INS_MAP_LOAD)	1317	if (flag & INS_MAP_LOAD)
1327	top = GET_MAP_TOP (op->map, op->x, op->y);	1318	top = ms.top;
1328		1319
1329	if (flag & INS_ABOVE_FLOOR_ONLY)	1320	if (flag & INS_ABOVE_FLOOR_ONLY)
1330	top = floor;	1321	top = floor;
1331		1322
1332	/* Top is the object that our object (op) is going to get inserted above.	1323	/* Top is the object that our object (op) is going to get inserted above.
1333	*/	1324	*/
1334		1325
1335	/* First object on this space */	1326	/* First object on this space */
1336	if (!top)	1327	if (!top)
1337	{	1328	{
1338	op->above = GET_MAP_OB (op->map, op->x, op->y);	1329	op->above = ms.bot;
1339		1330
1340	if (op->above)	1331	if (op->above)
1341	op->above->below = op;	1332	op->above->below = op;
1342		1333
1343	op->below = 0;	1334	op->below = 0;
1344	op->ms ().bot = op;	1335	ms.bot = op;
1345	}	1336	}
1346	else	1337	else
1347	{ /* get inserted into the stack above top */	1338	{ /* get inserted into the stack above top */
1348	op->above = top->above;	1339	op->above = top->above;
1349		1340
…		…
1353	op->below = top;	1344	op->below = top;
1354	top->above = op;	1345	top->above = op;
1355	}	1346	}
1356		1347
1357	if (!op->above)	1348	if (!op->above)
1358	op->ms ().top = op;	1349	ms.top = op;
1359	} /* else not INS_BELOW_ORIGINATOR */	1350	} /* else not INS_BELOW_ORIGINATOR */
1360		1351
1361	if (op->type == PLAYER)	1352	if (op->type == PLAYER)
1362	{	1353	{
1363	op->contr->do_los = 1;	1354	op->contr->do_los = 1;
1364	++op->map->players;	1355	++op->map->players;
1365	op->map->last_access = runtime;	1356	op->map->touch ();
1366	}	1357	}
		1358
		1359	op->map->dirty = true;
1367		1360
1368	/* If we have a floor, we know the player, if any, will be above	1361	/* If we have a floor, we know the player, if any, will be above
1369	* it, so save a few ticks and start from there.	1362	* it, so save a few ticks and start from there.
1370	*/	1363	*/
1371	if (!(flag & INS_MAP_LOAD))	1364	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1365	if (object *pl = ms.player ())
1373	if (pl->contr->ns)	1366	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1367	pl->contr->ns->floorbox_update ();
1375		1368
1376	/* If this object glows, it may affect lighting conditions that are	1369	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1370	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1371	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1372	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1373	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1374	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1375	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1376	* of effect may be sufficient.
1384	*/	1377	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1378	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1379	update_all_los (op->map, op->x, op->y);
1387		1380
…		…
1425	{	1418	{
1426	object tmp, tmp1;	1419	object tmp, tmp1;
1427		1420
1428	/* first search for itself and remove any old instances */	1421	/* first search for itself and remove any old instances */
1429		1422
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1423	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1424	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1432	tmp->destroy ();	1425	tmp->destroy ();
1433		1426
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1427	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1428
1436	tmp1->x = op->x;	1429	tmp1->x = op->x;
1437	tmp1->y = op->y;	1430	tmp1->y = op->y;
1438	insert_ob_in_map (tmp1, op->map, op, 0);	1431	insert_ob_in_map (tmp1, op->map, op, 0);
1439	}	1432	}
1440		1433
		1434	// XXX: function not returning object*
1441	object *	1435	object *
1442	object::insert_at (object where, object originator, int flags)	1436	object::insert_at (object where, object originator, int flags)
1443	{	1437	{
1444	where->map->insert (this, where->x, where->y, originator, flags);	1438	where->map->insert (this, where->x, where->y, originator, flags);
1445	}	1439	}
…		…
1758		1752
1759	/* The objects have to be checked from top to bottom.	1753	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1754	* Hence, we first go to the top:
1761	*/	1755	*/
1762		1756
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1757	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1758	{
1765	/* Trim the search when we find the first other spell effect	1759	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1760	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1761	* we don't need to check all of them.
1768	*/	1762	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1780	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1787	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1781	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1782	{
1789		1783
1790	float	1784	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1785	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1786
1793	if (op->type == PLAYER)	1787	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1788	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1795	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1789	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1790	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1820	* The first matching object is returned, or NULL if none.
1827	*/	1821	*/
1828	object *	1822	object *
1829	present_arch (const archetype at, maptile m, int x, int y)	1823	present_arch (const archetype at, maptile m, int x, int y)
1830	{	1824	{
1831	if (m == NULL \|\| out_of_map (m, x, y))	1825	if (!m \|\| out_of_map (m, x, y))
1832	{	1826	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1827	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1828	return NULL;
1835	}	1829	}
1836		1830
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1832	if (tmp->arch == at)
1839	return tmp;	1833	return tmp;
1840		1834
1841	return NULL;	1835	return NULL;
1842	}	1836	}
…		…
1853	{	1847	{
1854	LOG (llevError, "Present called outside map.\n");	1848	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1849	return NULL;
1856	}	1850	}
1857		1851
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1852	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1853	if (tmp->type == type)
1860	return tmp;	1854	return tmp;
1861		1855
1862	return NULL;	1856	return NULL;
1863	}	1857	}
…		…
2003	}	1997	}
2004		1998
2005	if (!index)	1999	if (!index)
2006	return -1;	2000	return -1;
2007		2001
2008	return altern[RANDOM () % index];	2002	return altern [rndm (index)];
2009	}	2003	}
2010		2004
2011	/*	2005	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2006	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2007	* find_free_spot(), but it will search max number of squares.
…		…
2034	{	2028	{
2035	arr += begin;	2029	arr += begin;
2036	end -= begin;	2030	end -= begin;
2037		2031
2038	while (--end)	2032	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2033	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2034	}
2041		2035
2042	/* new function to make monster searching more efficient, and effective!	2036	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2037	* This basically returns a randomized array (in the passed pointer) of
2044	* the spaces to find monsters. In this way, it won't always look for	2038	* the spaces to find monsters. In this way, it won't always look for
…		…
2178		2172
2179	return 3;	2173	return 3;
2180	}	2174	}
2181		2175
2182	/*	2176	/*
2183	* absdir(int): Returns a number between 1 and 8, which represent
2184	* the "absolute" direction of a number (it actually takes care of
2185	* "overflow" in previous calculations of a direction).
2186	*/
2187
2188	int
2189	absdir (int d)
2190	{
2191	while (d < 1)
2192	d += 8;
2193
2194	while (d > 8)
2195	d -= 8;
2196
2197	return d;
2198	}
2199
2200	/*
2201	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2177	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2178	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2179	*/
2204
2205	int	2180	int
2206	dirdiff (int dir1, int dir2)	2181	dirdiff (int dir1, int dir2)
2207	{	2182	{
2208	int d;	2183	int d;
2209		2184
…		…
2375	insert_ob_in_ob (object_create_clone (item), dst);	2350	insert_ob_in_ob (object_create_clone (item), dst);
2376		2351
2377	return dst;	2352	return dst;
2378	}	2353	}
2379		2354
2380	/* GROS - Creates an object using a string representing its content. */
2381	/* Basically, we save the content of the string to a temp file, then call */
2382	/* load_object on it. I admit it is a highly inefficient way to make things, */
2383	/* but it was simple to make and allows reusing the load_object function. */
2384	/* Remember not to use load_object_str in a time-critical situation. */
2385	/* Also remember that multiparts objects are not supported for now. */
2386	object *
2387	load_object_str (const char *obstr)
2388	{
2389	object *op;
2390	char filename[MAX_BUF];
2391
2392	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394	FILE *tempfile = fopen (filename, "w");
2395
2396	if (tempfile == NULL)
2397	{
2398	LOG (llevError, "Error - Unable to access load object temp file\n");
2399	return NULL;
2400	}
2401
2402	fprintf (tempfile, obstr);
2403	fclose (tempfile);
2404
2405	op = object::create ();
2406
2407	object_thawer thawer (filename);
2408
2409	if (thawer)
2410	load_object (thawer, op, 0);
2411
2412	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413	CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415	return op;
2416	}
2417
2418	/* This returns the first object in who's inventory that	2355	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2356	* has the same type and subtype match.
2420	* returns NULL if no match.	2357	* returns NULL if no match.
2421	*/	2358	*/
2422	object *	2359	object *
…		…
2595	object::flag_desc (char *desc, int len) const	2532	object::flag_desc (char *desc, int len) const
2596	{	2533	{
2597	char *p = desc;	2534	char *p = desc;
2598	bool first = true;	2535	bool first = true;
2599		2536
		2537	*p = 0;
		2538
2600	for (int i = 0; i < NUM_FLAGS; i++)	2539	for (int i = 0; i < NUM_FLAGS; i++)
2601	{	2540	{
2602	if (len <= 10) // magic constant!	2541	if (len <= 10) // magic constant!
2603	{	2542	{
2604	snprintf (p, len, ",...");	2543	snprintf (p, len, ",...");
2605	break;	2544	break;
2606	}	2545	}
2607		2546
2608	if (flag[i])	2547	if (flag [i])
2609	{	2548	{
2610	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2549	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611	len -= cnt;	2550	len -= cnt;
2612	p += cnt;	2551	p += cnt;
2613	first = false;	2552	first = false;
…		…
2615	}	2554	}
2616		2555
2617	return desc;	2556	return desc;
2618	}	2557	}
2619		2558
2620	// return a suitable string describing an objetc in enough detail to find it	2559	// return a suitable string describing an object in enough detail to find it
2621	const char *	2560	const char *
2622	object::debug_desc (char *info) const	2561	object::debug_desc (char *info) const
2623	{	2562	{
2624	char flagdesc[512];	2563	char flagdesc[512];
2625	char info2[256 * 4];	2564	char info2[256 * 4];
2626	char *p = info;	2565	char *p = info;
2627		2566
2628	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2567	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629	count, uuid.seq,	2568	count, uuid.seq,
2630	&name,	2569	&name,
2631	title ? "\",title:" : "",	2570	title ? "\",title:\"" : "",
2632	title ? (const char *)title : "",	2571	title ? (const char *)title : "",
2633	flag_desc (flagdesc, 512), type);	2572	flag_desc (flagdesc, 512), type);
2634		2573
2635	if (env)	2574	if (env)
2636	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2642	}	2581	}
2643		2582
2644	const char *	2583	const char *
2645	object::debug_desc () const	2584	object::debug_desc () const
2646	{	2585	{
2647	static char info[256 * 3];	2586	static char info[256 * 4];
2648	return debug_desc (info);	2587	return debug_desc (info);
2649	}	2588	}
2650		2589
		2590	const char *
		2591	object::debug_desc2 () const
		2592	{
		2593	static char info[256 * 4];
		2594	return debug_desc (info);
		2595	}
		2596
		2597	struct region *
		2598	object::region () const
		2599	{
		2600	return map ? map->region (x, y)
		2601	: region::default_region ();
		2602	}
		2603
		2604	const materialtype_t *
		2605	object::dominant_material () const
		2606	{
		2607	if (materialtype_t *mat = name_to_material (materialname))
		2608	return mat;
		2609
		2610	// omfg this is slow, this has to be temporary :)
		2611	shstr unknown ("unknown");
		2612
		2613	return name_to_material (unknown);
		2614	}
		2615
		2616	void
		2617	object::open_container (object *new_container)
		2618	{
		2619	if (container == new_container)
		2620	return;
		2621
		2622	if (object *old_container = container)
		2623	{
		2624	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2625	return;
		2626
		2627	#if 0
		2628	// remove the "Close old_container" object.
		2629	if (object *closer = old_container->inv)
		2630	if (closer->type == CLOSE_CON)
		2631	closer->destroy ();
		2632	#endif
		2633
		2634	old_container->flag [FLAG_APPLIED] = 0;
		2635	container = 0;
		2636
		2637	esrv_update_item (UPD_FLAGS, this, old_container);
		2638	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2639	}
		2640
		2641	if (new_container)
		2642	{
		2643	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2644	return;
		2645
		2646	// TODO: this does not seem to serve any purpose anymore?
		2647	#if 0
		2648	// insert the "Close Container" object.
		2649	if (archetype *closer = new_container->other_arch)
		2650	{
		2651	object *closer = arch_to_object (new_container->other_arch);
		2652	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2653	new_container->insert (closer);
		2654	}
		2655	#endif
		2656
		2657	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2658
		2659	new_container->flag [FLAG_APPLIED] = 1;
		2660	container = new_container;
		2661
		2662	esrv_update_item (UPD_FLAGS, this, new_container);
		2663	esrv_send_inventory (this, new_container);
		2664	}
		2665	}
		2666
		2667

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs. Revision 1.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC