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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.48 by root, Thu Sep 14 23:13:48 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
…		…
836		894
837	if (op->more != NULL)	895	if (op->more != NULL)
838	update_object (op->more, action);	896	update_object (op->more, action);
839	}	897	}
840		898
841	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
842	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
843		902
844	void object::free_mortals ()	903	void object::free_mortals ()
845	{	904	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	906	if ((*i)->refcnt)
848	++i; // further delay freeing	907	++i; // further delay freeing
849	else	908	else
850	{	909	{
851	freed.push_back (*i);//D
852	//delete *i;	910	delete *i;
853	mortals.erase (i);	911	mortals.erase (i);
854	}	912	}
855		913
		914	static int lastmortals = 0;//D
		915
856	if (mortals.size())//D	916	if (mortals.size() != lastmortals)//D
		917	{
		918	lastmortals = mortals.size ();//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
858	}	921	}
859		922
860	object::object ()	923	object::object ()
861	{	924	{
862	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
863		926
864	expmul = 1.0;	927	expmul = 1.0;
865	face = blank_face;	928	face = blank_face;
866	attacked_by_count = -1;
867	}	929	}
868		930
869	object::~object ()	931	object::~object ()
870	{	932	{
871	free_key_values (this);	933	free_key_values (this);
872	}	934	}
873		935
874	void object::link ()	936	void object::link ()
875	{	937	{
876	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
877		940
878	prev = 0;	941	prev = 0;
879	next = objects;	942	next = object::first;
880		943
881	if (objects)	944	if (object::first)
882	objects->prev = this;	945	object::first->prev = this;
883		946
884	objects = this;	947	object::first = this;
885	}	948	}
886		949
887	void object::unlink ()	950	void object::unlink ()
888	{	951	{
889	count = 0;	952	if (this == object::first)
		953	object::first = next;
890		954
891	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
895	prev = 0;	959	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	960	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	961	}
907		962
908	object *object::create ()	963	object *object::create ()
909	{	964	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	965	object *op = new object;
914	else
915	{
916	// highly annoying, but the only way to get it stable right now
917	op = freed.back ();
918	freed.pop_back ();
919	op->~object ();
920	new ((void *) op) object;
921	}
922
923	op->link ();	966	op->link ();
924	return op;	967	return op;
925	}	968	}
926		969
927	/*	970	/*
…		…
993	op = tmp;	1036	op = tmp;
994	}	1037	}
995	}	1038	}
996	}	1039	}
997		1040
		1041	// clear those pointers that likely might have circular references to us
998	owner = 0;	1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
999		1045
1000	/* Remove object from the active list */	1046	/* Remove object from the active list */
1001	speed = 0;	1047	speed = 0;
1002	update_ob_speed (this);	1048	update_ob_speed (this);
1003		1049
…		…
1015	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1016	{	1062	{
1017	while (op != NULL)	1063	while (op != NULL)
1018	{	1064	{
1019	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	1067
1023	op->carrying -= weight;	1068	op->carrying -= weight;
1024	op = op->env;	1069	op = op->env;
1025	}	1070	}
1026	}	1071	}
1027		1072
…		…
1035	*/	1080	*/
1036		1081
1037	void	1082	void
1038	remove_ob (object *op)	1083	remove_ob (object *op)
1039	{	1084	{
		1085	object tmp, last = 0;
1040	object *	1086	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		1087
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	1088	int check_walk_off;
1050	mapstruct *	1089	mapstruct *m;
1051	m;
1052		1090
1053	sint16	1091	sint16 x, y;
1054	x,
1055	y;
1056		1092
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1058	return;	1094	return;
1059		1095
1060	SET_FLAG (op, FLAG_REMOVED);	1096	SET_FLAG (op, FLAG_REMOVED);
…		…
1153	op->below = 0;	1189	op->below = 0;
1154		1190
1155	if (op->map->in_memory == MAP_SAVING)	1191	if (op->map->in_memory == MAP_SAVING)
1156	return;	1192	return;
1157		1193
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1160		1195
1161	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1196	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1162	{	1197	{
1163	/* No point updating the players look faces if he is the object	1198	/* No point updating the players look faces if he is the object
…		…
1182	/* See if player moving off should effect something */	1217	/* See if player moving off should effect something */
1183	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1218	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184	{	1219	{
1185	move_apply (tmp, op, NULL);	1220	move_apply (tmp, op, NULL);
1186		1221
1187	if (was_destroyed (op, tag))	1222	if (op->destroyed ());
1188	{
1189	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1223	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1190	}
1191	}	1224	}
1192		1225
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1226	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1227
1195	if (tmp->above == tmp)	1228	if (tmp->above == tmp)
…		…
1223	* This function goes through all objects below and including top, and	1256	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1257	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1258	* If top is NULL, it is calculated.
1226	* Returns pointer to object if it succeded in the merge, otherwise NULL	1259	* Returns pointer to object if it succeded in the merge, otherwise NULL
1227	*/	1260	*/
1228
1229	object *	1261	object *
1230	merge_ob (object op, object top)	1262	merge_ob (object op, object top)
1231	{	1263	{
1232	if (!op->nrof)	1264	if (!op->nrof)
1233	return 0;	1265	return 0;
…		…
1249	free_object (op);	1281	free_object (op);
1250	return top;	1282	return top;
1251	}	1283	}
1252	}	1284	}
1253		1285
1254	return NULL;	1286	return 0;
1255	}	1287	}
1256		1288
1257	/*	1289	/*
1258	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1290	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1259	* job preparing multi-part monsters	1291	* job preparing multi-part monsters
…		…
1586	remove_ob (tmp);	1618	remove_ob (tmp);
1587	free_object (tmp);	1619	free_object (tmp);
1588	}	1620	}
1589	}	1621	}
1590		1622
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1623	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1624
1593	tmp1->x = op->x;	1625	tmp1->x = op->x;
1594	tmp1->y = op->y;	1626	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1627	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1628	}
…		…
1895	*/	1927	*/
1896		1928
1897	int	1929	int
1898	check_move_on (object op, object originator)	1930	check_move_on (object op, object originator)
1899	{	1931	{
1900	object *	1932	object *tmp;
1901	tmp;	1933	mapstruct *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1934	int x = op->x, y = op->y;
1908		1935
1909	MoveType	1936	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1937
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1938	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1939	return 0;
1916
1917	tag = op->count;
1918		1940
1919	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1941	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1942	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1943	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922		1944
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2005	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1984	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2006	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985	{	2007	{
1986	move_apply (tmp, op, originator);	2008	move_apply (tmp, op, originator);
1987		2009
1988	if (was_destroyed (op, tag))	2010	if (op->destroyed ())
1989	return 1;	2011	return 1;
1990		2012
1991	/* what the person/creature stepped onto has moved the object	2013	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	2014	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	2015	* have a feeling strange problems would result.
…		…
2607	if (prev)	2629	if (prev)
2608	prev->more = tmp;	2630	prev->more = tmp;
2609	prev = tmp;	2631	prev = tmp;
2610	}	2632	}
2611		2633
2612	/* copy inventory */
2613	for (item = src->inv; item; item = item->below)	2634	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2635	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2636
2618	return dst;	2637	return dst;
2619	}	2638	}
2620		2639
2621	/* return true if the object was destroyed, 0 otherwise */
2622	int
2623	was_destroyed (const object *op, tag_t old_tag)
2624	{
2625	/* checking for FLAG_FREED isn't necessary, but makes this function more
2626	* robust */
2627	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2628	}
2629
2630	/* GROS - Creates an object using a string representing its content. */	2640	/* GROS - Creates an object using a string representing its content. */
2631
2632	/* Basically, we save the content of the string to a temp file, then call */	2641	/* Basically, we save the content of the string to a temp file, then call */
2633
2634	/* load_object on it. I admit it is a highly inefficient way to make things, */	2642	/* load_object on it. I admit it is a highly inefficient way to make things, */
2635
2636	/* but it was simple to make and allows reusing the load_object function. */	2643	/* but it was simple to make and allows reusing the load_object function. */
2637
2638	/* Remember not to use load_object_str in a time-critical situation. */	2644	/* Remember not to use load_object_str in a time-critical situation. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2645	/* Also remember that multiparts objects are not supported for now. */
2641		2646
2642	object *	2647	object *
2643	load_object_str (const char *obstr)	2648	load_object_str (const char *obstr)
2644	{	2649	{
2645	object *	2650	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2651	char filename[MAX_BUF];
2649		2652
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2653	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2654
2652	FILE *
2653	tempfile = fopen (filename, "w");	2655	FILE *tempfile = fopen (filename, "w");
2654		2656
2655	if (tempfile == NULL)	2657	if (tempfile == NULL)
2656	{	2658	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2659	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2660	return NULL;
2659	};	2661	}
		2662
2660	fprintf (tempfile, obstr);	2663	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2664	fclose (tempfile);
2662		2665
2663	op = get_object ();	2666	op = get_object ();
2664		2667
…		…
2678	* returns NULL if no match.	2681	* returns NULL if no match.
2679	*/	2682	*/
2680	object *	2683	object *
2681	find_obj_by_type_subtype (const object *who, int type, int subtype)	2684	find_obj_by_type_subtype (const object *who, int type, int subtype)
2682	{	2685	{
2683	object *	2686	object *tmp;
2684	tmp;
2685		2687
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2688	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2689	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2690	return tmp;
2689		2691
…		…
2697	* do the desired thing.	2699	* do the desired thing.
2698	*/	2700	*/
2699	key_value *	2701	key_value *
2700	get_ob_key_link (const object ob, const char key)	2702	get_ob_key_link (const object ob, const char key)
2701	{	2703	{
2702	key_value *	2704	key_value *link;
2703	link;
2704		2705
2705	for (link = ob->key_values; link != NULL; link = link->next)	2706	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2707	if (link->key == key)
2708	{
2709	return link;	2708	return link;
2710	}
2711	}
2712		2709
2713	return NULL;	2710	return NULL;
2714	}	2711	}
2715		2712
2716	/*	2713	/*
…		…
2721	* The returned string is shared.	2718	* The returned string is shared.
2722	*/	2719	*/
2723	const char *	2720	const char *
2724	get_ob_key_value (const object op, const char const key)	2721	get_ob_key_value (const object op, const char const key)
2725	{	2722	{
2726	key_value *	2723	key_value *link;
2727	link;	2724	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2725
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2726	if (!canonical_key)
2734	{	2727	{
2735	/* 1. There being a field named key on any object	2728	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2729	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2730	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, this object doesn't have this field.	2731	* 3. Therefore, this object doesn't have this field.
2739	*/	2732	*/
2740	return NULL;	2733	return 0;
2741	}	2734	}
2742		2735
2743	/* This is copied from get_ob_key_link() above -	2736	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2737	* only 4 lines, and saves the function call overhead.
2745	*/	2738	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2739	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2740	if (link->key == canonical_key)
2749	{
2750	return link->value;	2741	return link->value;
2751	}	2742
2752	}
2753	return NULL;	2743	return 0;
2754	}	2744	}
2755		2745
2756		2746
2757	/*	2747	/*
2758	* Updates the canonical_key in op to value.	2748	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2834	shstr key_ (key);
2845		2835
2846	return set_ob_key_value_s (op, key_, value, add_key);	2836	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2837	}
2848		2838
		2839	object::depth_iterator::depth_iterator (object *container)
		2840	: iterator_base (container)
		2841	{
		2842	while (item->inv)
		2843	item = item->inv;
		2844	}
		2845
2849	void	2846	void
2850	object::deep_iterator::next ()	2847	object::depth_iterator::next ()
2851	{	2848	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2849	if (item->below)
		2850	{
2855	item = item->below;	2851	item = item->below;
		2852
		2853	while (item->inv)
		2854	item = item->inv;
		2855	}
2856	else	2856	else
2857	item = item->env->below;	2857	item = item->env;
2858	}	2858	}
		2859
		2860	// return a suitable string describing an objetc in enough detail to find it
		2861	const char *
		2862	object::debug_desc (char *info) const
		2863	{
		2864	char info2[256 * 3];
		2865	char *p = info;
		2866
		2867	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2868	count,
		2869	&name,
		2870	title ? " " : "",
		2871	title ? (const char *)title : "");
		2872
		2873	if (env)
		2874	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2875
		2876	if (map)
		2877	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2878
		2879	return info;
		2880	}
		2881
		2882	const char *
		2883	object::debug_desc () const
		2884	{
		2885	static char info[256 * 3];
		2886	return debug_desc (info);
		2887	}
		2888

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs. Revision 1.48 by root, Thu Sep 14 23:13:48 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.48 by root, Thu Sep 14 23:13:48 2006 UTC