[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.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 *
911	op;
912
913	if (freed.empty ())
914	op = new object;	896	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 ();	897	op->link ();
925	return op;	898	return op;
926	}	899	}
927		900
928	/*	901	/*
…		…
930	* 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
931	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
932	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
933	* this function to succeed.	906	* this function to succeed.
934	*	907	*
935	* 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
936	* inventory to the ground.	909	* inventory to the ground.
937	*/	910	*/
938	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
939	{	912	{
940	if (QUERY_FLAG (this, FLAG_FREED))	913	if (QUERY_FLAG (this, FLAG_FREED))
941	return;	914	return;
942		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
943	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
944	remove_ob (this);	920	remove_ob (this);
945		921
946	if (QUERY_FLAG (this, FLAG_FRIENDLY))
947	remove_friendly_object (this);
948
949	SET_FLAG (this, FLAG_FREED);	922	SET_FLAG (this, FLAG_FREED);
950		923
951	if (more)	924	if (more)
952	{	925	{
953	more->free (free_inventory);	926	more->destroy (destroy_inventory);
954	more = 0;	927	more = 0;
955	}	928	}
956		929
957	if (inv)	930	if (inv)
958	{	931	{
959	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
960	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
961	* drop on that space.	934	* drop on that space.
962	*/	935	*/
963	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)
964	{	937	{
965	object *op = inv;	938	object *op = inv;
966		939
967	while (op)	940	while (op)
968	{	941	{
969	object *tmp = op->below;	942	object *tmp = op->below;
970	op->free (free_inventory);	943	op->destroy (destroy_inventory);
971	op = tmp;	944	op = tmp;
972	}	945	}
973	}	946	}
974	else	947	else
975	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
…		…
994	op = tmp;	967	op = tmp;
995	}	968	}
996	}	969	}
997	}	970	}
998		971
		972	// clear those pointers that likely might have circular references to us
999	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;
1000		979
1001	/* Remove object from the active list */	980	/* Remove object from the active list */
1002	speed = 0;	981	speed = 0;
1003	update_ob_speed (this);	982	update_ob_speed (this);
1004		983
…		…
1016	sub_weight (object *op, signed long weight)	995	sub_weight (object *op, signed long weight)
1017	{	996	{
1018	while (op != NULL)	997	while (op != NULL)
1019	{	998	{
1020	if (op->type == CONTAINER)	999	if (op->type == CONTAINER)
1021	{
1022	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1000	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023	}	1001
1024	op->carrying -= weight;	1002	op->carrying -= weight;
1025	op = op->env;	1003	op = op->env;
1026	}	1004	}
1027	}	1005	}
1028		1006
…		…
1036	*/	1014	*/
1037		1015
1038	void	1016	void
1039	remove_ob (object *op)	1017	remove_ob (object *op)
1040	{	1018	{
		1019	object tmp, last = 0;
1041	object *	1020	object *otmp;
1042	tmp, *
1043	last = NULL;
1044	object *
1045	otmp;
1046		1021
1047	tag_t
1048	tag;
1049	int
1050	check_walk_off;	1022	int check_walk_off;
1051	mapstruct *	1023	maptile *m;
1052	m;
1053		1024
1054	sint16	1025	sint16 x, y;
1055	x,
1056	y;
1057		1026
1058	if (QUERY_FLAG (op, FLAG_REMOVED))	1027	if (QUERY_FLAG (op, FLAG_REMOVED))
1059	return;	1028	return;
1060		1029
1061	SET_FLAG (op, FLAG_REMOVED);	1030	SET_FLAG (op, FLAG_REMOVED);
…		…
1138	* use translated coordinates in case some oddness with map tiling is	1107	* use translated coordinates in case some oddness with map tiling is
1139	* evident	1108	* evident
1140	*/	1109	*/
1141	if (GET_MAP_OB (m, x, y) != op)	1110	if (GET_MAP_OB (m, x, y) != op)
1142	{	1111	{
1143	dump_object (op);	1112	char *dump = dump_object (op);
1144	LOG (llevError,	1113	LOG (llevError,
1145	"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);
1146	dump_object (GET_MAP_OB (m, x, y));	1116	dump = dump_object (GET_MAP_OB (m, x, y));
1147	LOG (llevError, "%s\n", errmsg);	1117	LOG (llevError, "%s\n", dump);
		1118	free (dump);
1148	}	1119	}
1149		1120
1150	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. */
1151	}	1122	}
1152		1123
…		…
1154	op->below = 0;	1125	op->below = 0;
1155		1126
1156	if (op->map->in_memory == MAP_SAVING)	1127	if (op->map->in_memory == MAP_SAVING)
1157	return;	1128	return;
1158		1129
1159	tag = op->count;
1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1130	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1161		1131
1162	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)
1163	{	1133	{
1164	/* 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
…		…
1179		1149
1180	tmp->contr->socket.update_look = 1;	1150	tmp->contr->socket.update_look = 1;
1181	}	1151	}
1182		1152
1183	/* See if player moving off should effect something */	1153	/* 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))	1154	if (check_walk_off
		1155	&& ((op->move_type & tmp->move_off)
		1156	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1185	{	1157	{
1186	move_apply (tmp, op, NULL);	1158	move_apply (tmp, op, NULL);
1187		1159
1188	if (was_destroyed (op, tag))	1160	if (op->destroyed ())
1189	{
1190	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 ());
1191	}
1192	}	1162	}
1193		1163
1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1164	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195		1165
1196	if (tmp->above == tmp)	1166	if (tmp->above == tmp)
…		…
1224	* This function goes through all objects below and including top, and	1194	* This function goes through all objects below and including top, and
1225	* merges op to the first matching object.	1195	* merges op to the first matching object.
1226	* If top is NULL, it is calculated.	1196	* If top is NULL, it is calculated.
1227	* 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
1228	*/	1198	*/
1229
1230	object *	1199	object *
1231	merge_ob (object op, object top)	1200	merge_ob (object op, object top)
1232	{	1201	{
1233	if (!op->nrof)	1202	if (!op->nrof)
1234	return 0;	1203	return 0;
…		…
1250	free_object (op);	1219	free_object (op);
1251	return top;	1220	return top;
1252	}	1221	}
1253	}	1222	}
1254		1223
1255	return NULL;	1224	return 0;
1256	}	1225	}
1257		1226
1258	/*	1227	/*
1259	* 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
1260	* job preparing multi-part monsters	1229	* job preparing multi-part monsters
1261	*/	1230	*/
1262	object *	1231	object *
1263	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)
1264	{	1233	{
1265	object *tmp;	1234	object *tmp;
1266		1235
1267	if (op->head)	1236	if (op->head)
1268	op = op->head;	1237	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1265	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1266	* just 'op' otherwise
1298	*/	1267	*/
1299		1268
1300	object *	1269	object *
1301	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)
1302	{	1271	{
1303	object tmp, top, *floor = NULL;	1272	object tmp, top, *floor = NULL;
1304	sint16 x, y;	1273	sint16 x, y;
1305		1274
1306	if (QUERY_FLAG (op, FLAG_FREED))	1275	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1278	return NULL;
1310	}	1279	}
1311		1280
1312	if (m == NULL)	1281	if (m == NULL)
1313	{	1282	{
1314	dump_object (op);	1283	char *dump = dump_object (op);
1315	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);
1316	return op;	1286	return op;
1317	}	1287	}
1318		1288
1319	if (out_of_map (m, op->x, op->y))	1289	if (out_of_map (m, op->x, op->y))
1320	{	1290	{
1321	dump_object (op);	1291	char *dump = dump_object (op);
1322	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);
1323	#ifdef MANY_CORES	1293	#ifdef MANY_CORES
1324	/* 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
1325	* 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
1326	* improperly inserted.	1296	* improperly inserted.
1327	*/	1297	*/
1328	abort ();	1298	abort ();
1329	#endif	1299	#endif
		1300	free (dump);
1330	return op;	1301	return op;
1331	}	1302	}
1332		1303
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1304	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1305	{
1335	dump_object (op);	1306	char *dump = dump_object (op);
1336	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);
1337	return op;	1309	return op;
1338	}	1310	}
1339		1311
1340	if (op->more != NULL)	1312	if (op->more != NULL)
1341	{	1313	{
…		…
1587	remove_ob (tmp);	1559	remove_ob (tmp);
1588	free_object (tmp);	1560	free_object (tmp);
1589	}	1561	}
1590	}	1562	}
1591		1563
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1564	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1565
1594	tmp1->x = op->x;	1566	tmp1->x = op->x;
1595	tmp1->y = op->y;	1567	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1568	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1569	}
…		…
1778	tmp, *	1750	tmp, *
1779	otmp;	1751	otmp;
1780		1752
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1753	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1754	{
1783	dump_object (op);	1755	char *dump = dump_object (op);
1784	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);
1785	return op;	1758	return op;
1786	}	1759	}
1787		1760
1788	if (where == NULL)	1761	if (where == NULL)
1789	{	1762	{
1790	dump_object (op);	1763	char *dump = dump_object (op);
1791	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);
1792	return op;	1766	return op;
1793	}	1767	}
1794		1768
1795	if (where->head)	1769	if (where->head)
1796	{	1770	{
…		…
1896	*/	1870	*/
1897		1871
1898	int	1872	int
1899	check_move_on (object op, object originator)	1873	check_move_on (object op, object originator)
1900	{	1874	{
1901	object *	1875	object *tmp;
1902	tmp;	1876	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1877	int x = op->x, y = op->y;
1909		1878
1910	MoveType	1879	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1880
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1881	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1882	return 0;
1917
1918	tag = op->count;
1919		1883
1920	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);
1921	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);
1922	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);
1923		1887
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1948	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))	1949	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1950	{
1987	move_apply (tmp, op, originator);	1951	move_apply (tmp, op, originator);
1988		1952
1989	if (was_destroyed (op, tag))	1953	if (op->destroyed ())
1990	return 1;	1954	return 1;
1991		1955
1992	/* what the person/creature stepped onto has moved the object	1956	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1957	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1958	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1970	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1971	* The first matching object is returned, or NULL if none.
2008	*/	1972	*/
2009		1973
2010	object *	1974	object *
2011	present_arch (const archetype at, mapstruct m, int x, int y)	1975	present_arch (const archetype at, maptile m, int x, int y)
2012	{	1976	{
2013	object *	1977	object *
2014	tmp;	1978	tmp;
2015		1979
2016	if (m == NULL \|\| out_of_map (m, x, y))	1980	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1993	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1994	* The first matching object is returned, or NULL if none.
2031	*/	1995	*/
2032		1996
2033	object *	1997	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1998	present (unsigned char type, maptile *m, int x, int y)
2035	{	1999	{
2036	object *	2000	object *
2037	tmp;	2001	tmp;
2038		2002
2039	if (out_of_map (m, x, y))	2003	if (out_of_map (m, x, y))
…		…
2179	* 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
2180	* customized, changed states, etc.	2144	* customized, changed states, etc.
2181	*/	2145	*/
2182		2146
2183	int	2147	int
2184	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)
2185	{	2149	{
2186	int	2150	int
2187	i,	2151	i,
2188	index = 0, flag;	2152	index = 0, flag;
2189	static int	2153	static int
…		…
2210	return -1;	2174	return -1;
2211	return altern[RANDOM () % index];	2175	return altern[RANDOM () % index];
2212	}	2176	}
2213		2177
2214	/*	2178	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2179	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2180	* find_free_spot(), but it will search max number of squares.
2217	* 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.
2218	* 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.
2219	*/	2183	*/
2220		2184
2221	int	2185	int
2222	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)
2223	{	2187	{
2224	int	2188	int
2225	i;	2189	i;
2226		2190
2227	for (i = 0; i < SIZEOFFREE; i++)	2191	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* 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
2292	* there is capable of.	2256	* there is capable of.
2293	*/	2257	*/
2294		2258
2295	int	2259	int
2296	find_dir (mapstruct m, int x, int y, object exclude)	2260	find_dir (maptile m, int x, int y, object exclude)
2297	{	2261	{
2298	int	2262	int
2299	i,	2263	i,
2300	max = SIZEOFFREE, mflags;	2264	max = SIZEOFFREE, mflags;
2301		2265
2302	sint16 nx, ny;	2266	sint16 nx, ny;
2303	object *	2267	object *
2304	tmp;	2268	tmp;
2305	mapstruct *	2269	maptile *
2306	mp;	2270	mp;
2307		2271
2308	MoveType blocked, move_type;	2272	MoveType blocked, move_type;
2309		2273
2310	if (exclude && exclude->head)	2274	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2482	* Modified to be map tile aware -.MSW
2519	*/	2483	*/
2520		2484
2521		2485
2522	int	2486	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2487	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2488	{
2525	sint16 dx, dy;	2489	sint16 dx, dy;
2526	int	2490	int
2527	mflags;	2491	mflags;
2528		2492
…		…
2608	if (prev)	2572	if (prev)
2609	prev->more = tmp;	2573	prev->more = tmp;
2610	prev = tmp;	2574	prev = tmp;
2611	}	2575	}
2612		2576
2613	/* copy inventory */
2614	for (item = src->inv; item; item = item->below)	2577	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2578	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2579
2619	return dst;	2580	return dst;
2620	}	2581	}
2621		2582
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. */	2583	/* 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 */	2584	/* 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, */	2585	/* 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. */	2586	/* 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. */	2587	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2588	/* Also remember that multiparts objects are not supported for now. */
2642		2589
2643	object *	2590	object *
2644	load_object_str (const char *obstr)	2591	load_object_str (const char *obstr)
2645	{	2592	{
2646	object *	2593	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2594	char filename[MAX_BUF];
2650		2595
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2596	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2597
2653	FILE *
2654	tempfile = fopen (filename, "w");	2598	FILE *tempfile = fopen (filename, "w");
2655		2599
2656	if (tempfile == NULL)	2600	if (tempfile == NULL)
2657	{	2601	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2602	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2603	return NULL;
2660	};	2604	}
		2605
2661	fprintf (tempfile, obstr);	2606	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2607	fclose (tempfile);
2663		2608
2664	op = get_object ();	2609	op = get_object ();
2665		2610
…		…
2679	* returns NULL if no match.	2624	* returns NULL if no match.
2680	*/	2625	*/
2681	object *	2626	object *
2682	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)
2683	{	2628	{
2684	object *	2629	object *tmp;
2685	tmp;
2686		2630
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2631	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2632	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2633	return tmp;
2690		2634
…		…
2698	* do the desired thing.	2642	* do the desired thing.
2699	*/	2643	*/
2700	key_value *	2644	key_value *
2701	get_ob_key_link (const object ob, const char key)	2645	get_ob_key_link (const object ob, const char key)
2702	{	2646	{
2703	key_value *	2647	key_value *link;
2704	link;
2705		2648
2706	for (link = ob->key_values; link != NULL; link = link->next)	2649	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2650	if (link->key == key)
2709	{
2710	return link;	2651	return link;
2711	}
2712	}
2713		2652
2714	return NULL;	2653	return NULL;
2715	}	2654	}
2716		2655
2717	/*	2656	/*
…		…
2722	* The returned string is shared.	2661	* The returned string is shared.
2723	*/	2662	*/
2724	const char *	2663	const char *
2725	get_ob_key_value (const object op, const char const key)	2664	get_ob_key_value (const object op, const char const key)
2726	{	2665	{
2727	key_value *	2666	key_value *link;
2728	link;	2667	shstr_cmp canonical_key (key);
2729	const char *
2730	canonical_key;
2731		2668
2732	canonical_key = shstr::find (key);
2733
2734	if (canonical_key == NULL)	2669	if (!canonical_key)
2735	{	2670	{
2736	/* 1. There being a field named key on any object	2671	/* 1. There being a field named key on any object
2737	* implies there'd be a shared string to find.	2672	* implies there'd be a shared string to find.
2738	* 2. Since there isn't, no object has this field.	2673	* 2. Since there isn't, no object has this field.
2739	* 3. Therefore, this object doesn't have this field.	2674	* 3. Therefore, this object doesn't have this field.
2740	*/	2675	*/
2741	return NULL;	2676	return 0;
2742	}	2677	}
2743		2678
2744	/* This is copied from get_ob_key_link() above -	2679	/* This is copied from get_ob_key_link() above -
2745	* only 4 lines, and saves the function call overhead.	2680	* only 4 lines, and saves the function call overhead.
2746	*/	2681	*/
2747	for (link = op->key_values; link != NULL; link = link->next)	2682	for (link = op->key_values; link; link = link->next)
2748	{
2749	if (link->key == canonical_key)	2683	if (link->key == canonical_key)
2750	{
2751	return link->value;	2684	return link->value;
2752	}	2685
2753	}
2754	return NULL;	2686	return 0;
2755	}	2687	}
2756		2688
2757		2689
2758	/*	2690	/*
2759	* Updates the canonical_key in op to value.	2691	* Updates the canonical_key in op to value.
…		…
2845	shstr key_ (key);	2777	shstr key_ (key);
2846		2778
2847	return set_ob_key_value_s (op, key_, value, add_key);	2779	return set_ob_key_value_s (op, key_, value, add_key);
2848	}	2780	}
2849		2781
		2782	object::depth_iterator::depth_iterator (object *container)
		2783	: iterator_base (container)
		2784	{
		2785	while (item->inv)
		2786	item = item->inv;
		2787	}
		2788
2850	void	2789	void
2851	object::deep_iterator::next ()	2790	object::depth_iterator::next ()
2852	{	2791	{
2853	if (item->inv)
2854	item = item->inv;
2855	else if (item->below)	2792	if (item->below)
		2793	{
2856	item = item->below;	2794	item = item->below;
		2795
		2796	while (item->inv)
		2797	item = item->inv;
		2798	}
2857	else	2799	else
2858	item = item->env->below;	2800	item = item->env;
2859	}	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.31 by root, Mon Sep 11 23:33:27 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.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.54 by root, Fri Nov 17 19:40:53 2006 UTC