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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object objects; / Pointer to the list of used objects */
39	object active_objects; / List of active objects that need to be processed */	39	object active_objects; / List of active objects that need to be processed */
40		40
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
54		131
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object wants, const object has)	134	compare_ob_value_lists_one (const object wants, const object has)
58	{	135	{
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	375	* Some error messages.
296	* 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.
297	*/	377	*/
298		378
299	void	379	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object tmp;/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	380	dump_object (object *op)
355	{	381	{
356	if (op == NULL)	382	if (!op)
357	{	383	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		384
365	void	385	object_freezer freezer;
366	dump_all_objects (void)	386	save_object (freezer, op, 3);
367	{	387	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	388	}
376		389
377	/*	390	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
399	*/	412	*/
400		413
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	418	if (op->count == i)
408	break;	419	return op;
		420
409	return op;	421	return 0;
410	}	422	}
411		423
412	/*	424	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
416	*/	428	*/
417		429
418	object *	430	object *
419	find_object_name (const char *str)	431	find_object_name (const char *str)
420	{	432	{
421	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
422	object *op;	434	object *op;
423		435
424	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	437	if (op->name == str_)
426	break;	438	break;
427		439
428	return op;	440	return op;
429	}	441	}
430		442
431	void	443	void
432	free_all_object_data ()	444	free_all_object_data ()
433	{	445	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	\|\| QUERY_FLAG (owner, FLAG_FREED)
452	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	447	}
457		448
458	/*	449	/*
459	* 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
460	* skill and experience objects.	451	* skill and experience objects.
…		…
530		521
531	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
532		523
533	expmul = 1.0;	524	expmul = 1.0;
534	face = blank_face;	525	face = blank_face;
535	attacked_by_count = -1;
536		526
537	if (settings.casting_time)	527	if (settings.casting_time)
538	casting_time = -1;	528	casting_time = -1;
539	}	529	}
540		530
…		…
835		825
836	if (op->more != NULL)	826	if (op->more != NULL)
837	update_object (op->more, action);	827	update_object (op->more, action);
838	}	828	}
839		829
840	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
841	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
842		833
843	void object::free_mortals ()	834	void object::free_mortals ()
844	{	835	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	837	if ((*i)->refcnt)
847	++i; // further delay freeing	838	++i; // further delay freeing
848	else	839	else
849	{	840	{
850	freed.push_back (*i);//D
851	//delete *i;	841	delete *i;
852	mortals.erase (i);	842	mortals.erase (i);
853	}	843	}
854		844
855	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
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D	850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		851	}
857	}	852	}
858		853
859	object::object ()	854	object::object ()
860	{	855	{
861	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
862		857
863	expmul = 1.0;	858	expmul = 1.0;
864	face = blank_face;	859	face = blank_face;
865	attacked_by_count = -1;
866	}	860	}
867		861
868	object::~object ()	862	object::~object ()
869	{	863	{
870	free_key_values (this);	864	free_key_values (this);
871	}	865	}
872		866
873	void object::link ()	867	void object::link ()
874	{	868	{
875	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
876		871
877	prev = 0;	872	prev = 0;
878	next = objects;	873	next = object::first;
879		874
880	if (objects)	875	if (object::first)
881	objects->prev = this;	876	object::first->prev = this;
882		877
883	objects = this;	878	object::first = this;
884	}	879	}
885		880
886	void object::unlink ()	881	void object::unlink ()
887	{	882	{
888	count = 0;	883	if (this == object::first)
		884	object::first = next;
889		885
890	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
894	prev = 0;	890	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	891	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	892	}
906		893
907	object *object::create ()	894	object *object::create ()
908	{	895	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	896	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	897	op->link ();
923	return op;	898	return op;
924	}	899	}
925		900
926	/*	901	/*
…		…
928	* 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
929	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	906	* this function to succeed.
932	*	907	*
933	* 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
934	* inventory to the ground.	909	* inventory to the ground.
935	*/	910	*/
936	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
937	{	912	{
938	if (QUERY_FLAG (this, FLAG_FREED))	913	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	914	return;
940		915
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
…		…
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	920	remove_ob (this);
946		921
947	SET_FLAG (this, FLAG_FREED);	922	SET_FLAG (this, FLAG_FREED);
948		923
		924	// hack to ensure that freed objects still have a valid map
		925	{
		926	static maptile *freed_map; // freed objects are moved here to avoid crashes
		927
		928	if (!freed_map)
		929	{
		930	freed_map = get_empty_map (3, 3);
		931	freed_map->name = "freed objects map";
		932	allocate_map (freed_map);
		933	}
		934
		935	map = freed_map;
		936	x = 1;
		937	y = 1;
		938	}
		939
949	if (more)	940	if (more)
950	{	941	{
951	more->free (free_inventory);	942	more->destroy (destroy_inventory);
952	more = 0;	943	more = 0;
953	}	944	}
954		945
955	if (inv)	946	if (inv)
956	{	947	{
957	/* Only if the space blocks everything do we not process -	948	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	949	* if some form of movement is allowed, let objects
959	* drop on that space.	950	* drop on that space.
960	*/	951	*/
961	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	952	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962	{	953	{
963	object *op = inv;	954	object *op = inv;
964		955
965	while (op)	956	while (op)
966	{	957	{
967	object *tmp = op->below;	958	object *tmp = op->below;
968	op->free (free_inventory);	959	op->destroy (destroy_inventory);
969	op = tmp;	960	op = tmp;
970	}	961	}
971	}	962	}
972	else	963	else
973	{ /* Put objects in inventory onto this space */	964	{ /* Put objects in inventory onto this space */
…		…
992	op = tmp;	983	op = tmp;
993	}	984	}
994	}	985	}
995	}	986	}
996		987
		988	// clear those pointers that likely might have circular references to us
997	owner = 0;	989	owner = 0;
		990	enemy = 0;
		991	attacked_by = 0;
		992
		993	// only relevant for players(?), but make sure of it anyways
		994	contr = 0;
998		995
999	/* Remove object from the active list */	996	/* Remove object from the active list */
1000	speed = 0;	997	speed = 0;
1001	update_ob_speed (this);	998	update_ob_speed (this);
1002		999
…		…
1014	sub_weight (object *op, signed long weight)	1011	sub_weight (object *op, signed long weight)
1015	{	1012	{
1016	while (op != NULL)	1013	while (op != NULL)
1017	{	1014	{
1018	if (op->type == CONTAINER)	1015	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1016	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	1017
1022	op->carrying -= weight;	1018	op->carrying -= weight;
1023	op = op->env;	1019	op = op->env;
1024	}	1020	}
1025	}	1021	}
1026		1022
…		…
1034	*/	1030	*/
1035		1031
1036	void	1032	void
1037	remove_ob (object *op)	1033	remove_ob (object *op)
1038	{	1034	{
		1035	object tmp, last = 0;
1039	object *	1036	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		1037
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	1038	int check_walk_off;
1049	mapstruct *	1039	maptile *m;
1050	m;
1051		1040
1052	sint16	1041	sint16 x, y;
1053	x,
1054	y;
1055		1042
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	1043	if (QUERY_FLAG (op, FLAG_REMOVED))
1057	return;	1044	return;
1058		1045
1059	SET_FLAG (op, FLAG_REMOVED);	1046	SET_FLAG (op, FLAG_REMOVED);
…		…
1136	* use translated coordinates in case some oddness with map tiling is	1123	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1124	* evident
1138	*/	1125	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1126	if (GET_MAP_OB (m, x, y) != op)
1140	{	1127	{
1141	dump_object (op);	1128	char *dump = dump_object (op);
1142	LOG (llevError,	1129	LOG (llevError,
1143	"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);	1130	"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);
		1131	free (dump);
1144	dump_object (GET_MAP_OB (m, x, y));	1132	dump = dump_object (GET_MAP_OB (m, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1133	LOG (llevError, "%s\n", dump);
		1134	free (dump);
1146	}	1135	}
1147		1136
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1137	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1149	}	1138	}
1150		1139
…		…
1152	op->below = 0;	1141	op->below = 0;
1153		1142
1154	if (op->map->in_memory == MAP_SAVING)	1143	if (op->map->in_memory == MAP_SAVING)
1155	return;	1144	return;
1156		1145
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1146	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159		1147
1160	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1148	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1161	{	1149	{
1162	/* No point updating the players look faces if he is the object	1150	/* No point updating the players look faces if he is the object
…		…
1177		1165
1178	tmp->contr->socket.update_look = 1;	1166	tmp->contr->socket.update_look = 1;
1179	}	1167	}
1180		1168
1181	/* See if player moving off should effect something */	1169	/* See if player moving off should effect something */
1182	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1170	if (check_walk_off
		1171	&& ((op->move_type & tmp->move_off)
		1172	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1173	{
1184	move_apply (tmp, op, NULL);	1174	move_apply (tmp, op, NULL);
1185		1175
1186	if (was_destroyed (op, tag))	1176	if (op->destroyed ())
1187	{
1188	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1177	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189	}
1190	}	1178	}
1191		1179
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1180	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1181
1194	if (tmp->above == tmp)	1182	if (tmp->above == tmp)
…		…
1222	* This function goes through all objects below and including top, and	1210	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1211	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1212	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1213	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1214	*/
1227
1228	object *	1215	object *
1229	merge_ob (object op, object top)	1216	merge_ob (object op, object top)
1230	{	1217	{
1231	if (!op->nrof)	1218	if (!op->nrof)
1232	return 0;	1219	return 0;
…		…
1248	free_object (op);	1235	free_object (op);
1249	return top;	1236	return top;
1250	}	1237	}
1251	}	1238	}
1252		1239
1253	return NULL;	1240	return 0;
1254	}	1241	}
1255		1242
1256	/*	1243	/*
1257	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1244	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1258	* job preparing multi-part monsters	1245	* job preparing multi-part monsters
1259	*/	1246	*/
1260	object *	1247	object *
1261	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1248	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1262	{	1249	{
1263	object *tmp;	1250	object *tmp;
1264		1251
1265	if (op->head)	1252	if (op->head)
1266	op = op->head;	1253	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1281	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1282	* just 'op' otherwise
1296	*/	1283	*/
1297		1284
1298	object *	1285	object *
1299	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1286	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1300	{	1287	{
1301	object tmp, top, *floor = NULL;	1288	object tmp, top, *floor = NULL;
1302	sint16 x, y;	1289	sint16 x, y;
1303		1290
1304	if (QUERY_FLAG (op, FLAG_FREED))	1291	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1294	return NULL;
1308	}	1295	}
1309		1296
1310	if (m == NULL)	1297	if (m == NULL)
1311	{	1298	{
1312	dump_object (op);	1299	char *dump = dump_object (op);
1313	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1300	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1301	free (dump);
1314	return op;	1302	return op;
1315	}	1303	}
1316		1304
1317	if (out_of_map (m, op->x, op->y))	1305	if (out_of_map (m, op->x, op->y))
1318	{	1306	{
1319	dump_object (op);	1307	char *dump = dump_object (op);
1320	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1308	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321	#ifdef MANY_CORES	1309	#ifdef MANY_CORES
1322	/* Better to catch this here, as otherwise the next use of this object	1310	/* Better to catch this here, as otherwise the next use of this object
1323	* is likely to cause a crash. Better to find out where it is getting	1311	* is likely to cause a crash. Better to find out where it is getting
1324	* improperly inserted.	1312	* improperly inserted.
1325	*/	1313	*/
1326	abort ();	1314	abort ();
1327	#endif	1315	#endif
		1316	free (dump);
1328	return op;	1317	return op;
1329	}	1318	}
1330		1319
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1320	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1321	{
1333	dump_object (op);	1322	char *dump = dump_object (op);
1334	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1323	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1324	free (dump);
1335	return op;	1325	return op;
1336	}	1326	}
1337		1327
1338	if (op->more != NULL)	1328	if (op->more != NULL)
1339	{	1329	{
…		…
1585	remove_ob (tmp);	1575	remove_ob (tmp);
1586	free_object (tmp);	1576	free_object (tmp);
1587	}	1577	}
1588	}	1578	}
1589		1579
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1580	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1581
1592	tmp1->x = op->x;	1582	tmp1->x = op->x;
1593	tmp1->y = op->y;	1583	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1584	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1585	}
…		…
1776	tmp, *	1766	tmp, *
1777	otmp;	1767	otmp;
1778		1768
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1769	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1770	{
1781	dump_object (op);	1771	char *dump = dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1772	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1773	free (dump);
1783	return op;	1774	return op;
1784	}	1775	}
1785		1776
1786	if (where == NULL)	1777	if (where == NULL)
1787	{	1778	{
1788	dump_object (op);	1779	char *dump = dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1780	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1781	free (dump);
1790	return op;	1782	return op;
1791	}	1783	}
1792		1784
1793	if (where->head)	1785	if (where->head)
1794	{	1786	{
…		…
1894	*/	1886	*/
1895		1887
1896	int	1888	int
1897	check_move_on (object op, object originator)	1889	check_move_on (object op, object originator)
1898	{	1890	{
1899	object *	1891	object *tmp;
1900	tmp;	1892	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1893	int x = op->x, y = op->y;
1907		1894
1908	MoveType	1895	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1896
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1897	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1898	return 0;
1915
1916	tag = op->count;
1917		1899
1918	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1900	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1901	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1902	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921		1903
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1964	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1983	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1965	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1966	{
1985	move_apply (tmp, op, originator);	1967	move_apply (tmp, op, originator);
1986		1968
1987	if (was_destroyed (op, tag))	1969	if (op->destroyed ())
1988	return 1;	1970	return 1;
1989		1971
1990	/* what the person/creature stepped onto has moved the object	1972	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1973	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1974	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1986	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1987	* The first matching object is returned, or NULL if none.
2006	*/	1988	*/
2007		1989
2008	object *	1990	object *
2009	present_arch (const archetype at, mapstruct m, int x, int y)	1991	present_arch (const archetype at, maptile m, int x, int y)
2010	{	1992	{
2011	object *	1993	object *
2012	tmp;	1994	tmp;
2013		1995
2014	if (m == NULL \|\| out_of_map (m, x, y))	1996	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	2009	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	2010	* The first matching object is returned, or NULL if none.
2029	*/	2011	*/
2030		2012
2031	object *	2013	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	2014	present (unsigned char type, maptile *m, int x, int y)
2033	{	2015	{
2034	object *	2016	object *
2035	tmp;	2017	tmp;
2036		2018
2037	if (out_of_map (m, x, y))	2019	if (out_of_map (m, x, y))
…		…
2177	* the archetype because that isn't correct if the monster has been	2159	* the archetype because that isn't correct if the monster has been
2178	* customized, changed states, etc.	2160	* customized, changed states, etc.
2179	*/	2161	*/
2180		2162
2181	int	2163	int
2182	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2164	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2183	{	2165	{
2184	int	2166	int
2185	i,	2167	i,
2186	index = 0, flag;	2168	index = 0, flag;
2187	static int	2169	static int
…		…
2208	return -1;	2190	return -1;
2209	return altern[RANDOM () % index];	2191	return altern[RANDOM () % index];
2210	}	2192	}
2211		2193
2212	/*	2194	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2195	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2196	* find_free_spot(), but it will search max number of squares.
2215	* But it will return the first available spot, not a random choice.	2197	* But it will return the first available spot, not a random choice.
2216	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2198	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2217	*/	2199	*/
2218		2200
2219	int	2201	int
2220	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2202	find_first_free_spot (const object ob, maptile m, int x, int y)
2221	{	2203	{
2222	int	2204	int
2223	i;	2205	i;
2224		2206
2225	for (i = 0; i < SIZEOFFREE; i++)	2207	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* because we have to know what movement the thing looking to move	2271	* because we have to know what movement the thing looking to move
2290	* there is capable of.	2272	* there is capable of.
2291	*/	2273	*/
2292		2274
2293	int	2275	int
2294	find_dir (mapstruct m, int x, int y, object exclude)	2276	find_dir (maptile m, int x, int y, object exclude)
2295	{	2277	{
2296	int	2278	int
2297	i,	2279	i,
2298	max = SIZEOFFREE, mflags;	2280	max = SIZEOFFREE, mflags;
2299		2281
2300	sint16 nx, ny;	2282	sint16 nx, ny;
2301	object *	2283	object *
2302	tmp;	2284	tmp;
2303	mapstruct *	2285	maptile *
2304	mp;	2286	mp;
2305		2287
2306	MoveType blocked, move_type;	2288	MoveType blocked, move_type;
2307		2289
2308	if (exclude && exclude->head)	2290	if (exclude && exclude->head)
…		…
2516	* Modified to be map tile aware -.MSW	2498	* Modified to be map tile aware -.MSW
2517	*/	2499	*/
2518		2500
2519		2501
2520	int	2502	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2503	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2504	{
2523	sint16 dx, dy;	2505	sint16 dx, dy;
2524	int	2506	int
2525	mflags;	2507	mflags;
2526		2508
…		…
2606	if (prev)	2588	if (prev)
2607	prev->more = tmp;	2589	prev->more = tmp;
2608	prev = tmp;	2590	prev = tmp;
2609	}	2591	}
2610		2592
2611	/* copy inventory */
2612	for (item = src->inv; item; item = item->below)	2593	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2594	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2595
2617	return dst;	2596	return dst;
2618	}	2597	}
2619		2598
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2599	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* Basically, we save the content of the string to a temp file, then call */	2600	/* Basically, we save the content of the string to a temp file, then call */
2632
2633	/* load_object on it. I admit it is a highly inefficient way to make things, */	2601	/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635	/* but it was simple to make and allows reusing the load_object function. */	2602	/* but it was simple to make and allows reusing the load_object function. */
2636
2637	/* Remember not to use load_object_str in a time-critical situation. */	2603	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2604	/* Also remember that multiparts objects are not supported for now. */
2640		2605
2641	object *	2606	object *
2642	load_object_str (const char *obstr)	2607	load_object_str (const char *obstr)
2643	{	2608	{
2644	object *	2609	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2610	char filename[MAX_BUF];
2648		2611
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2612	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2613
2651	FILE *
2652	tempfile = fopen (filename, "w");	2614	FILE *tempfile = fopen (filename, "w");
2653		2615
2654	if (tempfile == NULL)	2616	if (tempfile == NULL)
2655	{	2617	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2618	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2619	return NULL;
2658	};	2620	}
		2621
2659	fprintf (tempfile, obstr);	2622	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2623	fclose (tempfile);
2661		2624
2662	op = get_object ();	2625	op = get_object ();
2663		2626
…		…
2677	* returns NULL if no match.	2640	* returns NULL if no match.
2678	*/	2641	*/
2679	object *	2642	object *
2680	find_obj_by_type_subtype (const object *who, int type, int subtype)	2643	find_obj_by_type_subtype (const object *who, int type, int subtype)
2681	{	2644	{
2682	object *	2645	object *tmp;
2683	tmp;
2684		2646
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2647	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2648	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2649	return tmp;
2688		2650
…		…
2696	* do the desired thing.	2658	* do the desired thing.
2697	*/	2659	*/
2698	key_value *	2660	key_value *
2699	get_ob_key_link (const object ob, const char key)	2661	get_ob_key_link (const object ob, const char key)
2700	{	2662	{
2701	key_value *	2663	key_value *link;
2702	link;
2703		2664
2704	for (link = ob->key_values; link != NULL; link = link->next)	2665	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2666	if (link->key == key)
2707	{
2708	return link;	2667	return link;
2709	}
2710	}
2711		2668
2712	return NULL;	2669	return NULL;
2713	}	2670	}
2714		2671
2715	/*	2672	/*
…		…
2720	* The returned string is shared.	2677	* The returned string is shared.
2721	*/	2678	*/
2722	const char *	2679	const char *
2723	get_ob_key_value (const object op, const char const key)	2680	get_ob_key_value (const object op, const char const key)
2724	{	2681	{
2725	key_value *	2682	key_value *link;
2726	link;	2683	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2684
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2685	if (!canonical_key)
2733	{	2686	{
2734	/* 1. There being a field named key on any object	2687	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2688	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2689	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, this object doesn't have this field.	2690	* 3. Therefore, this object doesn't have this field.
2738	*/	2691	*/
2739	return NULL;	2692	return 0;
2740	}	2693	}
2741		2694
2742	/* This is copied from get_ob_key_link() above -	2695	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2696	* only 4 lines, and saves the function call overhead.
2744	*/	2697	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2698	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2699	if (link->key == canonical_key)
2748	{
2749	return link->value;	2700	return link->value;
2750	}	2701
2751	}
2752	return NULL;	2702	return 0;
2753	}	2703	}
2754		2704
2755		2705
2756	/*	2706	/*
2757	* Updates the canonical_key in op to value.	2707	* Updates the canonical_key in op to value.
…		…
2864	}	2814	}
2865	else	2815	else
2866	item = item->env;	2816	item = item->env;
2867	}	2817	}
2868		2818
		2819	// return a suitable string describing an objetc in enough detail to find it
		2820	const char *
		2821	object::debug_desc (char *info) const
		2822	{
		2823	char info2[256 * 3];
		2824	char *p = info;
		2825
		2826	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2827	count,
		2828	&name,
		2829	title ? " " : "",
		2830	title ? (const char *)title : "");
		2831
		2832	if (env)
		2833	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2834
		2835	if (map)
		2836	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2837
		2838	return info;
		2839	}
		2840
		2841	const char *
		2842	object::debug_desc () const
		2843	{
		2844	static char info[256 * 3];
		2845	return debug_desc (info);
		2846	}
		2847

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.34 by root, Tue Sep 12 01:09:53 2006 UTC vs. Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC