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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.50 by root, Sat Sep 16 22:40:22 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 *
911	op;
912
913	if (freed.empty ())
914	op = new object;	965	object *op = new object;
915	else
916	{
917	// highly annoying, but the only way to get it stable right now
918	op = freed.back ();
919	freed.pop_back ();
920	op->~object ();
921	new ((void *) op) object;
922	}
923
924	op->link ();	966	op->link ();
925	return op;	967	return op;
926	}	968	}
927		969
928	/*	970	/*
…		…
938	void object::free (bool free_inventory)	980	void object::free (bool free_inventory)
939	{	981	{
940	if (QUERY_FLAG (this, FLAG_FREED))	982	if (QUERY_FLAG (this, FLAG_FREED))
941	return;	983	return;
942		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
943	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
944	remove_ob (this);	989	remove_ob (this);
945
946	if (QUERY_FLAG (this, FLAG_FRIENDLY))
947	remove_friendly_object (this);
948		990
949	SET_FLAG (this, FLAG_FREED);	991	SET_FLAG (this, FLAG_FREED);
950		992
951	if (more)	993	if (more)
952	{	994	{
…		…
958	{	1000	{
959	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
960	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
961	* drop on that space.	1003	* drop on that space.
962	*/	1004	*/
963	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
964	{	1006	{
965	object *op = inv;	1007	object *op = inv;
966		1008
967	while (op)	1009	while (op)
968	{	1010	{
…		…
994	op = tmp;	1036	op = tmp;
995	}	1037	}
996	}	1038	}
997	}	1039	}
998		1040
		1041	// clear those pointers that likely might have circular references to us
999	owner = 0;	1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
1000		1045
1001	/* Remove object from the active list */	1046	/* Remove object from the active list */
1002	speed = 0;	1047	speed = 0;
1003	update_ob_speed (this);	1048	update_ob_speed (this);
1004		1049
…		…
1016	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1017	{	1062	{
1018	while (op != NULL)	1063	while (op != NULL)
1019	{	1064	{
1020	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1021	{
1022	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023	}	1067
1024	op->carrying -= weight;	1068	op->carrying -= weight;
1025	op = op->env;	1069	op = op->env;
1026	}	1070	}
1027	}	1071	}
1028		1072
…		…
1036	*/	1080	*/
1037		1081
1038	void	1082	void
1039	remove_ob (object *op)	1083	remove_ob (object *op)
1040	{	1084	{
		1085	object tmp, last = 0;
1041	object *	1086	object *otmp;
1042	tmp, *
1043	last = NULL;
1044	object *
1045	otmp;
1046		1087
1047	tag_t
1048	tag;
1049	int
1050	check_walk_off;	1088	int check_walk_off;
1051	mapstruct *	1089	maptile *m;
1052	m;
1053		1090
1054	sint16	1091	sint16 x, y;
1055	x,
1056	y;
1057		1092
1058	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1059	return;	1094	return;
1060		1095
1061	SET_FLAG (op, FLAG_REMOVED);	1096	SET_FLAG (op, FLAG_REMOVED);
…		…
1154	op->below = 0;	1189	op->below = 0;
1155		1190
1156	if (op->map->in_memory == MAP_SAVING)	1191	if (op->map->in_memory == MAP_SAVING)
1157	return;	1192	return;
1158		1193
1159	tag = op->count;
1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1161		1195
1162	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)
1163	{	1197	{
1164	/* 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
…		…
1179		1213
1180	tmp->contr->socket.update_look = 1;	1214	tmp->contr->socket.update_look = 1;
1181	}	1215	}
1182		1216
1183	/* See if player moving off should effect something */	1217	/* See if player moving off should effect something */
1184	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
		1219	&& ((op->move_type & tmp->move_off)
		1220	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1185	{	1221	{
1186	move_apply (tmp, op, NULL);	1222	move_apply (tmp, op, NULL);
1187		1223
1188	if (was_destroyed (op, tag))	1224	if (op->destroyed ())
1189	{
1190	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1225	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1191	}
1192	}	1226	}
1193		1227
1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1228	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195		1229
1196	if (tmp->above == tmp)	1230	if (tmp->above == tmp)
…		…
1224	* This function goes through all objects below and including top, and	1258	* This function goes through all objects below and including top, and
1225	* merges op to the first matching object.	1259	* merges op to the first matching object.
1226	* If top is NULL, it is calculated.	1260	* If top is NULL, it is calculated.
1227	* Returns pointer to object if it succeded in the merge, otherwise NULL	1261	* Returns pointer to object if it succeded in the merge, otherwise NULL
1228	*/	1262	*/
1229
1230	object *	1263	object *
1231	merge_ob (object op, object top)	1264	merge_ob (object op, object top)
1232	{	1265	{
1233	if (!op->nrof)	1266	if (!op->nrof)
1234	return 0;	1267	return 0;
…		…
1250	free_object (op);	1283	free_object (op);
1251	return top;	1284	return top;
1252	}	1285	}
1253	}	1286	}
1254		1287
1255	return NULL;	1288	return 0;
1256	}	1289	}
1257		1290
1258	/*	1291	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1292	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1293	* job preparing multi-part monsters
1261	*/	1294	*/
1262	object *	1295	object *
1263	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1296	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1264	{	1297	{
1265	object *tmp;	1298	object *tmp;
1266		1299
1267	if (op->head)	1300	if (op->head)
1268	op = op->head;	1301	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1329	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1330	* just 'op' otherwise
1298	*/	1331	*/
1299		1332
1300	object *	1333	object *
1301	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1334	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1302	{	1335	{
1303	object tmp, top, *floor = NULL;	1336	object tmp, top, *floor = NULL;
1304	sint16 x, y;	1337	sint16 x, y;
1305		1338
1306	if (QUERY_FLAG (op, FLAG_FREED))	1339	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1587	remove_ob (tmp);	1620	remove_ob (tmp);
1588	free_object (tmp);	1621	free_object (tmp);
1589	}	1622	}
1590	}	1623	}
1591		1624
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1625	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1626
1594	tmp1->x = op->x;	1627	tmp1->x = op->x;
1595	tmp1->y = op->y;	1628	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1629	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1630	}
…		…
1896	*/	1929	*/
1897		1930
1898	int	1931	int
1899	check_move_on (object op, object originator)	1932	check_move_on (object op, object originator)
1900	{	1933	{
1901	object *	1934	object *tmp;
1902	tmp;	1935	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1936	int x = op->x, y = op->y;
1909		1937
1910	MoveType	1938	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1939
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1940	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1941	return 0;
1917
1918	tag = op->count;
1919		1942
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1943	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1944	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1945	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1946
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2007	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2008	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	2009	{
1987	move_apply (tmp, op, originator);	2010	move_apply (tmp, op, originator);
1988		2011
1989	if (was_destroyed (op, tag))	2012	if (op->destroyed ())
1990	return 1;	2013	return 1;
1991		2014
1992	/* what the person/creature stepped onto has moved the object	2015	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	2016	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	2017	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	2029	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	2030	* The first matching object is returned, or NULL if none.
2008	*/	2031	*/
2009		2032
2010	object *	2033	object *
2011	present_arch (const archetype at, mapstruct m, int x, int y)	2034	present_arch (const archetype at, maptile m, int x, int y)
2012	{	2035	{
2013	object *	2036	object *
2014	tmp;	2037	tmp;
2015		2038
2016	if (m == NULL \|\| out_of_map (m, x, y))	2039	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	2052	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	2053	* The first matching object is returned, or NULL if none.
2031	*/	2054	*/
2032		2055
2033	object *	2056	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	2057	present (unsigned char type, maptile *m, int x, int y)
2035	{	2058	{
2036	object *	2059	object *
2037	tmp;	2060	tmp;
2038		2061
2039	if (out_of_map (m, x, y))	2062	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2202	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2203	* customized, changed states, etc.
2181	*/	2204	*/
2182		2205
2183	int	2206	int
2184	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2207	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2185	{	2208	{
2186	int	2209	int
2187	i,	2210	i,
2188	index = 0, flag;	2211	index = 0, flag;
2189	static int	2212	static int
…		…
2210	return -1;	2233	return -1;
2211	return altern[RANDOM () % index];	2234	return altern[RANDOM () % index];
2212	}	2235	}
2213		2236
2214	/*	2237	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2238	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2239	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2240	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2241	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2242	*/
2220		2243
2221	int	2244	int
2222	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2245	find_first_free_spot (const object ob, maptile m, int x, int y)
2223	{	2246	{
2224	int	2247	int
2225	i;	2248	i;
2226		2249
2227	for (i = 0; i < SIZEOFFREE; i++)	2250	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2314	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2315	* there is capable of.
2293	*/	2316	*/
2294		2317
2295	int	2318	int
2296	find_dir (mapstruct m, int x, int y, object exclude)	2319	find_dir (maptile m, int x, int y, object exclude)
2297	{	2320	{
2298	int	2321	int
2299	i,	2322	i,
2300	max = SIZEOFFREE, mflags;	2323	max = SIZEOFFREE, mflags;
2301		2324
2302	sint16 nx, ny;	2325	sint16 nx, ny;
2303	object *	2326	object *
2304	tmp;	2327	tmp;
2305	mapstruct *	2328	maptile *
2306	mp;	2329	mp;
2307		2330
2308	MoveType blocked, move_type;	2331	MoveType blocked, move_type;
2309		2332
2310	if (exclude && exclude->head)	2333	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2541	* Modified to be map tile aware -.MSW
2519	*/	2542	*/
2520		2543
2521		2544
2522	int	2545	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2546	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2547	{
2525	sint16 dx, dy;	2548	sint16 dx, dy;
2526	int	2549	int
2527	mflags;	2550	mflags;
2528		2551
…		…
2608	if (prev)	2631	if (prev)
2609	prev->more = tmp;	2632	prev->more = tmp;
2610	prev = tmp;	2633	prev = tmp;
2611	}	2634	}
2612		2635
2613	/* copy inventory */
2614	for (item = src->inv; item; item = item->below)	2636	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2637	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2638
2619	return dst;	2639	return dst;
2620	}	2640	}
2621		2641
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2642	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2643	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2644	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2645	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2646	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2647	/* Also remember that multiparts objects are not supported for now. */
2642		2648
2643	object *	2649	object *
2644	load_object_str (const char *obstr)	2650	load_object_str (const char *obstr)
2645	{	2651	{
2646	object *	2652	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2653	char filename[MAX_BUF];
2650		2654
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2655	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2656
2653	FILE *
2654	tempfile = fopen (filename, "w");	2657	FILE *tempfile = fopen (filename, "w");
2655		2658
2656	if (tempfile == NULL)	2659	if (tempfile == NULL)
2657	{	2660	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2661	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2662	return NULL;
2660	};	2663	}
		2664
2661	fprintf (tempfile, obstr);	2665	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2666	fclose (tempfile);
2663		2667
2664	op = get_object ();	2668	op = get_object ();
2665		2669
…		…
2679	* returns NULL if no match.	2683	* returns NULL if no match.
2680	*/	2684	*/
2681	object *	2685	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2686	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2687	{
2684	object *	2688	object *tmp;
2685	tmp;
2686		2689
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2690	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2691	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2692	return tmp;
2690		2693
…		…
2698	* do the desired thing.	2701	* do the desired thing.
2699	*/	2702	*/
2700	key_value *	2703	key_value *
2701	get_ob_key_link (const object ob, const char key)	2704	get_ob_key_link (const object ob, const char key)
2702	{	2705	{
2703	key_value *	2706	key_value *link;
2704	link;
2705		2707
2706	for (link = ob->key_values; link != NULL; link = link->next)	2708	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2709	if (link->key == key)
2709	{
2710	return link;	2710	return link;
2711	}
2712	}
2713		2711
2714	return NULL;	2712	return NULL;
2715	}	2713	}
2716		2714
2717	/*	2715	/*
…		…
2722	* The returned string is shared.	2720	* The returned string is shared.
2723	*/	2721	*/
2724	const char *	2722	const char *
2725	get_ob_key_value (const object op, const char const key)	2723	get_ob_key_value (const object op, const char const key)
2726	{	2724	{
2727	key_value *	2725	key_value *link;
2728	link;	2726	shstr_cmp canonical_key (key);
2729	const char *
2730	canonical_key;
2731		2727
2732	canonical_key = shstr::find (key);
2733
2734	if (canonical_key == NULL)	2728	if (!canonical_key)
2735	{	2729	{
2736	/* 1. There being a field named key on any object	2730	/* 1. There being a field named key on any object
2737	* implies there'd be a shared string to find.	2731	* implies there'd be a shared string to find.
2738	* 2. Since there isn't, no object has this field.	2732	* 2. Since there isn't, no object has this field.
2739	* 3. Therefore, this object doesn't have this field.	2733	* 3. Therefore, this object doesn't have this field.
2740	*/	2734	*/
2741	return NULL;	2735	return 0;
2742	}	2736	}
2743		2737
2744	/* This is copied from get_ob_key_link() above -	2738	/* This is copied from get_ob_key_link() above -
2745	* only 4 lines, and saves the function call overhead.	2739	* only 4 lines, and saves the function call overhead.
2746	*/	2740	*/
2747	for (link = op->key_values; link != NULL; link = link->next)	2741	for (link = op->key_values; link; link = link->next)
2748	{
2749	if (link->key == canonical_key)	2742	if (link->key == canonical_key)
2750	{
2751	return link->value;	2743	return link->value;
2752	}	2744
2753	}
2754	return NULL;	2745	return 0;
2755	}	2746	}
2756		2747
2757		2748
2758	/*	2749	/*
2759	* Updates the canonical_key in op to value.	2750	* Updates the canonical_key in op to value.
…		…
2845	shstr key_ (key);	2836	shstr key_ (key);
2846		2837
2847	return set_ob_key_value_s (op, key_, value, add_key);	2838	return set_ob_key_value_s (op, key_, value, add_key);
2848	}	2839	}
2849		2840
		2841	object::depth_iterator::depth_iterator (object *container)
		2842	: iterator_base (container)
		2843	{
		2844	while (item->inv)
		2845	item = item->inv;
		2846	}
		2847
2850	void	2848	void
2851	object::deep_iterator::next ()	2849	object::depth_iterator::next ()
2852	{	2850	{
2853	if (item->inv)
2854	item = item->inv;
2855	else if (item->below)	2851	if (item->below)
		2852	{
2856	item = item->below;	2853	item = item->below;
		2854
		2855	while (item->inv)
		2856	item = item->inv;
		2857	}
2857	else	2858	else
2858	item = item->env->below;	2859	item = item->env;
2859	}	2860	}
		2861
		2862	// return a suitable string describing an objetc in enough detail to find it
		2863	const char *
		2864	object::debug_desc (char *info) const
		2865	{
		2866	char info2[256 * 3];
		2867	char *p = info;
		2868
		2869	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2870	count,
		2871	&name,
		2872	title ? " " : "",
		2873	title ? (const char *)title : "");
		2874
		2875	if (env)
		2876	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2877
		2878	if (map)
		2879	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2880
		2881	return info;
		2882	}
		2883
		2884	const char *
		2885	object::debug_desc () const
		2886	{
		2887	static char info[256 * 3];
		2888	return debug_desc (info);
		2889	}
		2890

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC vs. Revision 1.50 by root, Sat Sep 16 22:40:22 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.50 by root, Sat Sep 16 22:40:22 2006 UTC