[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.54 by root, Fri Nov 17 19:40:53 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.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object tmp;/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
432	void	443	void
433	free_all_object_data ()	444	free_all_object_data ()
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	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	}	447	}
458		448
459	/*	449	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	451	* skill and experience objects.
…		…
531		521
532	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
533		523
534	expmul = 1.0;	524	expmul = 1.0;
535	face = blank_face;	525	face = blank_face;
536	attacked_by_count = -1;
537		526
538	if (settings.casting_time)	527	if (settings.casting_time)
539	casting_time = -1;	528	casting_time = -1;
540	}	529	}
541		530
…		…
836		825
837	if (op->more != NULL)	826	if (op->more != NULL)
838	update_object (op->more, action);	827	update_object (op->more, action);
839	}	828	}
840		829
841	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
842	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
843		833
844	void object::free_mortals ()	834	void object::free_mortals ()
845	{	835	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	837	if ((*i)->refcnt)
848	++i; // further delay freeing	838	++i; // further delay freeing
849	else	839	else
850	{	840	{
851	freed.push_back (*i);//D
852	//delete *i;	841	delete *i;
853	mortals.erase (i);	842	mortals.erase (i);
854	}	843	}
855		844
856	if (mortals.size())//D	845	static int lastmortals = 0;//D
		846
		847	if (mortals.size() != lastmortals && lastmortals > 100)//D
		848	{
		849	lastmortals = mortals.size ();//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		851	}
858	}	852	}
859		853
860	object::object ()	854	object::object ()
861	{	855	{
862	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
863		857
864	expmul = 1.0;	858	expmul = 1.0;
865	face = blank_face;	859	face = blank_face;
866	attacked_by_count = -1;
867	}	860	}
868		861
869	object::~object ()	862	object::~object ()
870	{	863	{
871	free_key_values (this);	864	free_key_values (this);
872	}	865	}
873		866
874	void object::link ()	867	void object::link ()
875	{	868	{
876	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
877		871
878	prev = 0;	872	prev = 0;
879	next = objects;	873	next = object::first;
880		874
881	if (objects)	875	if (object::first)
882	objects->prev = this;	876	object::first->prev = this;
883		877
884	objects = this;	878	object::first = this;
885	}	879	}
886		880
887	void object::unlink ()	881	void object::unlink ()
888	{	882	{
889	count = 0;	883	if (this == object::first)
		884	object::first = next;
890		885
891	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
895	prev = 0;	890	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	891	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	892	}
907		893
908	object *object::create ()	894	object *object::create ()
909	{	895	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	896	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 ();	897	op->link ();
924	return op;	898	return op;
925	}	899	}
926		900
927	/*	901	/*
…		…
929	* it from the list of used objects, and puts it on the list of	903	* it from the list of used objects, and puts it on the list of
930	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
931	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
932	* this function to succeed.	906	* this function to succeed.
933	*	907	*
934	* If free_inventory is set, free inventory as well. Else drop items in	908	* If destroy_inventory is set, free inventory as well. Else drop items in
935	* inventory to the ground.	909	* inventory to the ground.
936	*/	910	*/
937	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
938	{	912	{
939	if (QUERY_FLAG (this, FLAG_FREED))	913	if (QUERY_FLAG (this, FLAG_FREED))
940	return;	914	return;
941		915
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
…		…
947		921
948	SET_FLAG (this, FLAG_FREED);	922	SET_FLAG (this, FLAG_FREED);
949		923
950	if (more)	924	if (more)
951	{	925	{
952	more->free (free_inventory);	926	more->destroy (destroy_inventory);
953	more = 0;	927	more = 0;
954	}	928	}
955		929
956	if (inv)	930	if (inv)
957	{	931	{
958	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
959	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
960	* drop on that space.	934	* drop on that space.
961	*/	935	*/
962	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	936	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
963	{	937	{
964	object *op = inv;	938	object *op = inv;
965		939
966	while (op)	940	while (op)
967	{	941	{
968	object *tmp = op->below;	942	object *tmp = op->below;
969	op->free (free_inventory);	943	op->destroy (destroy_inventory);
970	op = tmp;	944	op = tmp;
971	}	945	}
972	}	946	}
973	else	947	else
974	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
…		…
993	op = tmp;	967	op = tmp;
994	}	968	}
995	}	969	}
996	}	970	}
997		971
		972	// clear those pointers that likely might have circular references to us
998	owner = 0;	973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
999		979
1000	/* Remove object from the active list */	980	/* Remove object from the active list */
1001	speed = 0;	981	speed = 0;
1002	update_ob_speed (this);	982	update_ob_speed (this);
1003		983
…		…
1015	sub_weight (object *op, signed long weight)	995	sub_weight (object *op, signed long weight)
1016	{	996	{
1017	while (op != NULL)	997	while (op != NULL)
1018	{	998	{
1019	if (op->type == CONTAINER)	999	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1000	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	1001
1023	op->carrying -= weight;	1002	op->carrying -= weight;
1024	op = op->env;	1003	op = op->env;
1025	}	1004	}
1026	}	1005	}
1027		1006
…		…
1035	*/	1014	*/
1036		1015
1037	void	1016	void
1038	remove_ob (object *op)	1017	remove_ob (object *op)
1039	{	1018	{
		1019	object tmp, last = 0;
1040	object *	1020	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		1021
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	1022	int check_walk_off;
1050	mapstruct *	1023	maptile *m;
1051	m;
1052		1024
1053	sint16	1025	sint16 x, y;
1054	x,
1055	y;
1056		1026
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	1027	if (QUERY_FLAG (op, FLAG_REMOVED))
1058	return;	1028	return;
1059		1029
1060	SET_FLAG (op, FLAG_REMOVED);	1030	SET_FLAG (op, FLAG_REMOVED);
…		…
1137	* use translated coordinates in case some oddness with map tiling is	1107	* use translated coordinates in case some oddness with map tiling is
1138	* evident	1108	* evident
1139	*/	1109	*/
1140	if (GET_MAP_OB (m, x, y) != op)	1110	if (GET_MAP_OB (m, x, y) != op)
1141	{	1111	{
1142	dump_object (op);	1112	char *dump = dump_object (op);
1143	LOG (llevError,	1113	LOG (llevError,
1144	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1114	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1115	free (dump);
1145	dump_object (GET_MAP_OB (m, x, y));	1116	dump = dump_object (GET_MAP_OB (m, x, y));
1146	LOG (llevError, "%s\n", errmsg);	1117	LOG (llevError, "%s\n", dump);
		1118	free (dump);
1147	}	1119	}
1148		1120
1149	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1121	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1150	}	1122	}
1151		1123
…		…
1153	op->below = 0;	1125	op->below = 0;
1154		1126
1155	if (op->map->in_memory == MAP_SAVING)	1127	if (op->map->in_memory == MAP_SAVING)
1156	return;	1128	return;
1157		1129
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1130	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1160		1131
1161	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1132	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1162	{	1133	{
1163	/* No point updating the players look faces if he is the object	1134	/* No point updating the players look faces if he is the object
…		…
1178		1149
1179	tmp->contr->socket.update_look = 1;	1150	tmp->contr->socket.update_look = 1;
1180	}	1151	}
1181		1152
1182	/* See if player moving off should effect something */	1153	/* 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))	1154	if (check_walk_off
		1155	&& ((op->move_type & tmp->move_off)
		1156	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184	{	1157	{
1185	move_apply (tmp, op, NULL);	1158	move_apply (tmp, op, NULL);
1186		1159
1187	if (was_destroyed (op, tag))	1160	if (op->destroyed ())
1188	{
1189	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1190	}
1191	}	1162	}
1192		1163
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1164	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1165
1195	if (tmp->above == tmp)	1166	if (tmp->above == tmp)
…		…
1223	* This function goes through all objects below and including top, and	1194	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1195	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1196	* If top is NULL, it is calculated.
1226	* Returns pointer to object if it succeded in the merge, otherwise NULL	1197	* Returns pointer to object if it succeded in the merge, otherwise NULL
1227	*/	1198	*/
1228
1229	object *	1199	object *
1230	merge_ob (object op, object top)	1200	merge_ob (object op, object top)
1231	{	1201	{
1232	if (!op->nrof)	1202	if (!op->nrof)
1233	return 0;	1203	return 0;
…		…
1249	free_object (op);	1219	free_object (op);
1250	return top;	1220	return top;
1251	}	1221	}
1252	}	1222	}
1253		1223
1254	return NULL;	1224	return 0;
1255	}	1225	}
1256		1226
1257	/*	1227	/*
1258	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1228	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1259	* job preparing multi-part monsters	1229	* job preparing multi-part monsters
1260	*/	1230	*/
1261	object *	1231	object *
1262	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1263	{	1233	{
1264	object *tmp;	1234	object *tmp;
1265		1235
1266	if (op->head)	1236	if (op->head)
1267	op = op->head;	1237	op = op->head;
…		…
1295	* NULL if 'op' was destroyed	1265	* NULL if 'op' was destroyed
1296	* just 'op' otherwise	1266	* just 'op' otherwise
1297	*/	1267	*/
1298		1268
1299	object *	1269	object *
1300	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1301	{	1271	{
1302	object tmp, top, *floor = NULL;	1272	object tmp, top, *floor = NULL;
1303	sint16 x, y;	1273	sint16 x, y;
1304		1274
1305	if (QUERY_FLAG (op, FLAG_FREED))	1275	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1308	return NULL;	1278	return NULL;
1309	}	1279	}
1310		1280
1311	if (m == NULL)	1281	if (m == NULL)
1312	{	1282	{
1313	dump_object (op);	1283	char *dump = dump_object (op);
1314	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1285	free (dump);
1315	return op;	1286	return op;
1316	}	1287	}
1317		1288
1318	if (out_of_map (m, op->x, op->y))	1289	if (out_of_map (m, op->x, op->y))
1319	{	1290	{
1320	dump_object (op);	1291	char *dump = dump_object (op);
1321	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1292	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1322	#ifdef MANY_CORES	1293	#ifdef MANY_CORES
1323	/* Better to catch this here, as otherwise the next use of this object	1294	/* Better to catch this here, as otherwise the next use of this object
1324	* is likely to cause a crash. Better to find out where it is getting	1295	* is likely to cause a crash. Better to find out where it is getting
1325	* improperly inserted.	1296	* improperly inserted.
1326	*/	1297	*/
1327	abort ();	1298	abort ();
1328	#endif	1299	#endif
		1300	free (dump);
1329	return op;	1301	return op;
1330	}	1302	}
1331		1303
1332	if (!QUERY_FLAG (op, FLAG_REMOVED))	1304	if (!QUERY_FLAG (op, FLAG_REMOVED))
1333	{	1305	{
1334	dump_object (op);	1306	char *dump = dump_object (op);
1335	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1307	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1308	free (dump);
1336	return op;	1309	return op;
1337	}	1310	}
1338		1311
1339	if (op->more != NULL)	1312	if (op->more != NULL)
1340	{	1313	{
…		…
1586	remove_ob (tmp);	1559	remove_ob (tmp);
1587	free_object (tmp);	1560	free_object (tmp);
1588	}	1561	}
1589	}	1562	}
1590		1563
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1564	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1565
1593	tmp1->x = op->x;	1566	tmp1->x = op->x;
1594	tmp1->y = op->y;	1567	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1568	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1569	}
…		…
1777	tmp, *	1750	tmp, *
1778	otmp;	1751	otmp;
1779		1752
1780	if (!QUERY_FLAG (op, FLAG_REMOVED))	1753	if (!QUERY_FLAG (op, FLAG_REMOVED))
1781	{	1754	{
1782	dump_object (op);	1755	char *dump = dump_object (op);
1783	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1756	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1757	free (dump);
1784	return op;	1758	return op;
1785	}	1759	}
1786		1760
1787	if (where == NULL)	1761	if (where == NULL)
1788	{	1762	{
1789	dump_object (op);	1763	char *dump = dump_object (op);
1790	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1764	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1765	free (dump);
1791	return op;	1766	return op;
1792	}	1767	}
1793		1768
1794	if (where->head)	1769	if (where->head)
1795	{	1770	{
…		…
1895	*/	1870	*/
1896		1871
1897	int	1872	int
1898	check_move_on (object op, object originator)	1873	check_move_on (object op, object originator)
1899	{	1874	{
1900	object *	1875	object *tmp;
1901	tmp;	1876	maptile *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1877	int x = op->x, y = op->y;
1908		1878
1909	MoveType	1879	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1880
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1881	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1882	return 0;
1916
1917	tag = op->count;
1918		1883
1919	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1884	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);	1885	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);	1886	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922		1887
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1948	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))	1949	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985	{	1950	{
1986	move_apply (tmp, op, originator);	1951	move_apply (tmp, op, originator);
1987		1952
1988	if (was_destroyed (op, tag))	1953	if (op->destroyed ())
1989	return 1;	1954	return 1;
1990		1955
1991	/* what the person/creature stepped onto has moved the object	1956	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	1957	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	1958	* have a feeling strange problems would result.
…		…
2005	* a matching archetype at the given map and coordinates.	1970	* a matching archetype at the given map and coordinates.
2006	* The first matching object is returned, or NULL if none.	1971	* The first matching object is returned, or NULL if none.
2007	*/	1972	*/
2008		1973
2009	object *	1974	object *
2010	present_arch (const archetype at, mapstruct m, int x, int y)	1975	present_arch (const archetype at, maptile m, int x, int y)
2011	{	1976	{
2012	object *	1977	object *
2013	tmp;	1978	tmp;
2014		1979
2015	if (m == NULL \|\| out_of_map (m, x, y))	1980	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2028	* a matching type variable at the given map and coordinates.	1993	* a matching type variable at the given map and coordinates.
2029	* The first matching object is returned, or NULL if none.	1994	* The first matching object is returned, or NULL if none.
2030	*/	1995	*/
2031		1996
2032	object *	1997	object *
2033	present (unsigned char type, mapstruct *m, int x, int y)	1998	present (unsigned char type, maptile *m, int x, int y)
2034	{	1999	{
2035	object *	2000	object *
2036	tmp;	2001	tmp;
2037		2002
2038	if (out_of_map (m, x, y))	2003	if (out_of_map (m, x, y))
…		…
2178	* the archetype because that isn't correct if the monster has been	2143	* the archetype because that isn't correct if the monster has been
2179	* customized, changed states, etc.	2144	* customized, changed states, etc.
2180	*/	2145	*/
2181		2146
2182	int	2147	int
2183	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2148	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2184	{	2149	{
2185	int	2150	int
2186	i,	2151	i,
2187	index = 0, flag;	2152	index = 0, flag;
2188	static int	2153	static int
…		…
2209	return -1;	2174	return -1;
2210	return altern[RANDOM () % index];	2175	return altern[RANDOM () % index];
2211	}	2176	}
2212		2177
2213	/*	2178	/*
2214	* find_first_free_spot(archetype, mapstruct, x, y) works like	2179	* find_first_free_spot(archetype, maptile, x, y) works like
2215	* find_free_spot(), but it will search max number of squares.	2180	* find_free_spot(), but it will search max number of squares.
2216	* But it will return the first available spot, not a random choice.	2181	* But it will return the first available spot, not a random choice.
2217	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2182	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2218	*/	2183	*/
2219		2184
2220	int	2185	int
2221	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2186	find_first_free_spot (const object ob, maptile m, int x, int y)
2222	{	2187	{
2223	int	2188	int
2224	i;	2189	i;
2225		2190
2226	for (i = 0; i < SIZEOFFREE; i++)	2191	for (i = 0; i < SIZEOFFREE; i++)
…		…
2290	* because we have to know what movement the thing looking to move	2255	* because we have to know what movement the thing looking to move
2291	* there is capable of.	2256	* there is capable of.
2292	*/	2257	*/
2293		2258
2294	int	2259	int
2295	find_dir (mapstruct m, int x, int y, object exclude)	2260	find_dir (maptile m, int x, int y, object exclude)
2296	{	2261	{
2297	int	2262	int
2298	i,	2263	i,
2299	max = SIZEOFFREE, mflags;	2264	max = SIZEOFFREE, mflags;
2300		2265
2301	sint16 nx, ny;	2266	sint16 nx, ny;
2302	object *	2267	object *
2303	tmp;	2268	tmp;
2304	mapstruct *	2269	maptile *
2305	mp;	2270	mp;
2306		2271
2307	MoveType blocked, move_type;	2272	MoveType blocked, move_type;
2308		2273
2309	if (exclude && exclude->head)	2274	if (exclude && exclude->head)
…		…
2517	* Modified to be map tile aware -.MSW	2482	* Modified to be map tile aware -.MSW
2518	*/	2483	*/
2519		2484
2520		2485
2521	int	2486	int
2522	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2487	can_see_monsterP (maptile *m, int x, int y, int dir)
2523	{	2488	{
2524	sint16 dx, dy;	2489	sint16 dx, dy;
2525	int	2490	int
2526	mflags;	2491	mflags;
2527		2492
…		…
2607	if (prev)	2572	if (prev)
2608	prev->more = tmp;	2573	prev->more = tmp;
2609	prev = tmp;	2574	prev = tmp;
2610	}	2575	}
2611		2576
2612	/* copy inventory */
2613	for (item = src->inv; item; item = item->below)	2577	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2578	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2579
2618	return dst;	2580	return dst;
2619	}	2581	}
2620		2582
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. */	2583	/* 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 */	2584	/* 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, */	2585	/* 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. */	2586	/* 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. */	2587	/* Remember not to use load_object_str in a time-critical situation. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2588	/* Also remember that multiparts objects are not supported for now. */
2641		2589
2642	object *	2590	object *
2643	load_object_str (const char *obstr)	2591	load_object_str (const char *obstr)
2644	{	2592	{
2645	object *	2593	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2594	char filename[MAX_BUF];
2649		2595
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2596	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2597
2652	FILE *
2653	tempfile = fopen (filename, "w");	2598	FILE *tempfile = fopen (filename, "w");
2654		2599
2655	if (tempfile == NULL)	2600	if (tempfile == NULL)
2656	{	2601	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2602	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2603	return NULL;
2659	};	2604	}
		2605
2660	fprintf (tempfile, obstr);	2606	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2607	fclose (tempfile);
2662		2608
2663	op = get_object ();	2609	op = get_object ();
2664		2610
…		…
2678	* returns NULL if no match.	2624	* returns NULL if no match.
2679	*/	2625	*/
2680	object *	2626	object *
2681	find_obj_by_type_subtype (const object *who, int type, int subtype)	2627	find_obj_by_type_subtype (const object *who, int type, int subtype)
2682	{	2628	{
2683	object *	2629	object *tmp;
2684	tmp;
2685		2630
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2631	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2632	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2633	return tmp;
2689		2634
…		…
2697	* do the desired thing.	2642	* do the desired thing.
2698	*/	2643	*/
2699	key_value *	2644	key_value *
2700	get_ob_key_link (const object ob, const char key)	2645	get_ob_key_link (const object ob, const char key)
2701	{	2646	{
2702	key_value *	2647	key_value *link;
2703	link;
2704		2648
2705	for (link = ob->key_values; link != NULL; link = link->next)	2649	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2650	if (link->key == key)
2708	{
2709	return link;	2651	return link;
2710	}
2711	}
2712		2652
2713	return NULL;	2653	return NULL;
2714	}	2654	}
2715		2655
2716	/*	2656	/*
…		…
2721	* The returned string is shared.	2661	* The returned string is shared.
2722	*/	2662	*/
2723	const char *	2663	const char *
2724	get_ob_key_value (const object op, const char const key)	2664	get_ob_key_value (const object op, const char const key)
2725	{	2665	{
2726	key_value *	2666	key_value *link;
2727	link;	2667	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2668
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2669	if (!canonical_key)
2734	{	2670	{
2735	/* 1. There being a field named key on any object	2671	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2672	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2673	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, this object doesn't have this field.	2674	* 3. Therefore, this object doesn't have this field.
2739	*/	2675	*/
2740	return NULL;	2676	return 0;
2741	}	2677	}
2742		2678
2743	/* This is copied from get_ob_key_link() above -	2679	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2680	* only 4 lines, and saves the function call overhead.
2745	*/	2681	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2682	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2683	if (link->key == canonical_key)
2749	{
2750	return link->value;	2684	return link->value;
2751	}	2685
2752	}
2753	return NULL;	2686	return 0;
2754	}	2687	}
2755		2688
2756		2689
2757	/*	2690	/*
2758	* Updates the canonical_key in op to value.	2691	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2777	shstr key_ (key);
2845		2778
2846	return set_ob_key_value_s (op, key_, value, add_key);	2779	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2780	}
2848		2781
		2782	object::depth_iterator::depth_iterator (object *container)
		2783	: iterator_base (container)
		2784	{
		2785	while (item->inv)
		2786	item = item->inv;
		2787	}
		2788
2849	void	2789	void
2850	object::deep_iterator::next ()	2790	object::depth_iterator::next ()
2851	{	2791	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2792	if (item->below)
		2793	{
2855	item = item->below;	2794	item = item->below;
		2795
		2796	while (item->inv)
		2797	item = item->inv;
		2798	}
2856	else	2799	else
2857	item = item->env->below;	2800	item = item->env;
2858	}	2801	}
		2802
		2803	// return a suitable string describing an objetc in enough detail to find it
		2804	const char *
		2805	object::debug_desc (char *info) const
		2806	{
		2807	char info2[256 * 3];
		2808	char *p = info;
		2809
		2810	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2811	count,
		2812	&name,
		2813	title ? " " : "",
		2814	title ? (const char *)title : "");
		2815
		2816	if (env)
		2817	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2818
		2819	if (map)
		2820	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2821
		2822	return info;
		2823	}
		2824
		2825	const char *
		2826	object::debug_desc () const
		2827	{
		2828	static char info[256 * 3];
		2829	return debug_desc (info);
		2830	}
		2831

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.54 by root, Fri Nov 17 19:40:53 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.54 by root, Fri Nov 17 19:40:53 2006 UTC