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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.119 by root, Fri Jan 19 18:06:51 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,
…		…
276		278
277	/* 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
278	* 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
279	* check?	281	* check?
280	*/	282	*/
281	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
282	return 0;	284	return 0;
283		285
284	switch (ob1->type)	286	switch (ob1->type)
285	{	287	{
286	case SCROLL:	288	case SCROLL:
…		…
390	}	392	}
391		393
392	/*	394	/*
393	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
394	*/	396	*/
395
396	object *	397	object *
397	find_object (tag_t i)	398	find_object (tag_t i)
398	{	399	{
399	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
400	if (op->count == i)	401	if (op->count == i)
401	return op;	402	return op;
402		403
403	return 0;	404	return 0;
404	}	405	}
405		406
406	/*	407	/*
407	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
410	*/	411	*/
411
412	object *	412	object *
413	find_object_name (const char *str)	413	find_object_name (const char *str)
414	{	414	{
415	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
416	object *op;	416	object *op;
417		417
418	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
419	if (op->name == str_)	419	if (op->name == str_)
420	break;	420	break;
421		421
422	return op;	422	return op;
423	}	423	}
…		…
489		489
490	if (is_removed)	490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
492		492
493	if (speed < 0)	493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - rndm ();
495		495
496	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
497	if (key_values)	497	if (key_values)
498	{	498	{
499	key_value *tail = 0;	499	key_value *tail = 0;
…		…
563	speed = 0;	563	speed = 0;
564	}	564	}
565		565
566	this->speed = speed;	566	this->speed = speed;
567		567
568	if (FABS (speed) > MIN_ACTIVE_SPEED)	568	if (has_active_speed ())
569	{	569	activate ();
570	/* If already on active list, don't do anything */
571	if (active_next \|\| active_prev \|\| this == active_objects)
572	return;
573
574	/* process_events() expects us to insert the object at the beginning
575	* of the list. */
576	active_next = active_objects;
577
578	if (active_next)
579	active_next->active_prev = this;
580
581	active_objects = this;
582	}
583	else	570	else
584	{	571	deactivate ();
585	/* If not on the active list, nothing needs to be done */
586	if (!active_next && !active_prev && this != active_objects)
587	return;
588
589	if (!active_prev)
590	{
591	active_objects = active_next;
592
593	if (active_next)
594	active_next->active_prev = 0;
595	}
596	else
597	{
598	active_prev->active_next = active_next;
599
600	if (active_next)
601	active_next->active_prev = active_prev;
602	}
603
604	active_next = 0;
605	active_prev = 0;
606	}
607	}	572	}
608		573
609	/*	574	/*
610	* update_object() updates the the map.	575	* update_object() updates the the map.
611	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
659	return;	624	return;
660	}	625	}
661		626
662	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
663		628
664	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
665	/* nop */;	630	/* nop */;
666	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
667	{	632	{
668	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
669	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
678	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
679	* to have move_allow right now.	644	* to have move_allow right now.
680	*/	645	*/
681	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	646	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
682	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	647	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
683	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
684	}	649	}
685	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
686	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
687	* that is being removed.	652	* that is being removed.
688	*/	653	*/
689	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
690	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
691	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
692	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
693	else	658	else
694	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
695		660
696	if (op->more)	661	if (op->more)
697	update_object (op->more, action);	662	update_object (op->more, action);
698	}	663	}
699		664
700	object::vector object::objects; // not yet used
701	object *object::first;
702
703	object::object ()	665	object::object ()
704	{	666	{
705	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
706		668
707	expmul = 1.0;	669	expmul = 1.0;
708	face = blank_face;	670	face = blank_face;
709	}	671	}
710		672
711	object::~object ()	673	object::~object ()
712	{	674	{
		675	if (index)
		676	unlink ();
		677
713	free_key_values (this);	678	free_key_values (this);
714	}	679	}
715		680
		681	static int object_count;
		682
716	void object::link ()	683	void object::link ()
717	{	684	{
718	count = ++ob_count;	685	assert (!index);//D
719	uuid = gen_uuid ();	686	uuid = gen_uuid ();
		687	count = ++object_count;
720		688
721	prev = 0;	689	refcnt_inc ();
722	next = object::first;	690	objects.insert (this);
723
724	if (object::first)
725	object::first->prev = this;
726
727	object::first = this;
728	}	691	}
729		692
730	void object::unlink ()	693	void object::unlink ()
731	{	694	{
732	if (this == object::first)	695	assert (index);//D
733	object::first = next;	696	objects.erase (this);
734		697	refcnt_dec ();
735	/* Remove this object from the list of used objects */
736	if (prev) prev->next = next;
737	if (next) next->prev = prev;
738
739	prev = 0;
740	next = 0;
741	}	698	}
742		699
743	void	700	void
		701	object::activate ()
		702	{
		703	/* If already on active list, don't do anything */
		704	if (active)
		705	return;
		706
		707	if (has_active_speed ())
		708	actives.insert (this);
		709	}
		710
		711	void
744	object::activate (bool recursive)	712	object::activate_recursive ()
745	{	713	{
746	// uh, hack	714	activate ();
747	set_speed (speed);
748		715
749	if (recursive)
750	for (object *op = inv; op; op = op->above)	716	for (object *op = inv; op; op = op->below)
751	op->activate (1);	717	op->activate_recursive ();
752	}	718	}
753		719
754	/* This function removes object 'op' from the list of active	720	/* This function removes object 'op' from the list of active
755	* objects.	721	* objects.
756	* This should only be used for style maps or other such	722	* This should only be used for style maps or other such
…		…
758	* in play chewing up cpu time getting processed.	724	* in play chewing up cpu time getting processed.
759	* The reverse of this is to call update_ob_speed, which	725	* The reverse of this is to call update_ob_speed, which
760	* will do the right thing based on the speed of the object.	726	* will do the right thing based on the speed of the object.
761	*/	727	*/
762	void	728	void
763	object::deactivate (bool recursive)	729	object::deactivate ()
764	{	730	{
765	/* If not on the active list, nothing needs to be done */	731	/* If not on the active list, nothing needs to be done */
766	if (!active_next && !active_prev && this != active_objects)	732	if (!active)
767	return;	733	return;
768		734
769	if (active_prev == 0)	735	actives.erase (this);
770	{	736	}
771	active_objects = active_next;
772	if (active_next)
773	active_next->active_prev = 0;
774	}
775	else
776	{
777	active_prev->active_next = active_next;
778	if (active_next)
779	active_next->active_prev = active_prev;
780	}
781		737
782	active_next = 0;	738	void
783	active_prev = 0;	739	object::deactivate_recursive ()
784		740	{
785	if (recursive)
786	for (object *op = inv; op; op = op->above)	741	for (object *op = inv; op; op = op->below)
		742	op->deactivate_recursive ();
		743
787	op->deactivate (1);	744	deactivate ();
		745	}
		746
		747	void
		748	object::set_flag_inv (int flag, int value)
		749	{
		750	for (object *op = inv; op; op = op->below)
		751	{
		752	op->flag [flag] = value;
		753	op->set_flag_inv (flag, value);
		754	}
788	}	755	}
789		756
790	/*	757	/*
791	* Remove and free all objects in the inventory of the given object.	758	* Remove and free all objects in the inventory of the given object.
792	* object.c ?	759	* object.c ?
…		…
825		792
826	if (op->flag [FLAG_STARTEQUIP]	793	if (op->flag [FLAG_STARTEQUIP]
827	\|\| op->flag [FLAG_NO_DROP]	794	\|\| op->flag [FLAG_NO_DROP]
828	\|\| op->type == RUNE	795	\|\| op->type == RUNE
829	\|\| op->type == TRAP	796	\|\| op->type == TRAP
830	\|\| op->flag [FLAG_IS_A_TEMPLATE])	797	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		798	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
831	op->destroy ();	799	op->destroy ();
832	else	800	else
833	map->insert (op, x, y);	801	map->insert (op, x, y);
834	}	802	}
835	}	803	}
…		…
843	}	811	}
844		812
845	void	813	void
846	object::do_destroy ()	814	object::do_destroy ()
847	{	815	{
		816	attachable::do_destroy ();
		817
848	if (flag [FLAG_IS_LINKED])	818	if (flag [FLAG_IS_LINKED])
849	remove_button_link (this);	819	remove_button_link (this);
850		820
851	if (flag [FLAG_FRIENDLY])	821	if (flag [FLAG_FRIENDLY])
852	remove_friendly_object (this);	822	remove_friendly_object (this);
853		823
854	if (!flag [FLAG_REMOVED])	824	if (!flag [FLAG_REMOVED])
855	remove ();	825	remove ();
856		826
857	if (flag [FLAG_FREED])	827	destroy_inv (true);
858	return;
859		828
860	set_speed (0);	829	deactivate ();
		830	unlink ();
861		831
862	flag [FLAG_FREED] = 1;	832	flag [FLAG_FREED] = 1;
863
864	attachable::do_destroy ();
865
866	destroy_inv (true);
867	unlink ();
868		833
869	// hack to ensure that freed objects still have a valid map	834	// hack to ensure that freed objects still have a valid map
870	{	835	{
871	static maptile *freed_map; // freed objects are moved here to avoid crashes	836	static maptile *freed_map; // freed objects are moved here to avoid crashes
872		837
…		…
877	freed_map->name = "/internal/freed_objects_map";	842	freed_map->name = "/internal/freed_objects_map";
878	freed_map->width = 3;	843	freed_map->width = 3;
879	freed_map->height = 3;	844	freed_map->height = 3;
880		845
881	freed_map->alloc ();	846	freed_map->alloc ();
		847	freed_map->in_memory = MAP_IN_MEMORY;
882	}	848	}
883		849
884	map = freed_map;	850	map = freed_map;
885	x = 1;	851	x = 1;
886	y = 1;	852	y = 1;
…		…
896		862
897	// clear those pointers that likely might have circular references to us	863	// clear those pointers that likely might have circular references to us
898	owner = 0;	864	owner = 0;
899	enemy = 0;	865	enemy = 0;
900	attacked_by = 0;	866	attacked_by = 0;
901
902	// only relevant for players(?), but make sure of it anyways
903	contr = 0;
904	}	867	}
905		868
906	void	869	void
907	object::destroy (bool destroy_inventory)	870	object::destroy (bool destroy_inventory)
908	{	871	{
…		…
939	* environment, the x and y coordinates will be updated to	902	* environment, the x and y coordinates will be updated to
940	* the previous environment.	903	* the previous environment.
941	* Beware: This function is called from the editor as well!	904	* Beware: This function is called from the editor as well!
942	*/	905	*/
943	void	906	void
944	object::remove ()	907	object::remove_slow ()
945	{	908	{
946	object tmp, last = 0;	909	object tmp, last = 0;
947	object *otmp;	910	object *otmp;
948		911
949	if (QUERY_FLAG (this, FLAG_REMOVED))	912	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
993	else if (map)	956	else if (map)
994	{	957	{
995	if (type == PLAYER)	958	if (type == PLAYER)
996	{	959	{
997	--map->players;	960	--map->players;
998	map->last_access = runtime;	961	map->touch ();
999	}	962	}
1000		963
		964	map->dirty = true;
		965	mapspace &ms = this->ms ();
1001		966
1002	/* link the object above us */	967	/* link the object above us */
1003	if (above)	968	if (above)
1004	above->below = below;	969	above->below = below;
1005	else	970	else
1006	map->at (x, y).top = below; /* we were top, set new top */	971	ms.top = below; /* we were top, set new top */
1007		972
1008	/* Relink the object below us, if there is one */	973	/* Relink the object below us, if there is one */
1009	if (below)	974	if (below)
1010	below->above = above;	975	below->above = above;
1011	else	976	else
…		…
1013	/* Nothing below, which means we need to relink map object for this space	978	/* Nothing below, which means we need to relink map object for this space
1014	* use translated coordinates in case some oddness with map tiling is	979	* use translated coordinates in case some oddness with map tiling is
1015	* evident	980	* evident
1016	*/	981	*/
1017	if (GET_MAP_OB (map, x, y) != this)	982	if (GET_MAP_OB (map, x, y) != this)
1018	{
1019	char *dump = dump_object (this);
1020	LOG (llevError,
1021	"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);	983	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 ());
1022	free (dump);
1023	dump = dump_object (GET_MAP_OB (map, x, y));
1024	LOG (llevError, "%s\n", dump);
1025	free (dump);
1026	}
1027		984
1028	map->at (x, y).bot = above; /* goes on above it. */	985	ms.bot = above; /* goes on above it. */
1029	}	986	}
1030		987
1031	above = 0;	988	above = 0;
1032	below = 0;	989	below = 0;
1033		990
1034	if (map->in_memory == MAP_SAVING)	991	if (map->in_memory == MAP_SAVING)
1035	return;	992	return;
1036		993
1037	int check_walk_off = !flag [FLAG_NO_APPLY];	994	int check_walk_off = !flag [FLAG_NO_APPLY];
1038		995
1039	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	996	for (tmp = ms.bot; tmp; tmp = tmp->above)
1040	{	997	{
1041	/* No point updating the players look faces if he is the object	998	/* No point updating the players look faces if he is the object
1042	* being removed.	999	* being removed.
1043	*/	1000	*/
1044		1001
…		…
1078	}	1035	}
1079		1036
1080	/* last == NULL if there are no objects on this space */	1037	/* last == NULL if there are no objects on this space */
1081	//TODO: this makes little sense, why only update the topmost object?	1038	//TODO: this makes little sense, why only update the topmost object?
1082	if (!last)	1039	if (!last)
1083	map->at (x, y).flags_ = P_NEED_UPDATE;	1040	map->at (x, y).flags_ = 0;
1084	else	1041	else
1085	update_object (last, UP_OBJ_REMOVE);	1042	update_object (last, UP_OBJ_REMOVE);
1086		1043
1087	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1044	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1088	update_all_los (map, x, y);	1045	update_all_los (map, x, y);
…		…
1125		1082
1126	return 0;	1083	return 0;
1127	}	1084	}
1128		1085
1129	/*	1086	/*
1130	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1087	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1131	* job preparing multi-part monsters	1088	* job preparing multi-part monsters.
1132	*/	1089	*/
1133	object *	1090	object *
1134	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1091	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1135	{	1092	{
1136	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1093	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1164	*/	1121	*/
1165	object *	1122	object *
1166	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1123	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1167	{	1124	{
1168	object tmp, top, *floor = NULL;	1125	object tmp, top, *floor = NULL;
1169	sint16 x, y;
1170		1126
1171	if (QUERY_FLAG (op, FLAG_FREED))	1127	if (QUERY_FLAG (op, FLAG_FREED))
1172	{	1128	{
1173	LOG (llevError, "Trying to insert freed object!\n");	1129	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;	1130	return NULL;
1175	}	1131	}
		1132
		1133	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1134	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1135
		1136	op->remove ();
1176		1137
1177	if (!m)	1138	if (!m)
1178	{	1139	{
1179	char *dump = dump_object (op);	1140	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1195	#endif	1156	#endif
1196	free (dump);	1157	free (dump);
1197	return op;	1158	return op;
1198	}	1159	}
1199		1160
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;	1161	if (object *more = op->more)
1213		1162	{
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1163	if (!insert_ob_in_map (more, m, originator, flag))
1230	{	1164	{
1231	if (!op->head)	1165	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1166	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1167
1234	return 0;	1168	return 0;
…		…
1239		1173
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1174	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1175	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1176	* need extra work
1243	*/	1177	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1178	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1179	return 0;
1246	y = op->y;	1180
		1181	op->map = m;
		1182	mapspace &ms = op->ms ();
1247		1183
1248	/* this has to be done after we translate the coordinates.	1184	/* this has to be done after we translate the coordinates.
1249	*/	1185	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1186	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1187	for (tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1188	if (object::can_merge (op, tmp))
1253	{	1189	{
1254	op->nrof += tmp->nrof;	1190	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1191	tmp->destroy ();
1256	}	1192	}
…		…
1273	op->below = originator->below;	1209	op->below = originator->below;
1274		1210
1275	if (op->below)	1211	if (op->below)
1276	op->below->above = op;	1212	op->below->above = op;
1277	else	1213	else
1278	op->ms ().bot = op;	1214	ms.bot = op;
1279		1215
1280	/* since below originator, no need to update top */	1216	/* since below originator, no need to update top */
1281	originator->below = op;	1217	originator->below = op;
1282	}	1218	}
1283	else	1219	else
1284	{	1220	{
		1221	top = ms.bot;
		1222
1285	/* If there are other objects, then */	1223	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1224	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1225	{
1288	object *last = 0;	1226	object *last = 0;
1289		1227
1290	/*	1228	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1229	* If there are multiple objects on this space, we do some trickier handling.
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1235	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1236	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1237	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1238	* that flying non pickable objects are spell objects.
1301	*/	1239	*/
1302	while (top)	1240	for (top = ms.bot; top; top = top->above)
1303	{	1241	{
1304	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1242	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1305	floor = top;	1243	floor = top;
1306		1244
1307	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1245	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1310	top = top->below;	1248	top = top->below;
1311	break;	1249	break;
1312	}	1250	}
1313		1251
1314	last = top;	1252	last = top;
1315	top = top->above;
1316	}	1253	}
1317		1254
1318	/* Don't want top to be NULL, so set it to the last valid object */	1255	/* Don't want top to be NULL, so set it to the last valid object */
1319	top = last;	1256	top = last;
1320		1257
…		…
1327	* Unless those objects are exits, type 66	1264	* Unless those objects are exits, type 66
1328	* If INS_ON_TOP is used, don't do this processing	1265	* If INS_ON_TOP is used, don't do this processing
1329	* Need to find the object that in fact blocks view, otherwise	1266	* Need to find the object that in fact blocks view, otherwise
1330	* stacking is a bit odd.	1267	* stacking is a bit odd.
1331	*/	1268	*/
1332	if (!(flag & INS_ON_TOP) &&	1269	if (!(flag & INS_ON_TOP)
1333	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1270	&& ms.flags () & P_BLOCKSVIEW
		1271	&& (op->face && !op->face->visibility))
1334	{	1272	{
1335	for (last = top; last != floor; last = last->below)	1273	for (last = top; last != floor; last = last->below)
1336	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1274	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1337	break;	1275	break;
		1276
1338	/* Check to see if we found the object that blocks view,	1277	/* Check to see if we found the object that blocks view,
1339	* and make sure we have a below pointer for it so that	1278	* and make sure we have a below pointer for it so that
1340	* we can get inserted below this one, which requires we	1279	* we can get inserted below this one, which requires we
1341	* set top to the object below us.	1280	* set top to the object below us.
1342	*/	1281	*/
…		…
1344	top = last->below;	1283	top = last->below;
1345	}	1284	}
1346	} /* If objects on this space */	1285	} /* If objects on this space */
1347		1286
1348	if (flag & INS_MAP_LOAD)	1287	if (flag & INS_MAP_LOAD)
1349	top = GET_MAP_TOP (op->map, op->x, op->y);	1288	top = ms.top;
1350		1289
1351	if (flag & INS_ABOVE_FLOOR_ONLY)	1290	if (flag & INS_ABOVE_FLOOR_ONLY)
1352	top = floor;	1291	top = floor;
1353		1292
1354	/* Top is the object that our object (op) is going to get inserted above.	1293	/* Top is the object that our object (op) is going to get inserted above.
1355	*/	1294	*/
1356		1295
1357	/* First object on this space */	1296	/* First object on this space */
1358	if (!top)	1297	if (!top)
1359	{	1298	{
1360	op->above = GET_MAP_OB (op->map, op->x, op->y);	1299	op->above = ms.bot;
1361		1300
1362	if (op->above)	1301	if (op->above)
1363	op->above->below = op;	1302	op->above->below = op;
1364		1303
1365	op->below = 0;	1304	op->below = 0;
1366	op->ms ().bot = op;	1305	ms.bot = op;
1367	}	1306	}
1368	else	1307	else
1369	{ /* get inserted into the stack above top */	1308	{ /* get inserted into the stack above top */
1370	op->above = top->above;	1309	op->above = top->above;
1371		1310
…		…
1375	op->below = top;	1314	op->below = top;
1376	top->above = op;	1315	top->above = op;
1377	}	1316	}
1378		1317
1379	if (!op->above)	1318	if (!op->above)
1380	op->ms ().top = op;	1319	ms.top = op;
1381	} /* else not INS_BELOW_ORIGINATOR */	1320	} /* else not INS_BELOW_ORIGINATOR */
1382		1321
1383	if (op->type == PLAYER)	1322	if (op->type == PLAYER)
1384	{	1323	{
1385	op->contr->do_los = 1;	1324	op->contr->do_los = 1;
1386	++op->map->players;	1325	++op->map->players;
1387	op->map->last_access = runtime;	1326	op->map->touch ();
1388	}	1327	}
		1328
		1329	op->map->dirty = true;
1389		1330
1390	/* If we have a floor, we know the player, if any, will be above	1331	/* If we have a floor, we know the player, if any, will be above
1391	* it, so save a few ticks and start from there.	1332	* it, so save a few ticks and start from there.
1392	*/	1333	*/
1393	if (!(flag & INS_MAP_LOAD))	1334	if (!(flag & INS_MAP_LOAD))
1394	if (object *pl = op->ms ().player ())	1335	if (object *pl = ms.player ())
1395	if (pl->contr->ns)	1336	if (pl->contr->ns)
1396	pl->contr->ns->floorbox_update ();	1337	pl->contr->ns->floorbox_update ();
1397		1338
1398	/* If this object glows, it may affect lighting conditions that are	1339	/* If this object glows, it may affect lighting conditions that are
1399	* visible to others on this map. But update_all_los is really	1340	* visible to others on this map. But update_all_los is really
1400	* an inefficient way to do this, as it means los for all players	1341	* an inefficient way to do this, as it means los for all players
1401	* on the map will get recalculated. The players could very well	1342	* on the map will get recalculated. The players could very well
1402	* be far away from this change and not affected in any way -	1343	* be far away from this change and not affected in any way -
1403	* this should get redone to only look for players within range,	1344	* this should get redone to only look for players within range,
1404	* or just updating the P_NEED_UPDATE for spaces within this area	1345	* or just updating the P_UPTODATE for spaces within this area
1405	* of effect may be sufficient.	1346	* of effect may be sufficient.
1406	*/	1347	*/
1407	if (op->map->darkness && (op->glow_radius != 0))	1348	if (op->map->darkness && (op->glow_radius != 0))
1408	update_all_los (op->map, op->x, op->y);	1349	update_all_los (op->map, op->x, op->y);
1409		1350
…		…
1447	{	1388	{
1448	object tmp, tmp1;	1389	object tmp, tmp1;
1449		1390
1450	/* first search for itself and remove any old instances */	1391	/* first search for itself and remove any old instances */
1451		1392
1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1393	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1394	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454	tmp->destroy ();	1395	tmp->destroy ();
1455		1396
1456	tmp1 = arch_to_object (archetype::find (arch_string));	1397	tmp1 = arch_to_object (archetype::find (arch_string));
1457		1398
…		…
1780		1721
1781	/* The objects have to be checked from top to bottom.	1722	/* The objects have to be checked from top to bottom.
1782	* Hence, we first go to the top:	1723	* Hence, we first go to the top:
1783	*/	1724	*/
1784		1725
1785	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1726	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1786	{	1727	{
1787	/* Trim the search when we find the first other spell effect	1728	/* Trim the search when we find the first other spell effect
1788	* this helps performance so that if a space has 50 spell objects,	1729	* this helps performance so that if a space has 50 spell objects,
1789	* we don't need to check all of them.	1730	* we don't need to check all of them.
1790	*/	1731	*/
…		…
1848	* The first matching object is returned, or NULL if none.	1789	* The first matching object is returned, or NULL if none.
1849	*/	1790	*/
1850	object *	1791	object *
1851	present_arch (const archetype at, maptile m, int x, int y)	1792	present_arch (const archetype at, maptile m, int x, int y)
1852	{	1793	{
1853	if (m == NULL \|\| out_of_map (m, x, y))	1794	if (!m \|\| out_of_map (m, x, y))
1854	{	1795	{
1855	LOG (llevError, "Present_arch called outside map.\n");	1796	LOG (llevError, "Present_arch called outside map.\n");
1856	return NULL;	1797	return NULL;
1857	}	1798	}
1858		1799
1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1800	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1860	if (tmp->arch == at)	1801	if (tmp->arch == at)
1861	return tmp;	1802	return tmp;
1862		1803
1863	return NULL;	1804	return NULL;
1864	}	1805	}
…		…
1875	{	1816	{
1876	LOG (llevError, "Present called outside map.\n");	1817	LOG (llevError, "Present called outside map.\n");
1877	return NULL;	1818	return NULL;
1878	}	1819	}
1879		1820
1880	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1881	if (tmp->type == type)	1822	if (tmp->type == type)
1882	return tmp;	1823	return tmp;
1883		1824
1884	return NULL;	1825	return NULL;
1885	}	1826	}
…		…
2200		2141
2201	return 3;	2142	return 3;
2202	}	2143	}
2203		2144
2204	/*	2145	/*
2205	* absdir(int): Returns a number between 1 and 8, which represent
2206	* the "absolute" direction of a number (it actually takes care of
2207	* "overflow" in previous calculations of a direction).
2208	*/
2209
2210	int
2211	absdir (int d)
2212	{
2213	while (d < 1)
2214	d += 8;
2215
2216	while (d > 8)
2217	d -= 8;
2218
2219	return d;
2220	}
2221
2222	/*
2223	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2146	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2224	* between two directions (which are expected to be absolute (see absdir())	2147	* between two directions (which are expected to be absolute (see absdir())
2225	*/	2148	*/
2226
2227	int	2149	int
2228	dirdiff (int dir1, int dir2)	2150	dirdiff (int dir1, int dir2)
2229	{	2151	{
2230	int d;	2152	int d;
2231		2153
…		…
2610	}	2532	}
2611	else	2533	else
2612	item = item->env;	2534	item = item->env;
2613	}	2535	}
2614		2536
		2537
		2538	const char *
		2539	object::flag_desc (char *desc, int len) const
		2540	{
		2541	char *p = desc;
		2542	bool first = true;
		2543
		2544	*p = 0;
		2545
		2546	for (int i = 0; i < NUM_FLAGS; i++)
		2547	{
		2548	if (len <= 10) // magic constant!
		2549	{
		2550	snprintf (p, len, ",...");
		2551	break;
		2552	}
		2553
		2554	if (flag [i])
		2555	{
		2556	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2557	len -= cnt;
		2558	p += cnt;
		2559	first = false;
		2560	}
		2561	}
		2562
		2563	return desc;
		2564	}
		2565
2615	// return a suitable string describing an objetc in enough detail to find it	2566	// return a suitable string describing an object in enough detail to find it
2616	const char *	2567	const char *
2617	object::debug_desc (char *info) const	2568	object::debug_desc (char *info) const
2618	{	2569	{
		2570	char flagdesc[512];
2619	char info2[256 * 3];	2571	char info2[256 * 4];
2620	char *p = info;	2572	char *p = info;
2621		2573
2622	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2574	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2623	count,	2575	count, uuid.seq,
2624	&name,	2576	&name,
2625	title ? " " : "",	2577	title ? "\",title:\"" : "",
2626	title ? (const char *)title : "");	2578	title ? (const char *)title : "",
		2579	flag_desc (flagdesc, 512), type);
2627		2580
2628	if (env)	2581	if (env)
2629	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2582	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2630		2583
2631	if (map)	2584	if (map)
…		…
2635	}	2588	}
2636		2589
2637	const char *	2590	const char *
2638	object::debug_desc () const	2591	object::debug_desc () const
2639	{	2592	{
2640	static char info[256 * 3];	2593	static char info[256 * 4];
2641	return debug_desc (info);	2594	return debug_desc (info);
2642	}	2595	}
2643		2596
		2597	const char *
		2598	object::debug_desc2 () const
		2599	{
		2600	static char info[256 * 4];
		2601	return debug_desc (info);
		2602	}
		2603

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs. Revision 1.119 by root, Fri Jan 19 18:06:51 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.119 by root, Fri Jan 19 18:06:51 2007 UTC