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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 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. */
…		…
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object objects; / Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
53	};	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	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object wants, const object has)	134	compare_ob_value_lists_one (const object wants, const object has)
58	{	135	{
…		…
368	void	445	void
369	dump_all_objects (void)	446	dump_all_objects (void)
370	{	447	{
371	object *op;	448	object *op;
372		449
373	for (op = objects; op != NULL; op = op->next)	450	for (op = object::first; op != NULL; op = op->next)
374	{	451	{
375	dump_object (op);	452	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
377	}	454	}
378	}	455	}
379		456
380	/*	457	/*
381	* 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
…		…
404	object *	481	object *
405	find_object (tag_t i)	482	find_object (tag_t i)
406	{	483	{
407	object *op;	484	object *op;
408		485
409	for (op = objects; op != NULL; op = op->next)	486	for (op = object::first; op != NULL; op = op->next)
410	if (op->count == i)	487	if (op->count == i)
411	break;	488	break;
		489
412	return op;	490	return op;
413	}	491	}
414		492
415	/*	493	/*
416	* 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.
…		…
422	find_object_name (const char *str)	500	find_object_name (const char *str)
423	{	501	{
424	shstr_cmp str_ (str);	502	shstr_cmp str_ (str);
425	object *op;	503	object *op;
426		504
427	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	506	if (op->name == str_)
429	break;	507	break;
430		508
431	return op;	509	return op;
432	}	510	}
433		511
434	void	512	void
435	free_all_object_data ()	513	free_all_object_data ()
436	{	514	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	\|\| QUERY_FLAG (owner, FLAG_FREED)
455	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	516	}
460		517
461	/*	518	/*
462	* 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
463	* skill and experience objects.	520	* skill and experience objects.
…		…
533		590
534	/* What is not cleared is next, prev, and count */	591	/* What is not cleared is next, prev, and count */
535		592
536	expmul = 1.0;	593	expmul = 1.0;
537	face = blank_face;	594	face = blank_face;
538	attacked_by_count = -1;
539		595
540	if (settings.casting_time)	596	if (settings.casting_time)
541	casting_time = -1;	597	casting_time = -1;
542	}	598	}
543		599
…		…
838		894
839	if (op->more != NULL)	895	if (op->more != NULL)
840	update_object (op->more, action);	896	update_object (op->more, action);
841	}	897	}
842		898
843	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
844	static std::vector<object , slice_allocator <object > > freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
845		902
846	void object::free_mortals ()	903	void object::free_mortals ()
847	{	904	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	906	if ((*i)->refcnt)
850	++i; // further delay freeing	907	++i; // further delay freeing
851	else	908	else
852	{	909	{
853	freed.push_back (*i);//D
854	//delete *i;	910	delete *i;
855	mortals.erase (i);	911	mortals.erase (i);
856	}	912	}
857		913
858	if (mortals.size() && 0)//D	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals)//D
		917	{
		918	lastmortals = mortals.size ();//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
860	}	921	}
861		922
862	object::object ()	923	object::object ()
863	{	924	{
864	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
865		926
866	expmul = 1.0;	927	expmul = 1.0;
867	face = blank_face;	928	face = blank_face;
868	attacked_by_count = -1;
869	}	929	}
870		930
871	object::~object ()	931	object::~object ()
872	{	932	{
873	free_key_values (this);	933	free_key_values (this);
874	}	934	}
875		935
876	void object::link ()	936	void object::link ()
877	{	937	{
878	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
879		940
880	prev = 0;	941	prev = 0;
881	next = objects;	942	next = object::first;
882		943
883	if (objects)	944	if (object::first)
884	objects->prev = this;	945	object::first->prev = this;
885		946
886	objects = this;	947	object::first = this;
887	}	948	}
888		949
889	void object::unlink ()	950	void object::unlink ()
890	{	951	{
891	count = 0;	952	if (this == object::first)
		953	object::first = next;
892		954
893	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
894	if (prev)
895	{
896	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
897	prev = 0;	959	prev = 0;
898	}
899
900	if (next)
901	{
902	next->prev = prev;
903	next = 0;	960	next = 0;
904	}
905
906	if (this == objects)
907	objects = next;
908	}	961	}
909		962
910	object *object::create ()	963	object *object::create ()
911	{	964	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	965	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	966	op->link ();
926	return op;	967	return op;
927	}	968	}
928		969
929	/*	970	/*
…		…
995	op = tmp;	1036	op = tmp;
996	}	1037	}
997	}	1038	}
998	}	1039	}
999		1040
		1041	// clear those pointers that likely might have circular references to us
1000	owner = 0;	1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
1001		1045
1002	/* Remove object from the active list */	1046	/* Remove object from the active list */
1003	speed = 0;	1047	speed = 0;
1004	update_ob_speed (this);	1048	update_ob_speed (this);
1005		1049
…		…
1017	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1018	{	1062	{
1019	while (op != NULL)	1063	while (op != NULL)
1020	{	1064	{
1021	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	1067
1025	op->carrying -= weight;	1068	op->carrying -= weight;
1026	op = op->env;	1069	op = op->env;
1027	}	1070	}
1028	}	1071	}
1029		1072
…		…
1037	*/	1080	*/
1038		1081
1039	void	1082	void
1040	remove_ob (object *op)	1083	remove_ob (object *op)
1041	{	1084	{
		1085	object tmp, last = 0;
1042	object *	1086	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		1087
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	1088	int check_walk_off;
1052	mapstruct *	1089	maptile *m;
1053	m;
1054		1090
1055	sint16	1091	sint16 x, y;
1056	x,
1057	y;
1058		1092
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1060	return;	1094	return;
1061		1095
1062	SET_FLAG (op, FLAG_REMOVED);	1096	SET_FLAG (op, FLAG_REMOVED);
…		…
1155	op->below = 0;	1189	op->below = 0;
1156		1190
1157	if (op->map->in_memory == MAP_SAVING)	1191	if (op->map->in_memory == MAP_SAVING)
1158	return;	1192	return;
1159		1193
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162		1195
1163	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)
1164	{	1197	{
1165	/* 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
…		…
1184	/* See if player moving off should effect something */	1217	/* See if player moving off should effect something */
1185	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))
1186	{	1219	{
1187	move_apply (tmp, op, NULL);	1220	move_apply (tmp, op, NULL);
1188		1221
1189	if (was_destroyed (op, tag))	1222	if (op->destroyed ());
1190	{
1191	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);
1192	}
1193	}	1224	}
1194		1225
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1226	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1227
1197	if (tmp->above == tmp)	1228	if (tmp->above == tmp)
…		…
1250	free_object (op);	1281	free_object (op);
1251	return top;	1282	return top;
1252	}	1283	}
1253	}	1284	}
1254		1285
1255	return NULL;	1286	return 0;
1256	}	1287	}
1257		1288
1258	/*	1289	/*
1259	* 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
1260	* job preparing multi-part monsters	1291	* job preparing multi-part monsters
1261	*/	1292	*/
1262	object *	1293	object *
1263	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1294	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1264	{	1295	{
1265	object *tmp;	1296	object *tmp;
1266		1297
1267	if (op->head)	1298	if (op->head)
1268	op = op->head;	1299	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1327	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1328	* just 'op' otherwise
1298	*/	1329	*/
1299		1330
1300	object *	1331	object *
1301	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1332	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1302	{	1333	{
1303	object tmp, top, *floor = NULL;	1334	object tmp, top, *floor = NULL;
1304	sint16 x, y;	1335	sint16 x, y;
1305		1336
1306	if (QUERY_FLAG (op, FLAG_FREED))	1337	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1587	remove_ob (tmp);	1618	remove_ob (tmp);
1588	free_object (tmp);	1619	free_object (tmp);
1589	}	1620	}
1590	}	1621	}
1591		1622
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1623	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1624
1594	tmp1->x = op->x;	1625	tmp1->x = op->x;
1595	tmp1->y = op->y;	1626	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1627	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1628	}
…		…
1896	*/	1927	*/
1897		1928
1898	int	1929	int
1899	check_move_on (object op, object originator)	1930	check_move_on (object op, object originator)
1900	{	1931	{
1901	object *	1932	object *tmp;
1902	tmp;	1933	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1934	int x = op->x, y = op->y;
1909		1935
1910	MoveType	1936	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1937
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1938	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1939	return 0;
1917
1918	tag = op->count;
1919		1940
1920	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);
1921	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);
1922	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);
1923		1944
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2005	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))	2006	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	2007	{
1987	move_apply (tmp, op, originator);	2008	move_apply (tmp, op, originator);
1988		2009
1989	if (was_destroyed (op, tag))	2010	if (op->destroyed ())
1990	return 1;	2011	return 1;
1991		2012
1992	/* what the person/creature stepped onto has moved the object	2013	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	2014	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	2015	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	2027	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	2028	* The first matching object is returned, or NULL if none.
2008	*/	2029	*/
2009		2030
2010	object *	2031	object *
2011	present_arch (const archetype at, mapstruct m, int x, int y)	2032	present_arch (const archetype at, maptile m, int x, int y)
2012	{	2033	{
2013	object *	2034	object *
2014	tmp;	2035	tmp;
2015		2036
2016	if (m == NULL \|\| out_of_map (m, x, y))	2037	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	2050	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	2051	* The first matching object is returned, or NULL if none.
2031	*/	2052	*/
2032		2053
2033	object *	2054	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	2055	present (unsigned char type, maptile *m, int x, int y)
2035	{	2056	{
2036	object *	2057	object *
2037	tmp;	2058	tmp;
2038		2059
2039	if (out_of_map (m, x, y))	2060	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2200	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2201	* customized, changed states, etc.
2181	*/	2202	*/
2182		2203
2183	int	2204	int
2184	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2205	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2185	{	2206	{
2186	int	2207	int
2187	i,	2208	i,
2188	index = 0, flag;	2209	index = 0, flag;
2189	static int	2210	static int
…		…
2210	return -1;	2231	return -1;
2211	return altern[RANDOM () % index];	2232	return altern[RANDOM () % index];
2212	}	2233	}
2213		2234
2214	/*	2235	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2236	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2237	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2238	* 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.	2239	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2240	*/
2220		2241
2221	int	2242	int
2222	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2243	find_first_free_spot (const object ob, maptile m, int x, int y)
2223	{	2244	{
2224	int	2245	int
2225	i;	2246	i;
2226		2247
2227	for (i = 0; i < SIZEOFFREE; i++)	2248	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2312	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2313	* there is capable of.
2293	*/	2314	*/
2294		2315
2295	int	2316	int
2296	find_dir (mapstruct m, int x, int y, object exclude)	2317	find_dir (maptile m, int x, int y, object exclude)
2297	{	2318	{
2298	int	2319	int
2299	i,	2320	i,
2300	max = SIZEOFFREE, mflags;	2321	max = SIZEOFFREE, mflags;
2301		2322
2302	sint16 nx, ny;	2323	sint16 nx, ny;
2303	object *	2324	object *
2304	tmp;	2325	tmp;
2305	mapstruct *	2326	maptile *
2306	mp;	2327	mp;
2307		2328
2308	MoveType blocked, move_type;	2329	MoveType blocked, move_type;
2309		2330
2310	if (exclude && exclude->head)	2331	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2539	* Modified to be map tile aware -.MSW
2519	*/	2540	*/
2520		2541
2521		2542
2522	int	2543	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2544	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2545	{
2525	sint16 dx, dy;	2546	sint16 dx, dy;
2526	int	2547	int
2527	mflags;	2548	mflags;
2528		2549
…		…
2608	if (prev)	2629	if (prev)
2609	prev->more = tmp;	2630	prev->more = tmp;
2610	prev = tmp;	2631	prev = tmp;
2611	}	2632	}
2612		2633
2613	/* copy inventory */
2614	for (item = src->inv; item; item = item->below)	2634	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2635	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2636
2619	return dst;	2637	return dst;
2620	}	2638	}
2621		2639
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. */	2640	/* 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 */	2641	/* 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, */	2642	/* 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. */	2643	/* 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. */	2644	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2645	/* Also remember that multiparts objects are not supported for now. */
2642		2646
2643	object *	2647	object *
2644	load_object_str (const char *obstr)	2648	load_object_str (const char *obstr)
2645	{	2649	{
2646	object *	2650	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2651	char filename[MAX_BUF];
2650		2652
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2653	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2654
2653	FILE *
2654	tempfile = fopen (filename, "w");	2655	FILE *tempfile = fopen (filename, "w");
2655		2656
2656	if (tempfile == NULL)	2657	if (tempfile == NULL)
2657	{	2658	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2659	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2660	return NULL;
2660	};	2661	}
		2662
2661	fprintf (tempfile, obstr);	2663	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2664	fclose (tempfile);
2663		2665
2664	op = get_object ();	2666	op = get_object ();
2665		2667
…		…
2679	* returns NULL if no match.	2681	* returns NULL if no match.
2680	*/	2682	*/
2681	object *	2683	object *
2682	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)
2683	{	2685	{
2684	object *	2686	object *tmp;
2685	tmp;
2686		2687
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2688	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2689	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2690	return tmp;
2690		2691
…		…
2698	* do the desired thing.	2699	* do the desired thing.
2699	*/	2700	*/
2700	key_value *	2701	key_value *
2701	get_ob_key_link (const object ob, const char key)	2702	get_ob_key_link (const object ob, const char key)
2702	{	2703	{
2703	key_value *	2704	key_value *link;
2704	link;
2705		2705
2706	for (link = ob->key_values; link != NULL; link = link->next)	2706	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2707	if (link->key == key)
2709	{
2710	return link;	2708	return link;
2711	}
2712	}
2713		2709
2714	return NULL;	2710	return NULL;
2715	}	2711	}
2716		2712
2717	/*	2713	/*

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs. Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC