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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.29 by root, Mon Sep 11 12:38:36 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
…		…
434	{	447	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	449	}
437		450
438	/*	451	/*
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
449	object *
450	get_owner (object *op)
451	{
452	if (op->owner == NULL)
453	return NULL;
454
455	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456	return op->owner;
457
458	op->owner = NULL;
459	op->ownercount = 0;
460	return NULL;
461	}
462
463	void
464	clear_owner (object *op)
465	{
466	if (!op)
467	return;
468
469	if (op->owner && op->ownercount == op->owner->count)
470	op->owner->refcount--;
471
472	op->owner = NULL;
473	op->ownercount = 0;
474	}
475
476	/*
477	* 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
478	* skill and experience objects.	453	* skill and experience objects.
479	*/	454	*/
480	void	455	void
481	set_owner (object op, object owner)	456	object::set_owner (object *owner)
482	{	457	{
483	if (owner == NULL \|\| op == NULL)	458	if (!owner)
484	return;	459	return;
485		460
486	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
487	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* Add a check for ownercounts in here, as I got into an endless loop
488	* with the fireball owning a poison cloud which then owned the	463	* with the fireball owning a poison cloud which then owned the
489	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
490	* freed and then another object replacing it. Since the ownercounts	465	* freed and then another object replacing it. Since the ownercounts
491	* didn't match, this check is valid and I believe that cause is valid.	466	* didn't match, this check is valid and I believe that cause is valid.
492	*/	467	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
494	owner = owner->owner;	469	owner = owner->owner;
495		470
496	/* IF the owner still has an owner, we did not resolve to a final owner.
497	* so lets not add to that.
498	*/
499	if (owner->owner)
500	return;
501
502	op->owner = owner;	471	this->owner = owner;
503
504	op->ownercount = owner->count;
505	owner->refcount++;
506	}
507
508	/* Set the owner to clone's current owner and set the skill and experience
509	* objects to clone's objects (typically those objects that where the owner's
510	* current skill and experience objects at the time when clone's owner was
511	* set - not the owner's current skill and experience objects).
512	*
513	* Use this function if player created an object (e.g. fire bullet, swarm
514	* spell), and this object creates further objects whose kills should be
515	* accounted for the player's original skill, even if player has changed
516	* skills meanwhile.
517	*/
518	void
519	copy_owner (object op, object clone)
520	{
521	object *owner = get_owner (clone);
522
523	if (owner == NULL)
524	{
525	/* players don't have owners - they own themselves. Update
526	* as appropriate.
527	*/
528	if (clone->type == PLAYER)
529	owner = clone;
530	else
531	return;
532	}
533
534	set_owner (op, owner);
535	}	472	}
536		473
537	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	475	* refcounts and freeing the links.
539	*/	476	*/
…		…
555	{	492	{
556	attachable_base::clear ();	493	attachable_base::clear ();
557		494
558	free_key_values (this);	495	free_key_values (this);
559		496
560	clear_owner (this);	497	owner = 0;
561
562	name = 0;	498	name = 0;
563	name_pl = 0;	499	name_pl = 0;
564	title = 0;	500	title = 0;
565	race = 0;	501	race = 0;
566	slaying = 0;	502	slaying = 0;
567	skill = 0;	503	skill = 0;
568	msg = 0;	504	msg = 0;
569	lore = 0;	505	lore = 0;
570	custom_name = 0;	506	custom_name = 0;
571	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
572		519
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574		521
575	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
		523
		524	/* What is not cleared is next, prev, and count */
		525
		526	expmul = 1.0;
		527	face = blank_face;
		528
		529	if (settings.casting_time)
		530	casting_time = -1;
576	}	531	}
577		532
578	void object::clone (object *destination)	533	void object::clone (object *destination)
579	{	534	{
580	(object_copy ) destination = *this;	535	(object_copy )destination = *this;
581	(object_pod ) destination = *this;	536	(object_pod )destination = *this;
582		537
583	if (self \|\| cb)	538	if (self \|\| cb)
584	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585	}
586
587	/*
588	* clear_object() frees everything allocated by an object, and also
589	* clears all variables and flags to default settings.
590	*/
591
592	void
593	clear_object (object *op)
594	{
595	op->clear ();
596
597	op->contr = NULL;
598	op->below = NULL;
599	op->above = NULL;
600	op->inv = NULL;
601	op->container = NULL;
602	op->env = NULL;
603	op->more = NULL;
604	op->head = NULL;
605	op->map = NULL;
606	op->refcount = 0;
607	op->active_next = NULL;
608	op->active_prev = NULL;
609	/* What is not cleared is next, prev, and count */
610
611	op->expmul = 1.0;
612	op->face = blank_face;
613	op->attacked_by_count = -1;
614
615	if (settings.casting_time)
616	op->casting_time = -1;
617	}	540	}
618		541
619	/*	542	/*
620	* copy object first frees everything allocated by the second object,	543	* copy object first frees everything allocated by the second object,
621	* and then copies the contends of the first object into the second	544	* and then copies the contends of the first object into the second
622	* object, allocating what needs to be allocated. Basically, any	545	* object, allocating what needs to be allocated. Basically, any
623	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	546	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
624	* if the first object is freed, the pointers in the new object	547	* if the first object is freed, the pointers in the new object
625	* will point at garbage.	548	* will point at garbage.
626	*/	549	*/
627
628	void	550	void
629	copy_object (object op2, object op)	551	copy_object (object op2, object op)
630	{	552	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
692	/*	614	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
694	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
695	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
696	*/	618	*/
697
698	void	619	void
699	update_ob_speed (object *op)	620	update_ob_speed (object *op)
700	{	621	{
701	extern int arch_init;	622	extern int arch_init;
702		623
…		…
711	abort ();	632	abort ();
712	#else	633	#else
713	op->speed = 0;	634	op->speed = 0;
714	#endif	635	#endif
715	}	636	}
		637
716	if (arch_init)	638	if (arch_init)
717	{
718	return;	639	return;
719	}	640
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	642	{
722	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
723	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	644	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
724	return;	645	return;
725		646
726	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	648	* of the list. */
728	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
729	if (op->active_next != NULL)	651	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
731	active_objects = op;	654	active_objects = op;
732	}	655	}
733	else	656	else
734	{	657	{
735	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
737	return;	660	return;
738		661
739	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
740	{	663	{
741	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
742	if (op->active_next != NULL)	666	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
744	}	668	}
745	else	669	else
746	{	670	{
747	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
748	if (op->active_next)	673	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
750	}	675	}
		676
751	op->active_next = NULL;	677	op->active_next = NULL;
752	op->active_prev = NULL;	678	op->active_prev = NULL;
753	}	679	}
754	}	680	}
755		681
…		…
901		827
902	if (op->more != NULL)	828	if (op->more != NULL)
903	update_object (op->more, action);	829	update_object (op->more, action);
904	}	830	}
905		831
906	static unordered_vector < object *>mortals;	832	object::vector object::mortals;
907	static	833	object::vector object::objects; // not yet used
908	std::vector < object *>	834	object *object::first;
909	freed;
910		835
911	void object::free_mortals ()	836	void object::free_mortals ()
912	{	837	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
915	{	842	{
916	freed.push_back (*i);	843	delete *i;
917	mortals.erase (i);	844	mortals.erase (i);
918	}	845	}
919	else	846
920	++i;	847	static int lastmortals = 0;//D
		848
		849	if (mortals.size() != lastmortals && lastmortals > 100)//D
		850	{
		851	lastmortals = mortals.size ();//D
		852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		853	}
921	}	854	}
922		855
923	object::object ()	856	object::object ()
924	{	857	{
925	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
926		859
927	expmul = 1.0;	860	expmul = 1.0;
928	face = blank_face;	861	face = blank_face;
929	attacked_by_count = -1;
930	}	862	}
931		863
932	object::~object ()	864	object::~object ()
933	{	865	{
934	free_key_values (this);	866	free_key_values (this);
935	}	867	}
936		868
937	void object::link ()	869	void object::link ()
938	{	870	{
939	count = ++ob_count;	871	count = ++ob_count;
		872	uuid = gen_uuid ();
940		873
941	prev = 0;	874	prev = 0;
942	next = objects;	875	next = object::first;
943		876
944	if (objects)	877	if (object::first)
945	objects->prev = this;	878	object::first->prev = this;
946		879
947	objects = this;	880	object::first = this;
948	}	881	}
949		882
950	void object::unlink ()	883	void object::unlink ()
951	{	884	{
952	count = 0;	885	if (this == object::first)
		886	object::first = next;
953		887
954	/* Remove this object from the list of used objects */	888	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	889	if (prev) prev->next = next;
		890	if (next) next->prev = prev;
		891
958	prev = 0;	892	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	893	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	894	}
970		895
971	object *object::create ()	896	object *object::create ()
972	{	897	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	898	object *op = new object;
978
979	else
980	{
981	// highly annoying, but the only way to get it stable right now
982	op = freed.back ();
983	freed.pop_back ();
984	op->~object ();
985	new ((void *) op) object;
986	}
987
988	op->link ();	899	op->link ();
989	return op;	900	return op;
990	}	901	}
991		902
992	/*	903	/*
…		…
994	* 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
995	* free objects. The IS_FREED() flag is set in the object.	906	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	907	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	908	* this function to succeed.
998	*	909	*
999	* 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
1000	* inventory to the ground.	911	* inventory to the ground.
1001	*/	912	*/
1002	void object::free (bool free_inventory)	913	void object::destroy (bool destroy_inventory)
1003	{	914	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	915	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	916	return;
1006		917
		918	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		919	remove_friendly_object (this);
		920
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))	921	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);	922	remove_ob (this);
1009		923
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);
1012
1013	SET_FLAG (this, FLAG_FREED);	924	SET_FLAG (this, FLAG_FREED);
1014		925
1015	if (more)	926	if (more)
1016	{	927	{
1017	more->free (free_inventory);	928	more->destroy (destroy_inventory);
1018	more = 0;	929	more = 0;
1019	}	930	}
1020		931
1021	if (inv)	932	if (inv)
1022	{	933	{
1023	/* Only if the space blocks everything do we not process -	934	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	935	* if some form of movement is allowed, let objects
1025	* drop on that space.	936	* drop on that space.
1026	*/	937	*/
1027	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)
1028	{	939	{
1029	object *op = inv;	940	object *op = inv;
1030		941
1031	while (op)	942	while (op)
1032	{	943	{
1033	object *tmp = op->below;	944	object *tmp = op->below;
1034	op->free (free_inventory);	945	op->destroy (destroy_inventory);
1035	op = tmp;	946	op = tmp;
1036	}	947	}
1037	}	948	}
1038	else	949	else
1039	{ /* Put objects in inventory onto this space */	950	{ /* Put objects in inventory onto this space */
…		…
1058	op = tmp;	969	op = tmp;
1059	}	970	}
1060	}	971	}
1061	}	972	}
1062		973
1063	clear_owner (this);	974	// clear those pointers that likely might have circular references to us
		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;
1064		981
1065	/* Remove object from the active list */	982	/* Remove object from the active list */
1066	speed = 0;	983	speed = 0;
1067	update_ob_speed (this);	984	update_ob_speed (this);
1068		985
…		…
1080	sub_weight (object *op, signed long weight)	997	sub_weight (object *op, signed long weight)
1081	{	998	{
1082	while (op != NULL)	999	while (op != NULL)
1083	{	1000	{
1084	if (op->type == CONTAINER)	1001	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1002	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1003
1088	op->carrying -= weight;	1004	op->carrying -= weight;
1089	op = op->env;	1005	op = op->env;
1090	}	1006	}
1091	}	1007	}
1092		1008
…		…
1100	*/	1016	*/
1101		1017
1102	void	1018	void
1103	remove_ob (object *op)	1019	remove_ob (object *op)
1104	{	1020	{
		1021	object tmp, last = 0;
1105	object *	1022	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1023
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1024	int check_walk_off;
1115	mapstruct *	1025	maptile *m;
1116	m;
1117		1026
1118	sint16	1027	sint16 x, y;
1119	x,
1120	y;
1121		1028
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1029	if (QUERY_FLAG (op, FLAG_REMOVED))
1123	return;	1030	return;
1124		1031
1125	SET_FLAG (op, FLAG_REMOVED);	1032	SET_FLAG (op, FLAG_REMOVED);
…		…
1202	* use translated coordinates in case some oddness with map tiling is	1109	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1110	* evident
1204	*/	1111	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1112	if (GET_MAP_OB (m, x, y) != op)
1206	{	1113	{
1207	dump_object (op);	1114	char *dump = dump_object (op);
1208	LOG (llevError,	1115	LOG (llevError,
1209	"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);
1210	dump_object (GET_MAP_OB (m, x, y));	1118	dump = dump_object (GET_MAP_OB (m, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1119	LOG (llevError, "%s\n", dump);
		1120	free (dump);
1212	}	1121	}
1213		1122
1214	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. */
1215	}	1124	}
1216		1125
…		…
1218	op->below = 0;	1127	op->below = 0;
1219		1128
1220	if (op->map->in_memory == MAP_SAVING)	1129	if (op->map->in_memory == MAP_SAVING)
1221	return;	1130	return;
1222		1131
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1225		1133
1226	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)
1227	{	1135	{
1228	/* 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
…		…
1243		1151
1244	tmp->contr->socket.update_look = 1;	1152	tmp->contr->socket.update_look = 1;
1245	}	1153	}
1246		1154
1247	/* See if player moving off should effect something */	1155	/* See if player moving off should effect something */
1248	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))
1249	{	1159	{
1250	move_apply (tmp, op, NULL);	1160	move_apply (tmp, op, NULL);
1251		1161
1252	if (was_destroyed (op, tag))	1162	if (op->destroyed ())
1253	{
1254	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 ());
1255	}
1256	}	1164	}
1257		1165
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1167
1260	if (tmp->above == tmp)	1168	if (tmp->above == tmp)
…		…
1288	* This function goes through all objects below and including top, and	1196	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1197	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1198	* If top is NULL, it is calculated.
1291	* 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
1292	*/	1200	*/
1293
1294	object *	1201	object *
1295	merge_ob (object op, object top)	1202	merge_ob (object op, object top)
1296	{	1203	{
1297	if (!op->nrof)	1204	if (!op->nrof)
1298	return 0;	1205	return 0;
…		…
1314	free_object (op);	1221	free_object (op);
1315	return top;	1222	return top;
1316	}	1223	}
1317	}	1224	}
1318		1225
1319	return NULL;	1226	return 0;
1320	}	1227	}
1321		1228
1322	/*	1229	/*
1323	* 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
1324	* job preparing multi-part monsters	1231	* job preparing multi-part monsters
1325	*/	1232	*/
1326	object *	1233	object *
1327	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)
1328	{	1235	{
1329	object *tmp;	1236	object *tmp;
1330		1237
1331	if (op->head)	1238	if (op->head)
1332	op = op->head;	1239	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1267	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1268	* just 'op' otherwise
1362	*/	1269	*/
1363		1270
1364	object *	1271	object *
1365	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)
1366	{	1273	{
1367	object tmp, top, *floor = NULL;	1274	object tmp, top, *floor = NULL;
1368	sint16 x, y;	1275	sint16 x, y;
1369		1276
1370	if (QUERY_FLAG (op, FLAG_FREED))	1277	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1280	return NULL;
1374	}	1281	}
1375		1282
1376	if (m == NULL)	1283	if (m == NULL)
1377	{	1284	{
1378	dump_object (op);	1285	char *dump = dump_object (op);
1379	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);
1380	return op;	1288	return op;
1381	}	1289	}
1382		1290
1383	if (out_of_map (m, op->x, op->y))	1291	if (out_of_map (m, op->x, op->y))
1384	{	1292	{
1385	dump_object (op);	1293	char *dump = dump_object (op);
1386	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);
1387	#ifdef MANY_CORES	1295	#ifdef MANY_CORES
1388	/* 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
1389	* 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
1390	* improperly inserted.	1298	* improperly inserted.
1391	*/	1299	*/
1392	abort ();	1300	abort ();
1393	#endif	1301	#endif
		1302	free (dump);
1394	return op;	1303	return op;
1395	}	1304	}
1396		1305
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1306	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1307	{
1399	dump_object (op);	1308	char *dump = dump_object (op);
1400	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);
1401	return op;	1311	return op;
1402	}	1312	}
1403		1313
1404	if (op->more != NULL)	1314	if (op->more != NULL)
1405	{	1315	{
…		…
1651	remove_ob (tmp);	1561	remove_ob (tmp);
1652	free_object (tmp);	1562	free_object (tmp);
1653	}	1563	}
1654	}	1564	}
1655		1565
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1566	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1567
1658	tmp1->x = op->x;	1568	tmp1->x = op->x;
1659	tmp1->y = op->y;	1569	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1570	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1571	}
…		…
1842	tmp, *	1752	tmp, *
1843	otmp;	1753	otmp;
1844		1754
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1756	{
1847	dump_object (op);	1757	char *dump = dump_object (op);
1848	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);
1849	return op;	1760	return op;
1850	}	1761	}
1851		1762
1852	if (where == NULL)	1763	if (where == NULL)
1853	{	1764	{
1854	dump_object (op);	1765	char *dump = dump_object (op);
1855	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);
1856	return op;	1768	return op;
1857	}	1769	}
1858		1770
1859	if (where->head)	1771	if (where->head)
1860	{	1772	{
…		…
1960	*/	1872	*/
1961		1873
1962	int	1874	int
1963	check_move_on (object op, object originator)	1875	check_move_on (object op, object originator)
1964	{	1876	{
1965	object *	1877	object *tmp;
1966	tmp;	1878	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1879	int x = op->x, y = op->y;
1973		1880
1974	MoveType	1881	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1882
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1883	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1884	return 0;
1981
1982	tag = op->count;
1983		1885
1984	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);
1985	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);
1986	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);
1987		1889
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1950	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
2049	((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))
2050	{	1952	{
2051	move_apply (tmp, op, originator);	1953	move_apply (tmp, op, originator);
2052		1954
2053	if (was_destroyed (op, tag))	1955	if (op->destroyed ())
2054	return 1;	1956	return 1;
2055		1957
2056	/* what the person/creature stepped onto has moved the object	1958	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1959	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1960	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1972	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2072	*/	1974	*/
2073		1975
2074	object *	1976	object *
2075	present_arch (const archetype at, mapstruct m, int x, int y)	1977	present_arch (const archetype at, maptile m, int x, int y)
2076	{	1978	{
2077	object *	1979	object *
2078	tmp;	1980	tmp;
2079		1981
2080	if (m == NULL \|\| out_of_map (m, x, y))	1982	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1995	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1996	* The first matching object is returned, or NULL if none.
2095	*/	1997	*/
2096		1998
2097	object *	1999	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	2000	present (unsigned char type, maptile *m, int x, int y)
2099	{	2001	{
2100	object *	2002	object *
2101	tmp;	2003	tmp;
2102		2004
2103	if (out_of_map (m, x, y))	2005	if (out_of_map (m, x, y))
…		…
2243	* 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
2244	* customized, changed states, etc.	2146	* customized, changed states, etc.
2245	*/	2147	*/
2246		2148
2247	int	2149	int
2248	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)
2249	{	2151	{
2250	int	2152	int
2251	i,	2153	i,
2252	index = 0, flag;	2154	index = 0, flag;
2253	static int	2155	static int
…		…
2274	return -1;	2176	return -1;
2275	return altern[RANDOM () % index];	2177	return altern[RANDOM () % index];
2276	}	2178	}
2277		2179
2278	/*	2180	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2181	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2182	* find_free_spot(), but it will search max number of squares.
2281	* 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.
2282	* 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.
2283	*/	2185	*/
2284		2186
2285	int	2187	int
2286	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)
2287	{	2189	{
2288	int	2190	int
2289	i;	2191	i;
2290		2192
2291	for (i = 0; i < SIZEOFFREE; i++)	2193	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* 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
2356	* there is capable of.	2258	* there is capable of.
2357	*/	2259	*/
2358		2260
2359	int	2261	int
2360	find_dir (mapstruct m, int x, int y, object exclude)	2262	find_dir (maptile m, int x, int y, object exclude)
2361	{	2263	{
2362	int	2264	int
2363	i,	2265	i,
2364	max = SIZEOFFREE, mflags;	2266	max = SIZEOFFREE, mflags;
2365		2267
2366	sint16 nx, ny;	2268	sint16 nx, ny;
2367	object *	2269	object *
2368	tmp;	2270	tmp;
2369	mapstruct *	2271	maptile *
2370	mp;	2272	mp;
2371		2273
2372	MoveType blocked, move_type;	2274	MoveType blocked, move_type;
2373		2275
2374	if (exclude && exclude->head)	2276	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2484	* Modified to be map tile aware -.MSW
2583	*/	2485	*/
2584		2486
2585		2487
2586	int	2488	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2489	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2490	{
2589	sint16 dx, dy;	2491	sint16 dx, dy;
2590	int	2492	int
2591	mflags;	2493	mflags;
2592		2494
…		…
2672	if (prev)	2574	if (prev)
2673	prev->more = tmp;	2575	prev->more = tmp;
2674	prev = tmp;	2576	prev = tmp;
2675	}	2577	}
2676		2578
2677	/* copy inventory */
2678	for (item = src->inv; item; item = item->below)	2579	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2580	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2581
2683	return dst;	2582	return dst;
2684	}	2583	}
2685		2584
2686	/* return true if the object was destroyed, 0 otherwise */
2687	int
2688	was_destroyed (const object *op, tag_t old_tag)
2689	{
2690	/* checking for FLAG_FREED isn't necessary, but makes this function more
2691	* robust */
2692	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2693	}
2694
2695	/* GROS - Creates an object using a string representing its content. */	2585	/* GROS - Creates an object using a string representing its content. */
2696
2697	/* 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 */
2698
2699	/* 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, */
2700
2701	/* 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. */
2702
2703	/* 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. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2590	/* Also remember that multiparts objects are not supported for now. */
2706		2591
2707	object *	2592	object *
2708	load_object_str (const char *obstr)	2593	load_object_str (const char *obstr)
2709	{	2594	{
2710	object *	2595	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2596	char filename[MAX_BUF];
2714		2597
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2598	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2599
2717	FILE *
2718	tempfile = fopen (filename, "w");	2600	FILE *tempfile = fopen (filename, "w");
2719		2601
2720	if (tempfile == NULL)	2602	if (tempfile == NULL)
2721	{	2603	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2604	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2605	return NULL;
2724	};	2606	}
		2607
2725	fprintf (tempfile, obstr);	2608	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2609	fclose (tempfile);
2727		2610
2728	op = get_object ();	2611	op = get_object ();
2729		2612
…		…
2743	* returns NULL if no match.	2626	* returns NULL if no match.
2744	*/	2627	*/
2745	object *	2628	object *
2746	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)
2747	{	2630	{
2748	object *	2631	object *tmp;
2749	tmp;
2750		2632
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2633	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2634	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2635	return tmp;
2754		2636
…		…
2762	* do the desired thing.	2644	* do the desired thing.
2763	*/	2645	*/
2764	key_value *	2646	key_value *
2765	get_ob_key_link (const object ob, const char key)	2647	get_ob_key_link (const object ob, const char key)
2766	{	2648	{
2767	key_value *	2649	key_value *link;
2768	link;
2769		2650
2770	for (link = ob->key_values; link != NULL; link = link->next)	2651	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2652	if (link->key == key)
2773	{
2774	return link;	2653	return link;
2775	}
2776	}
2777		2654
2778	return NULL;	2655	return NULL;
2779	}	2656	}
2780		2657
2781	/*	2658	/*
…		…
2786	* The returned string is shared.	2663	* The returned string is shared.
2787	*/	2664	*/
2788	const char *	2665	const char *
2789	get_ob_key_value (const object op, const char const key)	2666	get_ob_key_value (const object op, const char const key)
2790	{	2667	{
2791	key_value *	2668	key_value *link;
2792	link;	2669	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2670
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2671	if (!canonical_key)
2799	{	2672	{
2800	/* 1. There being a field named key on any object	2673	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2674	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2675	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, this object doesn't have this field.	2676	* 3. Therefore, this object doesn't have this field.
2804	*/	2677	*/
2805	return NULL;	2678	return 0;
2806	}	2679	}
2807		2680
2808	/* This is copied from get_ob_key_link() above -	2681	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2682	* only 4 lines, and saves the function call overhead.
2810	*/	2683	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2684	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2685	if (link->key == canonical_key)
2814	{
2815	return link->value;	2686	return link->value;
2816	}	2687
2817	}
2818	return NULL;	2688	return 0;
2819	}	2689	}
2820		2690
2821		2691
2822	/*	2692	/*
2823	* Updates the canonical_key in op to value.	2693	* Updates the canonical_key in op to value.
…		…
2908	{	2778	{
2909	shstr key_ (key);	2779	shstr key_ (key);
2910		2780
2911	return set_ob_key_value_s (op, key_, value, add_key);	2781	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2782	}
		2783
		2784	object::depth_iterator::depth_iterator (object *container)
		2785	: iterator_base (container)
		2786	{
		2787	while (item->inv)
		2788	item = item->inv;
		2789	}
		2790
		2791	void
		2792	object::depth_iterator::next ()
		2793	{
		2794	if (item->below)
		2795	{
		2796	item = item->below;
		2797
		2798	while (item->inv)
		2799	item = item->inv;
		2800	}
		2801	else
		2802	item = item->env;
		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.29 by root, Mon Sep 11 12:38:36 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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC