[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.122 by root, Wed Jan 24 22:42:48 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,
…		…
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;
…		…
564	}	564	}
565		565
566	this->speed = speed;	566	this->speed = speed;
567		567
568	if (has_active_speed ())	568	if (has_active_speed ())
569	activate (false);	569	activate ();
570	else	570	else
571	deactivate (false);	571	deactivate ();
572	}	572	}
573		573
574	/*	574	/*
575	* update_object() updates the the map.	575	* update_object() updates the the map.
576	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
624	return;	624	return;
625	}	625	}
626		626
627	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
628		628
629	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	630	/* nop */;
631	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
632	{	632	{
633	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	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	643	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	644	* to have move_allow right now.
645	*/	645	*/
646	\|\| ((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
647	\|\| 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)
648	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
649	}	649	}
650	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	652	* that is being removed.
653	*/	653	*/
654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
658	else	658	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		660
661	if (op->more)	661	if (op->more)
662	update_object (op->more, action);	662	update_object (op->more, action);
663	}	663	}
664		664
665	object::vector object::objects; // not yet used
666	object *object::first;
667
668	object::object ()	665	object::object ()
669	{	666	{
670	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
671		668
672	expmul = 1.0;	669	expmul = 1.0;
673	face = blank_face;	670	face = blank_face;
674	}	671	}
675		672
676	object::~object ()	673	object::~object ()
677	{	674	{
		675	unlink ();
		676
678	free_key_values (this);	677	free_key_values (this);
679	}	678	}
680		679
		680	static int object_count;
		681
681	void object::link ()	682	void object::link ()
682	{	683	{
683	count = ++ob_count;	684	assert (!index);//D
684	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
685		687
686	prev = 0;	688	refcnt_inc ();
687	next = object::first;	689	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	690	}
694		691
695	void object::unlink ()	692	void object::unlink ()
696	{	693	{
697	if (this == object::first)	694	if (!index)
698	object::first = next;	695	return;
699		696
700	/* Remove this object from the list of used objects */	697	objects.erase (this);
701	if (prev) prev->next = next;	698	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}	699	}
707		700
708	void	701	void
709	object::activate (bool recursive)	702	object::activate ()
710	{	703	{
		704	/* If already on active list, don't do anything */
		705	if (active)
		706	return;
		707
711	if (has_active_speed ())	708	if (has_active_speed ())
712	{	709	actives.insert (this);
713	/* If already on active list, don't do anything */	710	}
714	if (active_next \|\| active_prev \|\| this == active_objects)
715	return;
716		711
717	/* process_events() expects us to insert the object at the beginning	712	void
718	* of the list. */	713	object::activate_recursive ()
719	active_next = active_objects;	714	{
		715	activate ();
720		716
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)	717	for (object *op = inv; op; op = op->below)
729	op->activate (1);	718	op->activate_recursive ();
730	}	719	}
731		720
732	/* This function removes object 'op' from the list of active	721	/* This function removes object 'op' from the list of active
733	* objects.	722	* objects.
734	* This should only be used for style maps or other such	723	* This should only be used for style maps or other such
…		…
736	* in play chewing up cpu time getting processed.	725	* in play chewing up cpu time getting processed.
737	* The reverse of this is to call update_ob_speed, which	726	* The reverse of this is to call update_ob_speed, which
738	* will do the right thing based on the speed of the object.	727	* will do the right thing based on the speed of the object.
739	*/	728	*/
740	void	729	void
741	object::deactivate (bool recursive)	730	object::deactivate ()
742	{	731	{
743	/* If not on the active list, nothing needs to be done */	732	/* If not on the active list, nothing needs to be done */
744	if (!active_next && !active_prev && this != active_objects)	733	if (!active)
745	return;	734	return;
746		735
747	if (active_prev == 0)	736	actives.erase (this);
748	{	737	}
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		738
760	active_next = 0;	739	void
761	active_prev = 0;	740	object::deactivate_recursive ()
762		741	{
763	if (recursive)
764	for (object *op = inv; op; op = op->above)	742	for (object *op = inv; op; op = op->below)
		743	op->deactivate_recursive ();
		744
765	op->deactivate (1);	745	deactivate ();
		746	}
		747
		748	void
		749	object::set_flag_inv (int flag, int value)
		750	{
		751	for (object *op = inv; op; op = op->below)
		752	{
		753	op->flag [flag] = value;
		754	op->set_flag_inv (flag, value);
		755	}
766	}	756	}
767		757
768	/*	758	/*
769	* Remove and free all objects in the inventory of the given object.	759	* Remove and free all objects in the inventory of the given object.
770	* object.c ?	760	* object.c ?
…		…
785	* drop on that space.	775	* drop on that space.
786	*/	776	*/
787	if (!drop_to_ground	777	if (!drop_to_ground
788	\|\| !map	778	\|\| !map
789	\|\| map->in_memory != MAP_IN_MEMORY	779	\|\| map->in_memory != MAP_IN_MEMORY
		780	\|\| map->nodrop
790	\|\| ms ().move_block == MOVE_ALL)	781	\|\| ms ().move_block == MOVE_ALL)
791	{	782	{
792	while (inv)	783	while (inv)
793	{	784	{
794	inv->destroy_inv (drop_to_ground);	785	inv->destroy_inv (drop_to_ground);
…		…
803		794
804	if (op->flag [FLAG_STARTEQUIP]	795	if (op->flag [FLAG_STARTEQUIP]
805	\|\| op->flag [FLAG_NO_DROP]	796	\|\| op->flag [FLAG_NO_DROP]
806	\|\| op->type == RUNE	797	\|\| op->type == RUNE
807	\|\| op->type == TRAP	798	\|\| op->type == TRAP
808	\|\| op->flag [FLAG_IS_A_TEMPLATE])	799	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		800	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
809	op->destroy ();	801	op->destroy ();
810	else	802	else
811	map->insert (op, x, y);	803	map->insert (op, x, y);
812	}	804	}
813	}	805	}
…		…
821	}	813	}
822		814
823	void	815	void
824	object::do_destroy ()	816	object::do_destroy ()
825	{	817	{
		818	attachable::do_destroy ();
		819
826	if (flag [FLAG_IS_LINKED])	820	if (flag [FLAG_IS_LINKED])
827	remove_button_link (this);	821	remove_button_link (this);
828		822
829	if (flag [FLAG_FRIENDLY])	823	if (flag [FLAG_FRIENDLY])
830	remove_friendly_object (this);	824	remove_friendly_object (this);
831		825
832	if (!flag [FLAG_REMOVED])	826	if (!flag [FLAG_REMOVED])
833	remove ();	827	remove ();
834		828
835	if (flag [FLAG_FREED])	829	destroy_inv (true);
836	return;
837		830
838	set_speed (0);	831	deactivate ();
		832	unlink ();
839		833
840	flag [FLAG_FREED] = 1;	834	flag [FLAG_FREED] = 1;
841
842	attachable::do_destroy ();
843
844	destroy_inv (true);
845	unlink ();
846		835
847	// hack to ensure that freed objects still have a valid map	836	// hack to ensure that freed objects still have a valid map
848	{	837	{
849	static maptile *freed_map; // freed objects are moved here to avoid crashes	838	static maptile *freed_map; // freed objects are moved here to avoid crashes
850		839
…		…
855	freed_map->name = "/internal/freed_objects_map";	844	freed_map->name = "/internal/freed_objects_map";
856	freed_map->width = 3;	845	freed_map->width = 3;
857	freed_map->height = 3;	846	freed_map->height = 3;
858		847
859	freed_map->alloc ();	848	freed_map->alloc ();
		849	freed_map->in_memory = MAP_IN_MEMORY;
860	}	850	}
861		851
862	map = freed_map;	852	map = freed_map;
863	x = 1;	853	x = 1;
864	y = 1;	854	y = 1;
…		…
874		864
875	// clear those pointers that likely might have circular references to us	865	// clear those pointers that likely might have circular references to us
876	owner = 0;	866	owner = 0;
877	enemy = 0;	867	enemy = 0;
878	attacked_by = 0;	868	attacked_by = 0;
879
880	// only relevant for players(?), but make sure of it anyways
881	contr = 0;
882	}	869	}
883		870
884	void	871	void
885	object::destroy (bool destroy_inventory)	872	object::destroy (bool destroy_inventory)
886	{	873	{
…		…
917	* environment, the x and y coordinates will be updated to	904	* environment, the x and y coordinates will be updated to
918	* the previous environment.	905	* the previous environment.
919	* Beware: This function is called from the editor as well!	906	* Beware: This function is called from the editor as well!
920	*/	907	*/
921	void	908	void
922	object::remove ()	909	object::remove_slow ()
923	{	910	{
924	object tmp, last = 0;	911	object tmp, last = 0;
925	object *otmp;	912	object *otmp;
926		913
927	if (QUERY_FLAG (this, FLAG_REMOVED))	914	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
971	else if (map)	958	else if (map)
972	{	959	{
973	if (type == PLAYER)	960	if (type == PLAYER)
974	{	961	{
975	--map->players;	962	--map->players;
976	map->last_access = runtime;	963	map->touch ();
977	}	964	}
978		965
		966	map->dirty = true;
		967	mapspace &ms = this->ms ();
979		968
980	/* link the object above us */	969	/* link the object above us */
981	if (above)	970	if (above)
982	above->below = below;	971	above->below = below;
983	else	972	else
984	map->at (x, y).top = below; /* we were top, set new top */	973	ms.top = below; /* we were top, set new top */
985		974
986	/* Relink the object below us, if there is one */	975	/* Relink the object below us, if there is one */
987	if (below)	976	if (below)
988	below->above = above;	977	below->above = above;
989	else	978	else
…		…
991	/* Nothing below, which means we need to relink map object for this space	980	/* 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	981	* use translated coordinates in case some oddness with map tiling is
993	* evident	982	* evident
994	*/	983	*/
995	if (GET_MAP_OB (map, x, y) != this)	984	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);	985	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		986
1006	map->at (x, y).bot = above; /* goes on above it. */	987	ms.bot = above; /* goes on above it. */
1007	}	988	}
1008		989
1009	above = 0;	990	above = 0;
1010	below = 0;	991	below = 0;
1011		992
1012	if (map->in_memory == MAP_SAVING)	993	if (map->in_memory == MAP_SAVING)
1013	return;	994	return;
1014		995
1015	int check_walk_off = !flag [FLAG_NO_APPLY];	996	int check_walk_off = !flag [FLAG_NO_APPLY];
1016		997
1017	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	998	for (tmp = ms.bot; tmp; tmp = tmp->above)
1018	{	999	{
1019	/* No point updating the players look faces if he is the object	1000	/* No point updating the players look faces if he is the object
1020	* being removed.	1001	* being removed.
1021	*/	1002	*/
1022		1003
…		…
1056	}	1037	}
1057		1038
1058	/* last == NULL if there are no objects on this space */	1039	/* last == NULL if there are no objects on this space */
1059	//TODO: this makes little sense, why only update the topmost object?	1040	//TODO: this makes little sense, why only update the topmost object?
1060	if (!last)	1041	if (!last)
1061	map->at (x, y).flags_ = P_NEED_UPDATE;	1042	map->at (x, y).flags_ = 0;
1062	else	1043	else
1063	update_object (last, UP_OBJ_REMOVE);	1044	update_object (last, UP_OBJ_REMOVE);
1064		1045
1065	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1046	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1066	update_all_los (map, x, y);	1047	update_all_los (map, x, y);
…		…
1103		1084
1104	return 0;	1085	return 0;
1105	}	1086	}
1106		1087
1107	/*	1088	/*
1108	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1089	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1109	* job preparing multi-part monsters	1090	* job preparing multi-part monsters.
1110	*/	1091	*/
1111	object *	1092	object *
1112	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1093	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1113	{	1094	{
1114	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1095	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1142	*/	1123	*/
1143	object *	1124	object *
1144	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1125	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1145	{	1126	{
1146	object tmp, top, *floor = NULL;	1127	object tmp, top, *floor = NULL;
1147	sint16 x, y;
1148		1128
1149	if (QUERY_FLAG (op, FLAG_FREED))	1129	if (QUERY_FLAG (op, FLAG_FREED))
1150	{	1130	{
1151	LOG (llevError, "Trying to insert freed object!\n");	1131	LOG (llevError, "Trying to insert freed object!\n");
1152	return NULL;	1132	return NULL;
1153	}	1133	}
		1134
		1135	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1136	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1137
		1138	op->remove ();
1154		1139
1155	if (!m)	1140	if (!m)
1156	{	1141	{
1157	char *dump = dump_object (op);	1142	char *dump = dump_object (op);
1158	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1143	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1173	#endif	1158	#endif
1174	free (dump);	1159	free (dump);
1175	return op;	1160	return op;
1176	}	1161	}
1177		1162
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;	1163	if (object *more = op->more)
1191		1164	{
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)	1165	if (!insert_ob_in_map (more, m, originator, flag))
1208	{	1166	{
1209	if (!op->head)	1167	if (!op->head)
1210	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1168	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211		1169
1212	return 0;	1170	return 0;
…		…
1217		1175
1218	/* Ideally, the caller figures this out. However, it complicates a lot	1176	/* 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	1177	* of areas of callers (eg, anything that uses find_free_spot would now
1220	* need extra work	1178	* need extra work
1221	*/	1179	*/
1222	op->map = get_map_from_coord (m, &op->x, &op->y);	1180	if (!xy_normalise (m, op->x, op->y))
1223	x = op->x;	1181	return 0;
1224	y = op->y;	1182
		1183	op->map = m;
		1184	mapspace &ms = op->ms ();
1225		1185
1226	/* this has to be done after we translate the coordinates.	1186	/* this has to be done after we translate the coordinates.
1227	*/	1187	*/
1228	if (op->nrof && !(flag & INS_NO_MERGE))	1188	if (op->nrof && !(flag & INS_NO_MERGE))
1229	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1189	for (tmp = ms.bot; tmp; tmp = tmp->above)
1230	if (object::can_merge (op, tmp))	1190	if (object::can_merge (op, tmp))
1231	{	1191	{
1232	op->nrof += tmp->nrof;	1192	op->nrof += tmp->nrof;
1233	tmp->destroy ();	1193	tmp->destroy ();
1234	}	1194	}
…		…
1251	op->below = originator->below;	1211	op->below = originator->below;
1252		1212
1253	if (op->below)	1213	if (op->below)
1254	op->below->above = op;	1214	op->below->above = op;
1255	else	1215	else
1256	op->ms ().bot = op;	1216	ms.bot = op;
1257		1217
1258	/* since below originator, no need to update top */	1218	/* since below originator, no need to update top */
1259	originator->below = op;	1219	originator->below = op;
1260	}	1220	}
1261	else	1221	else
1262	{	1222	{
		1223	top = ms.bot;
		1224
1263	/* If there are other objects, then */	1225	/* If there are other objects, then */
1264	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1226	if ((!(flag & INS_MAP_LOAD)) && top)
1265	{	1227	{
1266	object *last = 0;	1228	object *last = 0;
1267		1229
1268	/*	1230	/*
1269	* If there are multiple objects on this space, we do some trickier handling.	1231	* 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	1237	* 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	1238	* 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	1239	* when lots of spells are cast in one area. Currently, it is presumed
1278	* that flying non pickable objects are spell objects.	1240	* that flying non pickable objects are spell objects.
1279	*/	1241	*/
1280	while (top)	1242	for (top = ms.bot; top; top = top->above)
1281	{	1243	{
1282	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1244	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283	floor = top;	1245	floor = top;
1284		1246
1285	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1247	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;	1250	top = top->below;
1289	break;	1251	break;
1290	}	1252	}
1291		1253
1292	last = top;	1254	last = top;
1293	top = top->above;
1294	}	1255	}
1295		1256
1296	/* Don't want top to be NULL, so set it to the last valid object */	1257	/* Don't want top to be NULL, so set it to the last valid object */
1297	top = last;	1258	top = last;
1298		1259
…		…
1305	* Unless those objects are exits, type 66	1266	* Unless those objects are exits, type 66
1306	* If INS_ON_TOP is used, don't do this processing	1267	* If INS_ON_TOP is used, don't do this processing
1307	* Need to find the object that in fact blocks view, otherwise	1268	* Need to find the object that in fact blocks view, otherwise
1308	* stacking is a bit odd.	1269	* stacking is a bit odd.
1309	*/	1270	*/
1310	if (!(flag & INS_ON_TOP) &&	1271	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))	1272	&& ms.flags () & P_BLOCKSVIEW
		1273	&& (op->face && !op->face->visibility))
1312	{	1274	{
1313	for (last = top; last != floor; last = last->below)	1275	for (last = top; last != floor; last = last->below)
1314	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1276	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315	break;	1277	break;
		1278
1316	/* Check to see if we found the object that blocks view,	1279	/* Check to see if we found the object that blocks view,
1317	* and make sure we have a below pointer for it so that	1280	* and make sure we have a below pointer for it so that
1318	* we can get inserted below this one, which requires we	1281	* we can get inserted below this one, which requires we
1319	* set top to the object below us.	1282	* set top to the object below us.
1320	*/	1283	*/
…		…
1322	top = last->below;	1285	top = last->below;
1323	}	1286	}
1324	} /* If objects on this space */	1287	} /* If objects on this space */
1325		1288
1326	if (flag & INS_MAP_LOAD)	1289	if (flag & INS_MAP_LOAD)
1327	top = GET_MAP_TOP (op->map, op->x, op->y);	1290	top = ms.top;
1328		1291
1329	if (flag & INS_ABOVE_FLOOR_ONLY)	1292	if (flag & INS_ABOVE_FLOOR_ONLY)
1330	top = floor;	1293	top = floor;
1331		1294
1332	/* Top is the object that our object (op) is going to get inserted above.	1295	/* Top is the object that our object (op) is going to get inserted above.
1333	*/	1296	*/
1334		1297
1335	/* First object on this space */	1298	/* First object on this space */
1336	if (!top)	1299	if (!top)
1337	{	1300	{
1338	op->above = GET_MAP_OB (op->map, op->x, op->y);	1301	op->above = ms.bot;
1339		1302
1340	if (op->above)	1303	if (op->above)
1341	op->above->below = op;	1304	op->above->below = op;
1342		1305
1343	op->below = 0;	1306	op->below = 0;
1344	op->ms ().bot = op;	1307	ms.bot = op;
1345	}	1308	}
1346	else	1309	else
1347	{ /* get inserted into the stack above top */	1310	{ /* get inserted into the stack above top */
1348	op->above = top->above;	1311	op->above = top->above;
1349		1312
…		…
1353	op->below = top;	1316	op->below = top;
1354	top->above = op;	1317	top->above = op;
1355	}	1318	}
1356		1319
1357	if (!op->above)	1320	if (!op->above)
1358	op->ms ().top = op;	1321	ms.top = op;
1359	} /* else not INS_BELOW_ORIGINATOR */	1322	} /* else not INS_BELOW_ORIGINATOR */
1360		1323
1361	if (op->type == PLAYER)	1324	if (op->type == PLAYER)
1362	{	1325	{
1363	op->contr->do_los = 1;	1326	op->contr->do_los = 1;
1364	++op->map->players;	1327	++op->map->players;
1365	op->map->last_access = runtime;	1328	op->map->touch ();
1366	}	1329	}
		1330
		1331	op->map->dirty = true;
1367		1332
1368	/* If we have a floor, we know the player, if any, will be above	1333	/* 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.	1334	* it, so save a few ticks and start from there.
1370	*/	1335	*/
1371	if (!(flag & INS_MAP_LOAD))	1336	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1337	if (object *pl = ms.player ())
1373	if (pl->contr->ns)	1338	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1339	pl->contr->ns->floorbox_update ();
1375		1340
1376	/* If this object glows, it may affect lighting conditions that are	1341	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1342	* 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	1343	* 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	1344	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1345	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1346	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1347	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1348	* of effect may be sufficient.
1384	*/	1349	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1350	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1351	update_all_los (op->map, op->x, op->y);
1387		1352
…		…
1425	{	1390	{
1426	object tmp, tmp1;	1391	object tmp, tmp1;
1427		1392
1428	/* first search for itself and remove any old instances */	1393	/* first search for itself and remove any old instances */
1429		1394
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1395	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1396	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1432	tmp->destroy ();	1397	tmp->destroy ();
1433		1398
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1399	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1400
…		…
1758		1723
1759	/* The objects have to be checked from top to bottom.	1724	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1725	* Hence, we first go to the top:
1761	*/	1726	*/
1762		1727
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1728	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1729	{
1765	/* Trim the search when we find the first other spell effect	1730	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1731	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1732	* we don't need to check all of them.
1768	*/	1733	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1751	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))	1752	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1753	{
1789		1754
1790	float	1755	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1756	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1757
1793	if (op->type == PLAYER)	1758	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1759	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)))	1760	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1761	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1791	* The first matching object is returned, or NULL if none.
1827	*/	1792	*/
1828	object *	1793	object *
1829	present_arch (const archetype at, maptile m, int x, int y)	1794	present_arch (const archetype at, maptile m, int x, int y)
1830	{	1795	{
1831	if (m == NULL \|\| out_of_map (m, x, y))	1796	if (!m \|\| out_of_map (m, x, y))
1832	{	1797	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1798	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1799	return NULL;
1835	}	1800	}
1836		1801
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1802	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1803	if (tmp->arch == at)
1839	return tmp;	1804	return tmp;
1840		1805
1841	return NULL;	1806	return NULL;
1842	}	1807	}
…		…
1853	{	1818	{
1854	LOG (llevError, "Present called outside map.\n");	1819	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1820	return NULL;
1856	}	1821	}
1857		1822
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1823	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1824	if (tmp->type == type)
1860	return tmp;	1825	return tmp;
1861		1826
1862	return NULL;	1827	return NULL;
1863	}	1828	}
…		…
2178		2143
2179	return 3;	2144	return 3;
2180	}	2145	}
2181		2146
2182	/*	2147	/*
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	2148	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2149	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2150	*/
2204
2205	int	2151	int
2206	dirdiff (int dir1, int dir2)	2152	dirdiff (int dir1, int dir2)
2207	{	2153	{
2208	int d;	2154	int d;
2209		2155
…		…
2595	object::flag_desc (char *desc, int len) const	2541	object::flag_desc (char *desc, int len) const
2596	{	2542	{
2597	char *p = desc;	2543	char *p = desc;
2598	bool first = true;	2544	bool first = true;
2599		2545
		2546	*p = 0;
		2547
2600	for (int i = 0; i < NUM_FLAGS; i++)	2548	for (int i = 0; i < NUM_FLAGS; i++)
2601	{	2549	{
2602	if (len <= 10) // magic constant!	2550	if (len <= 10) // magic constant!
2603	{	2551	{
2604	snprintf (p, len, ",...");	2552	snprintf (p, len, ",...");
2605	break;	2553	break;
2606	}	2554	}
2607		2555
2608	if (flag[i])	2556	if (flag [i])
2609	{	2557	{
2610	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2558	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611	len -= cnt;	2559	len -= cnt;
2612	p += cnt;	2560	p += cnt;
2613	first = false;	2561	first = false;
…		…
2615	}	2563	}
2616		2564
2617	return desc;	2565	return desc;
2618	}	2566	}
2619		2567
2620	// return a suitable string describing an objetc in enough detail to find it	2568	// return a suitable string describing an object in enough detail to find it
2621	const char *	2569	const char *
2622	object::debug_desc (char *info) const	2570	object::debug_desc (char *info) const
2623	{	2571	{
2624	char flagdesc[512];	2572	char flagdesc[512];
2625	char info2[256 * 4];	2573	char info2[256 * 4];
2626	char *p = info;	2574	char *p = info;
2627		2575
2628	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2576	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629	count, uuid.seq,	2577	count, uuid.seq,
2630	&name,	2578	&name,
2631	title ? "\",title:" : "",	2579	title ? "\",title:\"" : "",
2632	title ? (const char *)title : "",	2580	title ? (const char *)title : "",
2633	flag_desc (flagdesc, 512), type);	2581	flag_desc (flagdesc, 512), type);
2634		2582
2635	if (env)	2583	if (env)
2636	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2642	}	2590	}
2643		2591
2644	const char *	2592	const char *
2645	object::debug_desc () const	2593	object::debug_desc () const
2646	{	2594	{
2647	static char info[256 * 3];	2595	static char info[256 * 4];
2648	return debug_desc (info);	2596	return debug_desc (info);
2649	}	2597	}
2650		2598
		2599	const char *
		2600	object::debug_desc2 () const
		2601	{
		2602	static char info[256 * 4];
		2603	return debug_desc (info);
		2604	}
		2605

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.122 by root, Wed Jan 24 22:42:48 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.122 by root, Wed Jan 24 22:42:48 2007 UTC