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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.52 by root, Wed Sep 27 00:36:08 2006 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object objects; / Pointer to the list of used objects */
40	object active_objects; / List of active objects that need to be processed */	39	object active_objects; / List of active objects that need to be processed */
41		40
42	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,	41	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,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
55		131
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object wants, const object has)	134	compare_ob_value_lists_one (const object wants, const object has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
366	void	445	void
367	dump_all_objects (void)	446	dump_all_objects (void)
368	{	447	{
369	object *op;	448	object *op;
370		449
371	for (op = objects; op != NULL; op = op->next)	450	for (op = object::first; op != NULL; op = op->next)
372	{	451	{
373	dump_object (op);	452	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
375	}	454	}
376	}	455	}
377		456
378	/*	457	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	458	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
402	object *	481	object *
403	find_object (tag_t i)	482	find_object (tag_t i)
404	{	483	{
405	object *op;	484	object *op;
406		485
407	for (op = objects; op != NULL; op = op->next)	486	for (op = object::first; op != NULL; op = op->next)
408	if (op->count == i)	487	if (op->count == i)
409	break;	488	break;
		489
410	return op;	490	return op;
411	}	491	}
412		492
413	/*	493	/*
414	* Returns the first object which has a name equal to the argument.	494	* Returns the first object which has a name equal to the argument.
…		…
417	*/	497	*/
418		498
419	object *	499	object *
420	find_object_name (const char *str)	500	find_object_name (const char *str)
421	{	501	{
422	const char *name = shstr::find (str);	502	shstr_cmp str_ (str);
423	object *op;	503	object *op;
424		504
425	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	506	if (op->name == str_)
427	break;	507	break;
428		508
429	return op;	509	return op;
430	}	510	}
431		511
432	void	512	void
433	free_all_object_data ()	513	free_all_object_data ()
434	{	514	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448	object *
449	object::get_owner ()
450	{
451	if (!owner
452	\|\| QUERY_FLAG (owner, FLAG_FREED)
453	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	516	}
458		517
459	/*	518	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	519	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	520	* skill and experience objects.
…		…
531		590
532	/* What is not cleared is next, prev, and count */	591	/* What is not cleared is next, prev, and count */
533		592
534	expmul = 1.0;	593	expmul = 1.0;
535	face = blank_face;	594	face = blank_face;
536	attacked_by_count = -1;
537		595
538	if (settings.casting_time)	596	if (settings.casting_time)
539	casting_time = -1;	597	casting_time = -1;
540	}	598	}
541		599
…		…
623	/*	681	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	682	* Updates the speed of an object. If the speed changes from 0 to another
625	* value, or vice versa, then add/remove the object from the active list.	683	* value, or vice versa, then add/remove the object from the active list.
626	* This function needs to be called whenever the speed of an object changes.	684	* This function needs to be called whenever the speed of an object changes.
627	*/	685	*/
628
629	void	686	void
630	update_ob_speed (object *op)	687	update_ob_speed (object *op)
631	{	688	{
632	extern int arch_init;	689	extern int arch_init;
633		690
…		…
642	abort ();	699	abort ();
643	#else	700	#else
644	op->speed = 0;	701	op->speed = 0;
645	#endif	702	#endif
646	}	703	}
		704
647	if (arch_init)	705	if (arch_init)
648	{
649	return;	706	return;
650	}	707
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652	{	709	{
653	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
654	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	711	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
655	return;	712	return;
656		713
657	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	715	* of the list. */
659	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
660	if (op->active_next != NULL)	718	if (op->active_next != NULL)
661	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
662	active_objects = op;	721	active_objects = op;
663	}	722	}
664	else	723	else
665	{	724	{
666	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
668	return;	727	return;
669		728
670	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
671	{	730	{
672	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
673	if (op->active_next != NULL)	733	if (op->active_next != NULL)
674	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
675	}	735	}
676	else	736	else
677	{	737	{
678	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
679	if (op->active_next)	740	if (op->active_next)
680	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
681	}	742	}
		743
682	op->active_next = NULL;	744	op->active_next = NULL;
683	op->active_prev = NULL;	745	op->active_prev = NULL;
684	}	746	}
685	}	747	}
686		748
…		…
832		894
833	if (op->more != NULL)	895	if (op->more != NULL)
834	update_object (op->more, action);	896	update_object (op->more, action);
835	}	897	}
836		898
837	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
838	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
839		902
840	void object::free_mortals ()	903	void object::free_mortals ()
841	{	904	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843	if ((*i)->refcnt)	906	if ((*i)->refcnt)
844	++i; // further delay freeing	907	++i; // further delay freeing
845	else	908	else
846	{	909	{
847	freed.push_back (*i);//D
848	//delete *i;	910	delete *i;
849	mortals.erase (i);	911	mortals.erase (i);
850	}	912	}
851		913
852	if (mortals.size())//D	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals && lastmortals > 100)//D
		917	{
		918	lastmortals = mortals.size ();//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
854	}	921	}
855		922
856	object::object ()	923	object::object ()
857	{	924	{
858	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
859		926
860	expmul = 1.0;	927	expmul = 1.0;
861	face = blank_face;	928	face = blank_face;
862	attacked_by_count = -1;
863	}	929	}
864		930
865	object::~object ()	931	object::~object ()
866	{	932	{
867	free_key_values (this);	933	free_key_values (this);
868	}	934	}
869		935
870	void object::link ()	936	void object::link ()
871	{	937	{
872	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
873		940
874	prev = 0;	941	prev = 0;
875	next = objects;	942	next = object::first;
876		943
877	if (objects)	944	if (object::first)
878	objects->prev = this;	945	object::first->prev = this;
879		946
880	objects = this;	947	object::first = this;
881	}	948	}
882		949
883	void object::unlink ()	950	void object::unlink ()
884	{	951	{
885	count = 0;	952	if (this == object::first)
		953	object::first = next;
886		954
887	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
891	prev = 0;	959	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	960	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	961	}
903		962
904	object *object::create ()	963	object *object::create ()
905	{	964	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	965	object *op = new object;
911	else
912	{
913	// highly annoying, but the only way to get it stable right now
914	op = freed.back ();
915	freed.pop_back ();
916	op->~object ();
917	new ((void *) op) object;
918	}
919
920	op->link ();	966	op->link ();
921	return op;	967	return op;
922	}	968	}
923		969
924	/*	970	/*
…		…
926	* it from the list of used objects, and puts it on the list of	972	* it from the list of used objects, and puts it on the list of
927	* free objects. The IS_FREED() flag is set in the object.	973	* free objects. The IS_FREED() flag is set in the object.
928	* The object must have been removed by remove_ob() first for	974	* The object must have been removed by remove_ob() first for
929	* this function to succeed.	975	* this function to succeed.
930	*	976	*
931	* If free_inventory is set, free inventory as well. Else drop items in	977	* If destroy_inventory is set, free inventory as well. Else drop items in
932	* inventory to the ground.	978	* inventory to the ground.
933	*/	979	*/
934	void object::free (bool free_inventory)	980	void object::destroy (bool destroy_inventory)
935	{	981	{
936	if (QUERY_FLAG (this, FLAG_FREED))	982	if (QUERY_FLAG (this, FLAG_FREED))
937	return;	983	return;
938		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
939	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
940	remove_ob (this);	989	remove_ob (this);
941		990
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);
944
945	SET_FLAG (this, FLAG_FREED);	991	SET_FLAG (this, FLAG_FREED);
946		992
947	if (more)	993	if (more)
948	{	994	{
949	more->free (free_inventory);	995	more->destroy (destroy_inventory);
950	more = 0;	996	more = 0;
951	}	997	}
952		998
953	if (inv)	999	if (inv)
954	{	1000	{
955	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
957	* drop on that space.	1003	* drop on that space.
958	*/	1004	*/
959	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
960	{	1006	{
961	object *op = inv;	1007	object *op = inv;
962		1008
963	while (op)	1009	while (op)
964	{	1010	{
965	object *tmp = op->below;	1011	object *tmp = op->below;
966	op->free (free_inventory);	1012	op->destroy (destroy_inventory);
967	op = tmp;	1013	op = tmp;
968	}	1014	}
969	}	1015	}
970	else	1016	else
971	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
…		…
990	op = tmp;	1036	op = tmp;
991	}	1037	}
992	}	1038	}
993	}	1039	}
994		1040
		1041	// clear those pointers that likely might have circular references to us
995	owner = 0;	1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
		1045
		1046	// only relevant for players(?), but make sure of it anyways
		1047	contr = 0;
996		1048
997	/* Remove object from the active list */	1049	/* Remove object from the active list */
998	speed = 0;	1050	speed = 0;
999	update_ob_speed (this);	1051	update_ob_speed (this);
1000		1052
…		…
1012	sub_weight (object *op, signed long weight)	1064	sub_weight (object *op, signed long weight)
1013	{	1065	{
1014	while (op != NULL)	1066	while (op != NULL)
1015	{	1067	{
1016	if (op->type == CONTAINER)	1068	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	1070
1020	op->carrying -= weight;	1071	op->carrying -= weight;
1021	op = op->env;	1072	op = op->env;
1022	}	1073	}
1023	}	1074	}
1024		1075
…		…
1032	*/	1083	*/
1033		1084
1034	void	1085	void
1035	remove_ob (object *op)	1086	remove_ob (object *op)
1036	{	1087	{
		1088	object tmp, last = 0;
1037	object *	1089	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		1090
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;	1091	int check_walk_off;
1047	mapstruct *	1092	maptile *m;
1048	m;
1049		1093
1050	sint16	1094	sint16 x, y;
1051	x,
1052	y;
1053		1095
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	1096	if (QUERY_FLAG (op, FLAG_REMOVED))
1055	return;	1097	return;
1056		1098
1057	SET_FLAG (op, FLAG_REMOVED);	1099	SET_FLAG (op, FLAG_REMOVED);
…		…
1150	op->below = 0;	1192	op->below = 0;
1151		1193
1152	if (op->map->in_memory == MAP_SAVING)	1194	if (op->map->in_memory == MAP_SAVING)
1153	return;	1195	return;
1154		1196
1155	tag = op->count;
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1197	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1157		1198
1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1199	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1159	{	1200	{
1160	/* No point updating the players look faces if he is the object	1201	/* No point updating the players look faces if he is the object
…		…
1175		1216
1176	tmp->contr->socket.update_look = 1;	1217	tmp->contr->socket.update_look = 1;
1177	}	1218	}
1178		1219
1179	/* See if player moving off should effect something */	1220	/* See if player moving off should effect something */
1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1221	if (check_walk_off
		1222	&& ((op->move_type & tmp->move_off)
		1223	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1224	{
1182	move_apply (tmp, op, NULL);	1225	move_apply (tmp, op, NULL);
1183		1226
1184	if (was_destroyed (op, tag))	1227	if (op->destroyed ())
1185	{
1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1228	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187	}
1188	}	1229	}
1189		1230
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1231	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1232
1192	if (tmp->above == tmp)	1233	if (tmp->above == tmp)
…		…
1220	* This function goes through all objects below and including top, and	1261	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1262	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1263	* If top is NULL, it is calculated.
1223	* Returns pointer to object if it succeded in the merge, otherwise NULL	1264	* Returns pointer to object if it succeded in the merge, otherwise NULL
1224	*/	1265	*/
1225
1226	object *	1266	object *
1227	merge_ob (object op, object top)	1267	merge_ob (object op, object top)
1228	{	1268	{
1229	if (!op->nrof)	1269	if (!op->nrof)
1230	return 0;	1270	return 0;
…		…
1246	free_object (op);	1286	free_object (op);
1247	return top;	1287	return top;
1248	}	1288	}
1249	}	1289	}
1250		1290
1251	return NULL;	1291	return 0;
1252	}	1292	}
1253		1293
1254	/*	1294	/*
1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1295	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1256	* job preparing multi-part monsters	1296	* job preparing multi-part monsters
1257	*/	1297	*/
1258	object *	1298	object *
1259	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1299	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1260	{	1300	{
1261	object *tmp;	1301	object *tmp;
1262		1302
1263	if (op->head)	1303	if (op->head)
1264	op = op->head;	1304	op = op->head;
…		…
1292	* NULL if 'op' was destroyed	1332	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1333	* just 'op' otherwise
1294	*/	1334	*/
1295		1335
1296	object *	1336	object *
1297	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1337	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1298	{	1338	{
1299	object tmp, top, *floor = NULL;	1339	object tmp, top, *floor = NULL;
1300	sint16 x, y;	1340	sint16 x, y;
1301		1341
1302	if (QUERY_FLAG (op, FLAG_FREED))	1342	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1583	remove_ob (tmp);	1623	remove_ob (tmp);
1584	free_object (tmp);	1624	free_object (tmp);
1585	}	1625	}
1586	}	1626	}
1587		1627
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1628	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1629
1590	tmp1->x = op->x;	1630	tmp1->x = op->x;
1591	tmp1->y = op->y;	1631	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1632	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1633	}
…		…
1892	*/	1932	*/
1893		1933
1894	int	1934	int
1895	check_move_on (object op, object originator)	1935	check_move_on (object op, object originator)
1896	{	1936	{
1897	object *	1937	object *tmp;
1898	tmp;	1938	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1939	int x = op->x, y = op->y;
1905		1940
1906	MoveType	1941	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1942
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1943	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1944	return 0;
1913
1914	tag = op->count;
1915		1945
1916	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1946	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1947	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1948	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919		1949
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2010	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2011	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	2012	{
1983	move_apply (tmp, op, originator);	2013	move_apply (tmp, op, originator);
1984		2014
1985	if (was_destroyed (op, tag))	2015	if (op->destroyed ())
1986	return 1;	2016	return 1;
1987		2017
1988	/* what the person/creature stepped onto has moved the object	2018	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	2019	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	2020	* have a feeling strange problems would result.
…		…
2002	* a matching archetype at the given map and coordinates.	2032	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	2033	* The first matching object is returned, or NULL if none.
2004	*/	2034	*/
2005		2035
2006	object *	2036	object *
2007	present_arch (const archetype at, mapstruct m, int x, int y)	2037	present_arch (const archetype at, maptile m, int x, int y)
2008	{	2038	{
2009	object *	2039	object *
2010	tmp;	2040	tmp;
2011		2041
2012	if (m == NULL \|\| out_of_map (m, x, y))	2042	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2025	* a matching type variable at the given map and coordinates.	2055	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	2056	* The first matching object is returned, or NULL if none.
2027	*/	2057	*/
2028		2058
2029	object *	2059	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	2060	present (unsigned char type, maptile *m, int x, int y)
2031	{	2061	{
2032	object *	2062	object *
2033	tmp;	2063	tmp;
2034		2064
2035	if (out_of_map (m, x, y))	2065	if (out_of_map (m, x, y))
…		…
2175	* the archetype because that isn't correct if the monster has been	2205	* the archetype because that isn't correct if the monster has been
2176	* customized, changed states, etc.	2206	* customized, changed states, etc.
2177	*/	2207	*/
2178		2208
2179	int	2209	int
2180	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2210	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2181	{	2211	{
2182	int	2212	int
2183	i,	2213	i,
2184	index = 0, flag;	2214	index = 0, flag;
2185	static int	2215	static int
…		…
2206	return -1;	2236	return -1;
2207	return altern[RANDOM () % index];	2237	return altern[RANDOM () % index];
2208	}	2238	}
2209		2239
2210	/*	2240	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2241	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2242	* find_free_spot(), but it will search max number of squares.
2213	* But it will return the first available spot, not a random choice.	2243	* But it will return the first available spot, not a random choice.
2214	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2244	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2215	*/	2245	*/
2216		2246
2217	int	2247	int
2218	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2248	find_first_free_spot (const object ob, maptile m, int x, int y)
2219	{	2249	{
2220	int	2250	int
2221	i;	2251	i;
2222		2252
2223	for (i = 0; i < SIZEOFFREE; i++)	2253	for (i = 0; i < SIZEOFFREE; i++)
…		…
2287	* because we have to know what movement the thing looking to move	2317	* because we have to know what movement the thing looking to move
2288	* there is capable of.	2318	* there is capable of.
2289	*/	2319	*/
2290		2320
2291	int	2321	int
2292	find_dir (mapstruct m, int x, int y, object exclude)	2322	find_dir (maptile m, int x, int y, object exclude)
2293	{	2323	{
2294	int	2324	int
2295	i,	2325	i,
2296	max = SIZEOFFREE, mflags;	2326	max = SIZEOFFREE, mflags;
2297		2327
2298	sint16 nx, ny;	2328	sint16 nx, ny;
2299	object *	2329	object *
2300	tmp;	2330	tmp;
2301	mapstruct *	2331	maptile *
2302	mp;	2332	mp;
2303		2333
2304	MoveType blocked, move_type;	2334	MoveType blocked, move_type;
2305		2335
2306	if (exclude && exclude->head)	2336	if (exclude && exclude->head)
…		…
2514	* Modified to be map tile aware -.MSW	2544	* Modified to be map tile aware -.MSW
2515	*/	2545	*/
2516		2546
2517		2547
2518	int	2548	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2549	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2550	{
2521	sint16 dx, dy;	2551	sint16 dx, dy;
2522	int	2552	int
2523	mflags;	2553	mflags;
2524		2554
…		…
2604	if (prev)	2634	if (prev)
2605	prev->more = tmp;	2635	prev->more = tmp;
2606	prev = tmp;	2636	prev = tmp;
2607	}	2637	}
2608		2638
2609	/* copy inventory */
2610	for (item = src->inv; item; item = item->below)	2639	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2640	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2641
2615	return dst;	2642	return dst;
2616	}	2643	}
2617		2644
2618	/* return true if the object was destroyed, 0 otherwise */
2619	int
2620	was_destroyed (const object *op, tag_t old_tag)
2621	{
2622	/* checking for FLAG_FREED isn't necessary, but makes this function more
2623	* robust */
2624	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2625	}
2626
2627	/* GROS - Creates an object using a string representing its content. */	2645	/* GROS - Creates an object using a string representing its content. */
2628
2629	/* Basically, we save the content of the string to a temp file, then call */	2646	/* Basically, we save the content of the string to a temp file, then call */
2630
2631	/* load_object on it. I admit it is a highly inefficient way to make things, */	2647	/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633	/* but it was simple to make and allows reusing the load_object function. */	2648	/* but it was simple to make and allows reusing the load_object function. */
2634
2635	/* Remember not to use load_object_str in a time-critical situation. */	2649	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2650	/* Also remember that multiparts objects are not supported for now. */
2638		2651
2639	object *	2652	object *
2640	load_object_str (const char *obstr)	2653	load_object_str (const char *obstr)
2641	{	2654	{
2642	object *	2655	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2656	char filename[MAX_BUF];
2646		2657
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2658	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2659
2649	FILE *
2650	tempfile = fopen (filename, "w");	2660	FILE *tempfile = fopen (filename, "w");
2651		2661
2652	if (tempfile == NULL)	2662	if (tempfile == NULL)
2653	{	2663	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2664	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2665	return NULL;
2656	};	2666	}
		2667
2657	fprintf (tempfile, obstr);	2668	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2669	fclose (tempfile);
2659		2670
2660	op = get_object ();	2671	op = get_object ();
2661		2672
…		…
2675	* returns NULL if no match.	2686	* returns NULL if no match.
2676	*/	2687	*/
2677	object *	2688	object *
2678	find_obj_by_type_subtype (const object *who, int type, int subtype)	2689	find_obj_by_type_subtype (const object *who, int type, int subtype)
2679	{	2690	{
2680	object *	2691	object *tmp;
2681	tmp;
2682		2692
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2693	for (tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2694	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2695	return tmp;
2686		2696
…		…
2694	* do the desired thing.	2704	* do the desired thing.
2695	*/	2705	*/
2696	key_value *	2706	key_value *
2697	get_ob_key_link (const object ob, const char key)	2707	get_ob_key_link (const object ob, const char key)
2698	{	2708	{
2699	key_value *	2709	key_value *link;
2700	link;
2701		2710
2702	for (link = ob->key_values; link != NULL; link = link->next)	2711	for (link = ob->key_values; link != NULL; link = link->next)
2703	{
2704	if (link->key == key)	2712	if (link->key == key)
2705	{
2706	return link;	2713	return link;
2707	}
2708	}
2709		2714
2710	return NULL;	2715	return NULL;
2711	}	2716	}
2712		2717
2713	/*	2718	/*
…		…
2718	* The returned string is shared.	2723	* The returned string is shared.
2719	*/	2724	*/
2720	const char *	2725	const char *
2721	get_ob_key_value (const object op, const char const key)	2726	get_ob_key_value (const object op, const char const key)
2722	{	2727	{
2723	key_value *	2728	key_value *link;
2724	link;	2729	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2730
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2731	if (!canonical_key)
2731	{	2732	{
2732	/* 1. There being a field named key on any object	2733	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2734	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2735	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, this object doesn't have this field.	2736	* 3. Therefore, this object doesn't have this field.
2736	*/	2737	*/
2737	return NULL;	2738	return 0;
2738	}	2739	}
2739		2740
2740	/* This is copied from get_ob_key_link() above -	2741	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2742	* only 4 lines, and saves the function call overhead.
2742	*/	2743	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2744	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2745	if (link->key == canonical_key)
2746	{
2747	return link->value;	2746	return link->value;
2748	}	2747
2749	}
2750	return NULL;	2748	return 0;
2751	}	2749	}
2752		2750
2753		2751
2754	/*	2752	/*
2755	* Updates the canonical_key in op to value.	2753	* Updates the canonical_key in op to value.
…		…
2840	{	2838	{
2841	shstr key_ (key);	2839	shstr key_ (key);
2842		2840
2843	return set_ob_key_value_s (op, key_, value, add_key);	2841	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2842	}
		2843
		2844	object::depth_iterator::depth_iterator (object *container)
		2845	: iterator_base (container)
		2846	{
		2847	while (item->inv)
		2848	item = item->inv;
		2849	}
		2850
		2851	void
		2852	object::depth_iterator::next ()
		2853	{
		2854	if (item->below)
		2855	{
		2856	item = item->below;
		2857
		2858	while (item->inv)
		2859	item = item->inv;
		2860	}
		2861	else
		2862	item = item->env;
		2863	}
		2864
		2865	// return a suitable string describing an objetc in enough detail to find it
		2866	const char *
		2867	object::debug_desc (char *info) const
		2868	{
		2869	char info2[256 * 3];
		2870	char *p = info;
		2871
		2872	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2873	count,
		2874	&name,
		2875	title ? " " : "",
		2876	title ? (const char *)title : "");
		2877
		2878	if (env)
		2879	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2880
		2881	if (map)
		2882	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2883
		2884	return info;
		2885	}
		2886
		2887	const char *
		2888	object::debug_desc () const
		2889	{
		2890	static char info[256 * 3];
		2891	return debug_desc (info);
		2892	}
		2893

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs. Revision 1.52 by root, Wed Sep 27 00:36:08 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.52 by root, Wed Sep 27 00:36:08 2006 UTC