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