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

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.53 by root, Tue Nov 7 16:30:54 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.53 by root, Tue Nov 7 16:30:54 2006 UTC