[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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object objects; / Pointer to the list of used objects */
40	object active_objects; / List of active objects that need to be processed */	39	object active_objects; / List of active objects that need to be processed */
41		40
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
55		131
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object wants, const object has)	134	compare_ob_value_lists_one (const object wants, const object has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object tmp;/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
…		…
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	447	}
437		448
438	/*	449	/*
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	450	* Sets the owner and sets the skill and exp pointers to owner's current
478	* skill and experience objects.	451	* skill and experience objects.
479	*/	452	*/
480	void	453	void
481	set_owner (object op, object owner)	454	object::set_owner (object *owner)
482	{	455	{
483	if (owner == NULL \|\| op == NULL)	456	if (!owner)
484	return;	457	return;
485		458
486	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
487	/* Add a check for ownercounts in here, as I got into an endless loop	460	/* 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	461	* with the fireball owning a poison cloud which then owned the
489	* fireball. I believe that was caused by one of the objects getting	462	* fireball. I believe that was caused by one of the objects getting
490	* freed and then another object replacing it. Since the ownercounts	463	* 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.	464	* didn't match, this check is valid and I believe that cause is valid.
492	*/	465	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
494	owner = owner->owner;	467	owner = owner->owner;
495		468
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;	469	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	}	470	}
536		471
537	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	473	* refcounts and freeing the links.
539	*/	474	*/
…		…
555	{	490	{
556	attachable_base::clear ();	491	attachable_base::clear ();
557		492
558	free_key_values (this);	493	free_key_values (this);
559		494
560	clear_owner (this);	495	owner = 0;
561
562	name = 0;	496	name = 0;
563	name_pl = 0;	497	name_pl = 0;
564	title = 0;	498	title = 0;
565	race = 0;	499	race = 0;
566	slaying = 0;	500	slaying = 0;
567	skill = 0;	501	skill = 0;
568	msg = 0;	502	msg = 0;
569	lore = 0;	503	lore = 0;
570	custom_name = 0;	504	custom_name = 0;
571	materialname = 0;	505	materialname = 0;
		506	contr = 0;
		507	below = 0;
		508	above = 0;
		509	inv = 0;
		510	container = 0;
		511	env = 0;
		512	more = 0;
		513	head = 0;
		514	map = 0;
		515	active_next = 0;
		516	active_prev = 0;
572		517
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574		519
575	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
		521
		522	/* What is not cleared is next, prev, and count */
		523
		524	expmul = 1.0;
		525	face = blank_face;
		526
		527	if (settings.casting_time)
		528	casting_time = -1;
576	}	529	}
577		530
578	void object::clone (object *destination)	531	void object::clone (object *destination)
579	{	532	{
580	(object_copy ) destination = *this;	533	(object_copy )destination = *this;
581	(object_pod ) destination = *this;	534	(object_pod )destination = *this;
582		535
583	if (self \|\| cb)	536	if (self \|\| cb)
584	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	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	}	538	}
618		539
619	/*	540	/*
620	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
621	* and then copies the contends of the first object into the second	542	* and then copies the contends of the first object into the second
622	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
623	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	544	* 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	545	* if the first object is freed, the pointers in the new object
625	* will point at garbage.	546	* will point at garbage.
626	*/	547	*/
627
628	void	548	void
629	copy_object (object op2, object op)	549	copy_object (object op2, object op)
630	{	550	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
692	/*	612	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	613	* 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.	614	* 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.	615	* This function needs to be called whenever the speed of an object changes.
696	*/	616	*/
697
698	void	617	void
699	update_ob_speed (object *op)	618	update_ob_speed (object *op)
700	{	619	{
701	extern int arch_init;	620	extern int arch_init;
702		621
…		…
711	abort ();	630	abort ();
712	#else	631	#else
713	op->speed = 0;	632	op->speed = 0;
714	#endif	633	#endif
715	}	634	}
		635
716	if (arch_init)	636	if (arch_init)
717	{
718	return;	637	return;
719	}	638
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	640	{
722	/* If already on active list, don't do anything */	641	/* If already on active list, don't do anything */
723	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	642	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
724	return;	643	return;
725		644
726	/* process_events() expects us to insert the object at the beginning	645	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	646	* of the list. */
728	op->active_next = active_objects;	647	op->active_next = active_objects;
		648
729	if (op->active_next != NULL)	649	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	650	op->active_next->active_prev = op;
		651
731	active_objects = op;	652	active_objects = op;
732	}	653	}
733	else	654	else
734	{	655	{
735	/* If not on the active list, nothing needs to be done */	656	/* If not on the active list, nothing needs to be done */
…		…
737	return;	658	return;
738		659
739	if (op->active_prev == NULL)	660	if (op->active_prev == NULL)
740	{	661	{
741	active_objects = op->active_next;	662	active_objects = op->active_next;
		663
742	if (op->active_next != NULL)	664	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	665	op->active_next->active_prev = NULL;
744	}	666	}
745	else	667	else
746	{	668	{
747	op->active_prev->active_next = op->active_next;	669	op->active_prev->active_next = op->active_next;
		670
748	if (op->active_next)	671	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	672	op->active_next->active_prev = op->active_prev;
750	}	673	}
		674
751	op->active_next = NULL;	675	op->active_next = NULL;
752	op->active_prev = NULL;	676	op->active_prev = NULL;
753	}	677	}
754	}	678	}
755		679
…		…
901		825
902	if (op->more != NULL)	826	if (op->more != NULL)
903	update_object (op->more, action);	827	update_object (op->more, action);
904	}	828	}
905		829
906	static unordered_vector < object *>mortals;	830	object::vector object::mortals;
907	static	831	object::vector object::objects; // not yet used
908	std::vector < object *>	832	object *object::first;
909	freed;
910		833
911	void object::free_mortals ()	834	void object::free_mortals ()
912	{	835	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
915	{	840	{
916	freed.push_back (*i);	841	delete *i;
917	mortals.erase (i);	842	mortals.erase (i);
918	}	843	}
919	else
920	++i;
921	}	844	}
922		845
923	object::object ()	846	object::object ()
924	{	847	{
925	SET_FLAG (this, FLAG_REMOVED);	848	SET_FLAG (this, FLAG_REMOVED);
926		849
927	expmul = 1.0;	850	expmul = 1.0;
928	face = blank_face;	851	face = blank_face;
929	attacked_by_count = -1;
930	}	852	}
931		853
932	object::~object ()	854	object::~object ()
933	{	855	{
934	free_key_values (this);	856	free_key_values (this);
935	}	857	}
936		858
937	void object::link ()	859	void object::link ()
938	{	860	{
939	count = ++ob_count;	861	count = ++ob_count;
		862	uuid = gen_uuid ();
940		863
941	prev = 0;	864	prev = 0;
942	next = objects;	865	next = object::first;
943		866
944	if (objects)	867	if (object::first)
945	objects->prev = this;	868	object::first->prev = this;
946		869
947	objects = this;	870	object::first = this;
948	}	871	}
949		872
950	void object::unlink ()	873	void object::unlink ()
951	{	874	{
952	count = 0;	875	if (this == object::first)
		876	object::first = next;
953		877
954	/* Remove this object from the list of used objects */	878	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	879	if (prev) prev->next = next;
		880	if (next) next->prev = prev;
		881
958	prev = 0;	882	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	883	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	884	}
970		885
971	object *object::create ()	886	object *object::create ()
972	{	887	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	888	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 ();	889	op->link ();
989	return op;	890	return op;
990	}	891	}
991		892
992	/*	893	/*
…		…
994	* it from the list of used objects, and puts it on the list of	895	* 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.	896	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	897	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	898	* this function to succeed.
998	*	899	*
999	* If free_inventory is set, free inventory as well. Else drop items in	900	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	901	* inventory to the ground.
1001	*/	902	*/
1002	void object::free (bool free_inventory)	903	void object::destroy (bool destroy_inventory)
1003	{	904	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	905	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	906	return;
1006		907
		908	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		909	remove_friendly_object (this);
		910
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))	911	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);	912	remove_ob (this);
1009		913
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);
1012
1013	SET_FLAG (this, FLAG_FREED);	914	SET_FLAG (this, FLAG_FREED);
1014		915
1015	if (more)	916	if (more)
1016	{	917	{
1017	more->free (free_inventory);	918	more->destroy (destroy_inventory);
1018	more = 0;	919	more = 0;
1019	}	920	}
1020		921
1021	if (inv)	922	if (inv)
1022	{	923	{
1023	/* Only if the space blocks everything do we not process -	924	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	925	* if some form of movement is allowed, let objects
1025	* drop on that space.	926	* drop on that space.
1026	*/	927	*/
1027	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	928	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	929	{
1029	object *op = inv;	930	object *op = inv;
1030		931
1031	while (op)	932	while (op)
1032	{	933	{
1033	object *tmp = op->below;	934	object *tmp = op->below;
1034	op->free (free_inventory);	935	op->destroy (destroy_inventory);
1035	op = tmp;	936	op = tmp;
1036	}	937	}
1037	}	938	}
1038	else	939	else
1039	{ /* Put objects in inventory onto this space */	940	{ /* Put objects in inventory onto this space */
…		…
1058	op = tmp;	959	op = tmp;
1059	}	960	}
1060	}	961	}
1061	}	962	}
1062		963
1063	clear_owner (this);	964	// hack to ensure that freed objects still have a valid map
		965	{
		966	static maptile *freed_map; // freed objects are moved here to avoid crashes
		967
		968	if (!freed_map)
		969	{
		970	freed_map = new maptile;
		971
		972	freed_map->name = "/internal/freed_objects_map";
		973	freed_map->width = 3;
		974	freed_map->height = 3;
		975
		976	freed_map->allocate ();
		977	}
		978
		979	map = freed_map;
		980	x = 1;
		981	y = 1;
		982	}
		983
		984	// clear those pointers that likely might have circular references to us
		985	owner = 0;
		986	enemy = 0;
		987	attacked_by = 0;
		988
		989	// only relevant for players(?), but make sure of it anyways
		990	contr = 0;
1064		991
1065	/* Remove object from the active list */	992	/* Remove object from the active list */
1066	speed = 0;	993	speed = 0;
1067	update_ob_speed (this);	994	update_ob_speed (this);
1068		995
…		…
1080	sub_weight (object *op, signed long weight)	1007	sub_weight (object *op, signed long weight)
1081	{	1008	{
1082	while (op != NULL)	1009	while (op != NULL)
1083	{	1010	{
1084	if (op->type == CONTAINER)	1011	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1012	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1013
1088	op->carrying -= weight;	1014	op->carrying -= weight;
1089	op = op->env;	1015	op = op->env;
1090	}	1016	}
1091	}	1017	}
1092		1018
…		…
1100	*/	1026	*/
1101		1027
1102	void	1028	void
1103	remove_ob (object *op)	1029	remove_ob (object *op)
1104	{	1030	{
		1031	object tmp, last = 0;
1105	object *	1032	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1033
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1034	int check_walk_off;
1115	mapstruct *	1035	maptile *m;
1116	m;
1117		1036
1118	sint16	1037	sint16 x, y;
1119	x,
1120	y;
1121		1038
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (op, FLAG_REMOVED))
1123	return;	1040	return;
1124		1041
1125	SET_FLAG (op, FLAG_REMOVED);	1042	SET_FLAG (op, FLAG_REMOVED);
…		…
1202	* use translated coordinates in case some oddness with map tiling is	1119	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1120	* evident
1204	*/	1121	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1122	if (GET_MAP_OB (m, x, y) != op)
1206	{	1123	{
1207	dump_object (op);	1124	char *dump = dump_object (op);
1208	LOG (llevError,	1125	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);	1126	"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);
		1127	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1128	dump = dump_object (GET_MAP_OB (m, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1129	LOG (llevError, "%s\n", dump);
		1130	free (dump);
1212	}	1131	}
1213		1132
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1133	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1215	}	1134	}
1216		1135
…		…
1218	op->below = 0;	1137	op->below = 0;
1219		1138
1220	if (op->map->in_memory == MAP_SAVING)	1139	if (op->map->in_memory == MAP_SAVING)
1221	return;	1140	return;
1222		1141
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1142	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1225		1143
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1144	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1227	{	1145	{
1228	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
…		…
1243		1161
1244	tmp->contr->socket.update_look = 1;	1162	tmp->contr->socket.update_look = 1;
1245	}	1163	}
1246		1164
1247	/* See if player moving off should effect something */	1165	/* 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))	1166	if (check_walk_off
		1167	&& ((op->move_type & tmp->move_off)
		1168	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1169	{
1250	move_apply (tmp, op, NULL);	1170	move_apply (tmp, op, NULL);
1251		1171
1252	if (was_destroyed (op, tag))	1172	if (op->destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1173	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1174	}
1257		1175
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1176	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1177
1260	if (tmp->above == tmp)	1178	if (tmp->above == tmp)
…		…
1288	* This function goes through all objects below and including top, and	1206	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1207	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1208	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1209	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1210	*/
1293
1294	object *	1211	object *
1295	merge_ob (object op, object top)	1212	merge_ob (object op, object top)
1296	{	1213	{
1297	if (!op->nrof)	1214	if (!op->nrof)
1298	return 0;	1215	return 0;
…		…
1314	free_object (op);	1231	free_object (op);
1315	return top;	1232	return top;
1316	}	1233	}
1317	}	1234	}
1318		1235
1319	return NULL;	1236	return 0;
1320	}	1237	}
1321		1238
1322	/*	1239	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1240	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1241	* job preparing multi-part monsters
1325	*/	1242	*/
1326	object *	1243	object *
1327	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1328	{	1245	{
1329	object *tmp;	1246	object *tmp;
1330		1247
1331	if (op->head)	1248	if (op->head)
1332	op = op->head;	1249	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1277	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1278	* just 'op' otherwise
1362	*/	1279	*/
1363		1280
1364	object *	1281	object *
1365	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1282	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1366	{	1283	{
1367	object tmp, top, *floor = NULL;	1284	object tmp, top, *floor = NULL;
1368	sint16 x, y;	1285	sint16 x, y;
1369		1286
1370	if (QUERY_FLAG (op, FLAG_FREED))	1287	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1290	return NULL;
1374	}	1291	}
1375		1292
1376	if (m == NULL)	1293	if (m == NULL)
1377	{	1294	{
1378	dump_object (op);	1295	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1296	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1297	free (dump);
1380	return op;	1298	return op;
1381	}	1299	}
1382		1300
1383	if (out_of_map (m, op->x, op->y))	1301	if (out_of_map (m, op->x, op->y))
1384	{	1302	{
1385	dump_object (op);	1303	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1305	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1306	/* 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	1307	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1308	* improperly inserted.
1391	*/	1309	*/
1392	abort ();	1310	abort ();
1393	#endif	1311	#endif
		1312	free (dump);
1394	return op;	1313	return op;
1395	}	1314	}
1396		1315
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1316	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1317	{
1399	dump_object (op);	1318	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1319	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1320	free (dump);
1401	return op;	1321	return op;
1402	}	1322	}
1403		1323
1404	if (op->more != NULL)	1324	if (op->more != NULL)
1405	{	1325	{
…		…
1651	remove_ob (tmp);	1571	remove_ob (tmp);
1652	free_object (tmp);	1572	free_object (tmp);
1653	}	1573	}
1654	}	1574	}
1655		1575
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1576	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1577
1658	tmp1->x = op->x;	1578	tmp1->x = op->x;
1659	tmp1->y = op->y;	1579	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1580	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1581	}
…		…
1842	tmp, *	1762	tmp, *
1843	otmp;	1763	otmp;
1844		1764
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1765	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1766	{
1847	dump_object (op);	1767	char *dump = dump_object (op);
1848	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1768	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1769	free (dump);
1849	return op;	1770	return op;
1850	}	1771	}
1851		1772
1852	if (where == NULL)	1773	if (where == NULL)
1853	{	1774	{
1854	dump_object (op);	1775	char *dump = dump_object (op);
1855	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1777	free (dump);
1856	return op;	1778	return op;
1857	}	1779	}
1858		1780
1859	if (where->head)	1781	if (where->head)
1860	{	1782	{
…		…
1960	*/	1882	*/
1961		1883
1962	int	1884	int
1963	check_move_on (object op, object originator)	1885	check_move_on (object op, object originator)
1964	{	1886	{
1965	object *	1887	object *tmp;
1966	tmp;	1888	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1889	int x = op->x, y = op->y;
1973		1890
1974	MoveType	1891	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1892
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1893	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1894	return 0;
1981
1982	tag = op->count;
1983		1895
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1896	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);	1897	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);	1898	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1899
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1960	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))	1961	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1962	{
2051	move_apply (tmp, op, originator);	1963	move_apply (tmp, op, originator);
2052		1964
2053	if (was_destroyed (op, tag))	1965	if (op->destroyed ())
2054	return 1;	1966	return 1;
2055		1967
2056	/* what the person/creature stepped onto has moved the object	1968	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1969	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1970	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1982	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1983	* The first matching object is returned, or NULL if none.
2072	*/	1984	*/
2073		1985
2074	object *	1986	object *
2075	present_arch (const archetype at, mapstruct m, int x, int y)	1987	present_arch (const archetype at, maptile m, int x, int y)
2076	{	1988	{
2077	object *	1989	object *
2078	tmp;	1990	tmp;
2079		1991
2080	if (m == NULL \|\| out_of_map (m, x, y))	1992	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	2005	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	2006	* The first matching object is returned, or NULL if none.
2095	*/	2007	*/
2096		2008
2097	object *	2009	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	2010	present (unsigned char type, maptile *m, int x, int y)
2099	{	2011	{
2100	object *	2012	object *
2101	tmp;	2013	tmp;
2102		2014
2103	if (out_of_map (m, x, y))	2015	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2155	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2156	* customized, changed states, etc.
2245	*/	2157	*/
2246		2158
2247	int	2159	int
2248	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2160	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2249	{	2161	{
2250	int	2162	int
2251	i,	2163	i,
2252	index = 0, flag;	2164	index = 0, flag;
2253	static int	2165	static int
…		…
2274	return -1;	2186	return -1;
2275	return altern[RANDOM () % index];	2187	return altern[RANDOM () % index];
2276	}	2188	}
2277		2189
2278	/*	2190	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2191	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2192	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2193	* 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.	2194	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2195	*/
2284		2196
2285	int	2197	int
2286	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2198	find_first_free_spot (const object ob, maptile m, int x, int y)
2287	{	2199	{
2288	int	2200	int
2289	i;	2201	i;
2290		2202
2291	for (i = 0; i < SIZEOFFREE; i++)	2203	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2267	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2268	* there is capable of.
2357	*/	2269	*/
2358		2270
2359	int	2271	int
2360	find_dir (mapstruct m, int x, int y, object exclude)	2272	find_dir (maptile m, int x, int y, object exclude)
2361	{	2273	{
2362	int	2274	int
2363	i,	2275	i,
2364	max = SIZEOFFREE, mflags;	2276	max = SIZEOFFREE, mflags;
2365		2277
2366	sint16 nx, ny;	2278	sint16 nx, ny;
2367	object *	2279	object *
2368	tmp;	2280	tmp;
2369	mapstruct *	2281	maptile *
2370	mp;	2282	mp;
2371		2283
2372	MoveType blocked, move_type;	2284	MoveType blocked, move_type;
2373		2285
2374	if (exclude && exclude->head)	2286	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2494	* Modified to be map tile aware -.MSW
2583	*/	2495	*/
2584		2496
2585		2497
2586	int	2498	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2499	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2500	{
2589	sint16 dx, dy;	2501	sint16 dx, dy;
2590	int	2502	int
2591	mflags;	2503	mflags;
2592		2504
…		…
2672	if (prev)	2584	if (prev)
2673	prev->more = tmp;	2585	prev->more = tmp;
2674	prev = tmp;	2586	prev = tmp;
2675	}	2587	}
2676		2588
2677	/* copy inventory */
2678	for (item = src->inv; item; item = item->below)	2589	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2590	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2591
2683	return dst;	2592	return dst;
2684	}	2593	}
2685		2594
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. */	2595	/* 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 */	2596	/* 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, */	2597	/* 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. */	2598	/* 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. */	2599	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2600	/* Also remember that multiparts objects are not supported for now. */
2706		2601
2707	object *	2602	object *
2708	load_object_str (const char *obstr)	2603	load_object_str (const char *obstr)
2709	{	2604	{
2710	object *	2605	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2606	char filename[MAX_BUF];
2714		2607
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2608	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2609
2717	FILE *
2718	tempfile = fopen (filename, "w");	2610	FILE *tempfile = fopen (filename, "w");
2719		2611
2720	if (tempfile == NULL)	2612	if (tempfile == NULL)
2721	{	2613	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2614	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2615	return NULL;
2724	};	2616	}
		2617
2725	fprintf (tempfile, obstr);	2618	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2619	fclose (tempfile);
2727		2620
2728	op = get_object ();	2621	op = get_object ();
2729		2622
…		…
2743	* returns NULL if no match.	2636	* returns NULL if no match.
2744	*/	2637	*/
2745	object *	2638	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2639	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2640	{
2748	object *	2641	object *tmp;
2749	tmp;
2750		2642
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2643	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2644	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2645	return tmp;
2754		2646
…		…
2762	* do the desired thing.	2654	* do the desired thing.
2763	*/	2655	*/
2764	key_value *	2656	key_value *
2765	get_ob_key_link (const object ob, const char key)	2657	get_ob_key_link (const object ob, const char key)
2766	{	2658	{
2767	key_value *	2659	key_value *link;
2768	link;
2769		2660
2770	for (link = ob->key_values; link != NULL; link = link->next)	2661	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2662	if (link->key == key)
2773	{
2774	return link;	2663	return link;
2775	}
2776	}
2777		2664
2778	return NULL;	2665	return NULL;
2779	}	2666	}
2780		2667
2781	/*	2668	/*
…		…
2786	* The returned string is shared.	2673	* The returned string is shared.
2787	*/	2674	*/
2788	const char *	2675	const char *
2789	get_ob_key_value (const object op, const char const key)	2676	get_ob_key_value (const object op, const char const key)
2790	{	2677	{
2791	key_value *	2678	key_value *link;
2792	link;	2679	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2680
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2681	if (!canonical_key)
2799	{	2682	{
2800	/* 1. There being a field named key on any object	2683	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2684	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2685	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, this object doesn't have this field.	2686	* 3. Therefore, this object doesn't have this field.
2804	*/	2687	*/
2805	return NULL;	2688	return 0;
2806	}	2689	}
2807		2690
2808	/* This is copied from get_ob_key_link() above -	2691	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2692	* only 4 lines, and saves the function call overhead.
2810	*/	2693	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2694	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2695	if (link->key == canonical_key)
2814	{
2815	return link->value;	2696	return link->value;
2816	}	2697
2817	}
2818	return NULL;	2698	return 0;
2819	}	2699	}
2820		2700
2821		2701
2822	/*	2702	/*
2823	* Updates the canonical_key in op to value.	2703	* Updates the canonical_key in op to value.
…		…
2908	{	2788	{
2909	shstr key_ (key);	2789	shstr key_ (key);
2910		2790
2911	return set_ob_key_value_s (op, key_, value, add_key);	2791	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2792	}
		2793
		2794	object::depth_iterator::depth_iterator (object *container)
		2795	: iterator_base (container)
		2796	{
		2797	while (item->inv)
		2798	item = item->inv;
		2799	}
		2800
		2801	void
		2802	object::depth_iterator::next ()
		2803	{
		2804	if (item->below)
		2805	{
		2806	item = item->below;
		2807
		2808	while (item->inv)
		2809	item = item->inv;
		2810	}
		2811	else
		2812	item = item->env;
		2813	}
		2814
		2815	// return a suitable string describing an objetc in enough detail to find it
		2816	const char *
		2817	object::debug_desc (char *info) const
		2818	{
		2819	char info2[256 * 3];
		2820	char *p = info;
		2821
		2822	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2823	count,
		2824	&name,
		2825	title ? " " : "",
		2826	title ? (const char *)title : "");
		2827
		2828	if (env)
		2829	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2830
		2831	if (map)
		2832	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2833
		2834	return info;
		2835	}
		2836
		2837	const char *
		2838	object::debug_desc () const
		2839	{
		2840	static char info[256 * 3];
		2841	return debug_desc (info);
		2842	}
		2843

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.58 by pippijn, Mon Dec 4 17:48:35 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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC