ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.57 by root, Sun Dec 3 02:46:33 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
43	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
44		38
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		40
48	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,
49	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
50	};	43	};
…		…
56	};	49	};
57	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
58	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,
59	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
60	};	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	}
61		131
62	/* 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. */
63	static int	133	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	135	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	285	return 0;
216		286
217	switch (ob1->type)	287	switch (ob1->type)
218	{	288	{
219	case SCROLL:	289	case SCROLL:
220	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
221	return 0;	291	return 0;
222	break;	292	break;
223	}	293	}
224		294
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	296	{
227	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
249	/*	319	/*
250	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
253	*/	323	*/
254	signed long	324	long
255	sum_weight (object *op)	325	sum_weight (object *op)
256	{	326	{
257	signed long sum;	327	long sum;
258	object *inv;	328	object *inv;
259		329
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	331	{
262	if (inv->inv)	332	if (inv->inv)
263	sum_weight (inv);	333	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	335	}
		336
266	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
268	if (op->carrying != sum)	340	if (op->carrying != sum)
269	op->carrying = sum;	341	op->carrying = sum;
		342
270	return sum;	343	return sum;
271	}	344	}
272		345
273	/**	346	/**
274	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	375	* Some error messages.
303	* 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.
304	*/	377	*/
305		378
306	void	379	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	380	dump_object (object *op)
362	{	381	{
363	if (op == NULL)	382	if (!op)
364	{	383	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		384
372	void	385	object_freezer freezer;
373	dump_all_objects (void)	386	save_object (freezer, op, 3);
374	{	387	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	388	}
383		389
384	/*	390	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
406	*/	412	*/
407		413
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	418	if (op->count == i)
415	break;	419	return op;
		420
416	return op;	421	return 0;
417	}	422	}
418		423
419	/*	424	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
423	*/	428	*/
424		429
425	object *	430	object *
426	find_object_name (const char *str)	431	find_object_name (const char *str)
427	{	432	{
428	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
429	object *op;	434	object *op;
430		435
431	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	437	if (op->name == str_)
433	break;	438	break;
434		439
435	return op;	440	return op;
436	}	441	}
437		442
…		…
440	{	445	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	447	}
443		448
444	/*	449	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* 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
484	* skill and experience objects.	451	* skill and experience objects.
485	*/	452	*/
486	void	453	void
487	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
488	{	455	{
489	if (owner == NULL || op == NULL)	456	if (!owner)
490	return;	457	return;
491		458
492	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	463	* freed and then another object replacing it. Since the ownercounts
497	* 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.
498	*/	465	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
500	owner = owner->owner;	467	owner = owner->owner;
501		468
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	469	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	470	}
542		471
543	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	473	* refcounts and freeing the links.
545	*/	474	*/
…		…
561	{	490	{
562	attachable_base::clear ();	491	attachable_base::clear ();
563		492
564	free_key_values (this);	493	free_key_values (this);
565		494
566	clear_owner (this);	495	owner = 0;
567
568	name = 0;	496	name = 0;
569	name_pl = 0;	497	name_pl = 0;
570	title = 0;	498	title = 0;
571	race = 0;	499	race = 0;
572	slaying = 0;	500	slaying = 0;
573	skill = 0;	501	skill = 0;
574	msg = 0;	502	msg = 0;
575	lore = 0;	503	lore = 0;
576	custom_name = 0;	504	custom_name = 0;
577	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;
578		517
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		519
581	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;
582	}	529	}
583		530
584	void object::clone (object *destination)	531	void object::clone (object *destination)
585	{	532	{
586	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
588		535
589	if (self || cb)	536	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	538	}
624		539
625	/*	540	/*
626	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
627	* 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
628	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
629	* 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,
630	* 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
631	* will point at garbage.	546	* will point at garbage.
632	*/	547	*/
633
634	void	548	void
635	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
636	{	550	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	612	/*
699	* 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
700	* 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.
701	* 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.
702	*/	616	*/
703
704	void	617	void
705	update_ob_speed (object *op)	618	update_ob_speed (object *op)
706	{	619	{
707	extern int arch_init;	620	extern int arch_init;
708		621
…		…
717	abort ();	630	abort ();
718	#else	631	#else
719	op->speed = 0;	632	op->speed = 0;
720	#endif	633	#endif
721	}	634	}
		635
722	if (arch_init)	636	if (arch_init)
723	{
724	return;	637	return;
725	}	638
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	640	{
728	/* If already on active list, don't do anything */	641	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	642	if (op->active_next || op->active_prev || op == active_objects)
730	return;	643	return;
731		644
732	/* process_events() expects us to insert the object at the beginning	645	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	646	* of the list. */
734	op->active_next = active_objects;	647	op->active_next = active_objects;
		648
735	if (op->active_next != NULL)	649	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	650	op->active_next->active_prev = op;
		651
737	active_objects = op;	652	active_objects = op;
738	}	653	}
739	else	654	else
740	{	655	{
741	/* If not on the active list, nothing needs to be done */	656	/* If not on the active list, nothing needs to be done */
…		…
743	return;	658	return;
744		659
745	if (op->active_prev == NULL)	660	if (op->active_prev == NULL)
746	{	661	{
747	active_objects = op->active_next;	662	active_objects = op->active_next;
		663
748	if (op->active_next != NULL)	664	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	665	op->active_next->active_prev = NULL;
750	}	666	}
751	else	667	else
752	{	668	{
753	op->active_prev->active_next = op->active_next;	669	op->active_prev->active_next = op->active_next;
		670
754	if (op->active_next)	671	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	672	op->active_next->active_prev = op->active_prev;
756	}	673	}
		674
757	op->active_next = NULL;	675	op->active_next = NULL;
758	op->active_prev = NULL;	676	op->active_prev = NULL;
759	}	677	}
760	}	678	}
761		679
…		…
891	/* if the object is being removed, we can't make intelligent	809	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	810	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	811	* that is being removed.
894	*/	812	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	814	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	815	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	816	/* Nothing to do for that case */ ;
902	}
903	else	817	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	818	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		819
908	if (update_now)	820	if (update_now)
909	{	821	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	823	update_position (op->map, op->x, op->y);
…		…
913		825
914	if (op->more != NULL)	826	if (op->more != NULL)
915	update_object (op->more, action);	827	update_object (op->more, action);
916	}	828	}
917		829
918	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
919	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
920		833
921	void object::free_mortals ()	834	void object::free_mortals ()
922	{	835	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
925	{	840	{
926	freed.push_back (*i);	841	delete *i;
927	mortals.erase (i);	842	mortals.erase (i);
928	}	843	}
929	else	844
930	++i;	845	static int lastmortals = 0;//D
		846
		847	if (mortals.size() != lastmortals && lastmortals > 100)//D
		848	{
		849	lastmortals = mortals.size ();//D
		850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		851	}
931	}	852	}
932		853
933	object::object ()	854	object::object ()
934	{	855	{
935	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
936		857
937	expmul = 1.0;	858	expmul = 1.0;
938	face = blank_face;	859	face = blank_face;
939	attacked_by_count = -1;
940	}	860	}
941		861
942	object::~object ()	862	object::~object ()
943	{	863	{
944	free_key_values (this);	864	free_key_values (this);
945	}	865	}
946		866
947	void object::link ()	867	void object::link ()
948	{	868	{
949	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
950		871
951	prev = 0;	872	prev = 0;
952	next = objects;	873	next = object::first;
953		874
954	if (objects)	875	if (object::first)
955	objects->prev = this;	876	object::first->prev = this;
956		877
957	objects = this;	878	object::first = this;
958	}	879	}
959		880
960	void object::unlink ()	881	void object::unlink ()
961	{	882	{
962	count = 0;	883	if (this == object::first)
		884	object::first = next;
963		885
964	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	887	if (prev) prev->next = next;
		888	if (next) next->prev = prev;
		889
968	prev = 0;	890	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	891	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	892	}
980		893
981	object *object::create ()	894	object *object::create ()
982	{	895	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	896	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	897	op->link ();
996	return op;	898	return op;
997	}	899	}
998		900
999	/*	901	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	903	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	906	* this function to succeed.
1005	*	907	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	908	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	909	* inventory to the ground.
1008	*/	910	*/
1009	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
1010	{	912	{
		913	if (QUERY_FLAG (this, FLAG_FREED))
		914	return;
		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	920	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		921
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	922	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		923
1033	if (more)	924	if (more)
1034	{	925	{
1035	more->free (free_inventory);	926	more->destroy (destroy_inventory);
1036	more = 0;	927	more = 0;
1037	}	928	}
1038		929
1039	if (inv)	930	if (inv)
1040	{	931	{
1041	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
1043	* drop on that space.	934	* drop on that space.
1044	*/	935	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	936	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	937	{
1047	object *	938	object *op = inv;
1048	op = inv;
1049		939
1050	while (op)	940	while (op)
1051	{	941	{
1052	object *
1053	tmp = op->below;	942	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	943	op->destroy (destroy_inventory);
1057	op = tmp;	944	op = tmp;
1058	}	945	}
1059	}	946	}
1060	else	947	else
1061	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
1062	object *	949	object *op = inv;
1063	op = inv;
1064		950
1065	while (op)	951	while (op)
1066	{	952	{
1067	object *
1068	tmp = op->below;	953	object *tmp = op->below;
1069		954
1070	remove_ob (op);	955	remove_ob (op);
1071		956
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	958	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	967	op = tmp;
1083	}	968	}
1084	}	969	}
1085	}	970	}
1086		971
1087	clear_owner (this);	972	// hack to ensure that freed objects still have a valid map
		973	{
		974	static maptile *freed_map; // freed objects are moved here to avoid crashes
		975
		976	if (!freed_map)
		977	{
		978	freed_map = new maptile;
		979
		980	freed_map->name = "/internal/freed_objects_map";
		981	freed_map->width = 3;
		982	freed_map->height = 3;
		983
		984	freed_map->allocate ();
		985	}
		986
		987	map = freed_map;
		988	x = 1;
		989	y = 1;
		990	}
		991
		992	// clear those pointers that likely might have circular references to us
		993	owner = 0;
		994	enemy = 0;
		995	attacked_by = 0;
		996
		997	// only relevant for players(?), but make sure of it anyways
		998	contr = 0;
1088		999
1089	/* Remove object from the active list */	1000	/* Remove object from the active list */
1090	speed = 0;	1001	speed = 0;
1091	update_ob_speed (this);	1002	update_ob_speed (this);
1092		1003
1093	unlink ();	1004	unlink ();
1094		1005
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1006	mortals.push_back (this);
1098	}	1007	}
1099		1008
1100	/*	1009	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1010	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1106	sub_weight (object *op, signed long weight)	1015	sub_weight (object *op, signed long weight)
1107	{	1016	{
1108	while (op != NULL)	1017	while (op != NULL)
1109	{	1018	{
1110	if (op->type == CONTAINER)	1019	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1021
1114	op->carrying -= weight;	1022	op->carrying -= weight;
1115	op = op->env;	1023	op = op->env;
1116	}	1024	}
1117	}	1025	}
1118		1026
…		…
1126	*/	1034	*/
1127		1035
1128	void	1036	void
1129	remove_ob (object *op)	1037	remove_ob (object *op)
1130	{	1038	{
		1039	object *tmp, *last = 0;
1131	object *	1040	object *otmp;
1132	tmp, *	1041
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1042	int check_walk_off;
1140	mapstruct *	1043	maptile *m;
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1044
		1045	sint16 x, y;
1146		1046
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1047	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1048	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1049
1152	/* Changed it to always dump core in this case. As has been learned	1050	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1051
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1052	if (op->more != NULL)
1165	remove_ob (op->more);	1053	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1054
1169	/*	1055	/*
1170	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1171	* inventory.	1057	* inventory.
1172	*/	1058	*/
…		…
1198	*/	1084	*/
1199	op->x = op->env->x, op->y = op->env->y;	1085	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1086	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1087	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1088	op->env = NULL;
1203	return;	1089	}
		1090	else if (op->map)
1204	}	1091	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1092	x = op->x;
1211	y = op->y;	1093	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1094	m = get_map_from_coord (op->map, &x, &y);
1213		1095
1214	if (!m)	1096	if (!m)
1215	{	1097	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1098	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1099	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1100	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1101	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1102	* screwed up and should be fixed.
		1103	*/
		1104	abort ();
		1105	}
		1106
		1107	if (op->map != m)
		1108	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1109	op->map->path, m->path, op->x, op->y, x, y);
		1110
		1111	/* Re did the following section of code - it looks like it had
		1112	* lots of logic for things we no longer care about
1221	*/	1113	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1114
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1115	/* link the object above us */
1235	if (op->above)	1116	if (op->above)
1236	op->above->below = op->below;	1117	op->above->below = op->below;
1237	else	1118	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1119	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1120
1240	/* Relink the object below us, if there is one */	1121	/* Relink the object below us, if there is one */
1241	if (op->below)	1122	if (op->below)
1242	{
1243	op->below->above = op->above;	1123	op->below->above = op->above;
1244	}
1245	else	1124	else
1246	{	1125	{
1247	/* Nothing below, which means we need to relink map object for this space	1126	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1127	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1128	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1129	*/
1281	if (tmp->container == op)	1130	if (GET_MAP_OB (m, x, y) != op)
1282	{	1131	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1132	char *dump = dump_object (op);
1284	tmp->container = NULL;	1133	LOG (llevError,
		1134	"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);
		1135	free (dump);
		1136	dump = dump_object (GET_MAP_OB (m, x, y));
		1137	LOG (llevError, "%s\n", dump);
		1138	free (dump);
1285	}	1139	}
1286	tmp->contr->socket.update_look = 1;	1140
1287	}	1141	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1142	}
1291		1143
1292	move_apply (tmp, op, NULL);	1144	op->above = 0;
1293	if (was_destroyed (op, tag))	1145	op->below = 0;
		1146
		1147	if (op->map->in_memory == MAP_SAVING)
		1148	return;
		1149
		1150	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1151
		1152	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1153	{
		1154	/* No point updating the players look faces if he is the object
		1155	* being removed.
		1156	*/
		1157
		1158	if (tmp->type == PLAYER && tmp != op)
1294	{	1159	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1160	/* If a container that the player is currently using somehow gets
		1161	* removed (most likely destroyed), update the player view
		1162	* appropriately.
		1163	*/
		1164	if (tmp->container == op)
		1165	{
		1166	CLEAR_FLAG (op, FLAG_APPLIED);
		1167	tmp->container = NULL;
		1168	}
		1169
		1170	tmp->contr->socket.update_look = 1;
1296	}	1171	}
		1172
		1173	/* See if player moving off should effect something */
		1174	if (check_walk_off
		1175	&& ((op->move_type & tmp->move_off)
		1176	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1177	{
		1178	move_apply (tmp, op, NULL);
		1179
		1180	if (op->destroyed ())
		1181	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1297	}	1182	}
1298		1183
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1184	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1185
1301	if (tmp->above == tmp)	1186	if (tmp->above == tmp)
1302	tmp->above = NULL;	1187	tmp->above = NULL;
		1188
1303	last = tmp;	1189	last = tmp;
1304	}	1190	}
		1191
1305	/* last == NULL of there are no objects on this space */	1192	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1193	if (last == NULL)
1307	{	1194	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1195	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1196	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1197	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1198	* be correct anyways.
1312	*/	1199	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1200	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1201	update_position (op->map, op->x, op->y);
1315	}	1202	}
1316	else	1203	else
1317	update_object (last, UP_OBJ_REMOVE);	1204	update_object (last, UP_OBJ_REMOVE);
1318		1205
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1206	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1207	update_all_los (op->map, op->x, op->y);
1321		1208	}
1322	}	1209	}
1323		1210
1324	/*	1211	/*
1325	* merge_ob(op,top):	1212	* merge_ob(op,top):
1326	*	1213	*
1327	* This function goes through all objects below and including top, and	1214	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1215	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1216	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1217	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1218	*/
1332
1333	object *	1219	object *
1334	merge_ob (object *op, object *top)	1220	merge_ob (object *op, object *top)
1335	{	1221	{
1336	if (!op->nrof)	1222	if (!op->nrof)
1337	return 0;	1223	return 0;
		1224
1338	if (top == NULL)	1225	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1226	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1227
1340	for (; top != NULL; top = top->below)	1228	for (; top != NULL; top = top->below)
1341	{	1229	{
1342	if (top == op)	1230	if (top == op)
1343	continue;	1231	continue;
1344	if (CAN_MERGE (op, top))	1232	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1238	remove_ob (op);
1351	free_object (op);	1239	free_object (op);
1352	return top;	1240	return top;
1353	}	1241	}
1354	}	1242	}
		1243
1355	return NULL;	1244	return 0;
1356	}	1245	}
1357		1246
1358	/*	1247	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1248	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1249	* job preparing multi-part monsters
1361	*/	1250	*/
1362	object *	1251	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1252	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1253	{
1365	object *	1254	object *tmp;
1366	tmp;
1367		1255
1368	if (op->head)	1256	if (op->head)
1369	op = op->head;	1257	op = op->head;
		1258
1370	for (tmp = op; tmp; tmp = tmp->more)	1259	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1260	{
1372	tmp->x = x + tmp->arch->clone.x;	1261	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1262	tmp->y = y + tmp->arch->clone.y;
1374	}	1263	}
		1264
1375	return insert_ob_in_map (op, m, originator, flag);	1265	return insert_ob_in_map (op, m, originator, flag);
1376	}	1266	}
1377		1267
1378	/*	1268	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1269	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1285	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1286	* just 'op' otherwise
1397	*/	1287	*/
1398		1288
1399	object *	1289	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1290	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1291	{
1402	object *tmp, *top, *floor = NULL;	1292	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1293	sint16 x, y;
1404		1294
1405	if (QUERY_FLAG (op, FLAG_FREED))	1295	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1298	return NULL;
1409	}	1299	}
1410		1300
1411	if (m == NULL)	1301	if (m == NULL)
1412	{	1302	{
1413	dump_object (op);	1303	char *dump = dump_object (op);
1414	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1305	free (dump);
1415	return op;	1306	return op;
1416	}	1307	}
1417		1308
1418	if (out_of_map (m, op->x, op->y))	1309	if (out_of_map (m, op->x, op->y))
1419	{	1310	{
1420	dump_object (op);	1311	char *dump = dump_object (op);
1421	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1312	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1422	#ifdef MANY_CORES	1313	#ifdef MANY_CORES
1423	/* Better to catch this here, as otherwise the next use of this object	1314	/* Better to catch this here, as otherwise the next use of this object
1424	* is likely to cause a crash. Better to find out where it is getting	1315	* is likely to cause a crash. Better to find out where it is getting
1425	* improperly inserted.	1316	* improperly inserted.
1426	*/	1317	*/
1427	abort ();	1318	abort ();
1428	#endif	1319	#endif
		1320	free (dump);
1429	return op;	1321	return op;
1430	}	1322	}
1431		1323
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1324	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1325	{
1434	dump_object (op);	1326	char *dump = dump_object (op);
1435	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1327	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1328	free (dump);
1436	return op;	1329	return op;
1437	}	1330	}
1438		1331
1439	if (op->more != NULL)	1332	if (op->more != NULL)
1440	{	1333	{
1441	/* The part may be on a different map. */	1334	/* The part may be on a different map. */
1442		1335
1443	object *
1444	more = op->more;	1336	object *more = op->more;
1445		1337
1446	/* We really need the caller to normalize coordinates - if	1338	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1339	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1340	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1341	* is clear wrong do we normalize it.
1450	*/	1342	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1343	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1344	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1345	else if (!more->map)
1456	{	1346	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1347	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1348	* more->map should always point to the parent.
1459	*/	1349	*/
…		…
1462		1352
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1353	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1354	{
1465	if (!op->head)	1355	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1356	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1357
1467	return NULL;	1358	return NULL;
1468	}	1359	}
1469	}	1360	}
1470		1361
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1362	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1427
1537	while (top != NULL)	1428	while (top != NULL)
1538	{	1429	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1430	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1431	floor = top;
		1432
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1433	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1434	{
1543	/* We insert above top, so we want this object below this */	1435	/* We insert above top, so we want this object below this */
1544	top = top->below;	1436	top = top->below;
1545	break;	1437	break;
1546	}	1438	}
		1439
1547	last = top;	1440	last = top;
1548	top = top->above;	1441	top = top->above;
1549	}	1442	}
		1443
1550	/* Don't want top to be NULL, so set it to the last valid object */	1444	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1445	top = last;
1552		1446
1553	/* We let update_position deal with figuring out what the space	1447	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1448	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1527	* of effect may be sufficient.
1634	*/	1528	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1529	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1530	update_all_los (op->map, op->x, op->y);
1637		1531
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1532	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1533	update_object (op, UP_OBJ_INSERT);
1641
1642		1534
1643	/* Don't know if moving this to the end will break anything. However,	1535	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1536	* we want to have update_look set above before calling this.
1645	*	1537	*
1646	* check_move_on() must be after this because code called from	1538	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1563	* op is the object to insert it under: supplies x and the map.
1672	*/	1564	*/
1673	void	1565	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1566	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1567	{
1676	object *tmp;	1568	object *
		1569	tmp;
1677	object *tmp1;	1570	object *
		1571	tmp1;
1678		1572
1679	/* first search for itself and remove any old instances */	1573	/* first search for itself and remove any old instances */
1680		1574
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1575	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1576	{
…		…
1685	remove_ob (tmp);	1579	remove_ob (tmp);
1686	free_object (tmp);	1580	free_object (tmp);
1687	}	1581	}
1688	}	1582	}
1689		1583
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1584	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1585
1692	tmp1->x = op->x;	1586	tmp1->x = op->x;
1693	tmp1->y = op->y;	1587	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1588	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1589	}
…		…
1713	if (orig_ob->nrof < nr)	1607	if (orig_ob->nrof < nr)
1714	{	1608	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1609	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1610	return NULL;
1717	}	1611	}
		1612
1718	newob = object_create_clone (orig_ob);	1613	newob = object_create_clone (orig_ob);
		1614
1719	if ((orig_ob->nrof -= nr) < 1)	1615	if ((orig_ob->nrof -= nr) < 1)
1720	{	1616	{
1721	if (!is_removed)	1617	if (!is_removed)
1722	remove_ob (orig_ob);	1618	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1619	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1627	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1628	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1629	return NULL;
1734	}	1630	}
1735	}	1631	}
		1632
1736	newob->nrof = nr;	1633	newob->nrof = nr;
1737		1634
1738	return newob;	1635	return newob;
1739	}	1636	}
1740		1637
…		…
1747	*/	1644	*/
1748		1645
1749	object *	1646	object *
1750	decrease_ob_nr (object *op, uint32 i)	1647	decrease_ob_nr (object *op, uint32 i)
1751	{	1648	{
1752	object *	1649	object *tmp;
1753	tmp;
1754	player *	1650	player *pl;
1755	pl;
1756		1651
1757	if (i == 0) /* objects with op->nrof require this check */	1652	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1653	return op;
1759		1654
1760	if (i > op->nrof)	1655	if (i > op->nrof)
1761	i = op->nrof;	1656	i = op->nrof;
1762		1657
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1658	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1659	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1660	else if (op->env != NULL)
1768	{	1661	{
1769	/* is this object in the players inventory, or sub container	1662	/* is this object in the players inventory, or sub container
1770	* therein?	1663	* therein?
1771	*/	1664	*/
…		…
1806	}	1699	}
1807	}	1700	}
1808	}	1701	}
1809	else	1702	else
1810	{	1703	{
1811	object *
1812	above = op->above;	1704	object *above = op->above;
1813		1705
1814	if (i < op->nrof)	1706	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1707	op->nrof -= i;
1817	}
1818	else	1708	else
1819	{	1709	{
1820	remove_ob (op);	1710	remove_ob (op);
1821	op->nrof = 0;	1711	op->nrof = 0;
1822	}	1712	}
		1713
1823	/* Since we just removed op, op->above is null */	1714	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1715	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1716	if (tmp->type == PLAYER)
1826	{	1717	{
1827	if (op->nrof)	1718	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1721	esrv_del_item (tmp->contr, op->count);
1831	}	1722	}
1832	}	1723	}
1833		1724
1834	if (op->nrof)	1725	if (op->nrof)
1835	{
1836	return op;	1726	return op;
1837	}
1838	else	1727	else
1839	{	1728	{
1840	free_object (op);	1729	free_object (op);
1841	return NULL;	1730	return NULL;
1842	}	1731	}
…		…
1851	add_weight (object *op, signed long weight)	1740	add_weight (object *op, signed long weight)
1852	{	1741	{
1853	while (op != NULL)	1742	while (op != NULL)
1854	{	1743	{
1855	if (op->type == CONTAINER)	1744	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1745	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1746
1859	op->carrying += weight;	1747	op->carrying += weight;
1860	op = op->env;	1748	op = op->env;
1861	}	1749	}
1862	}	1750	}
1863		1751
…		…
1882	tmp, *	1770	tmp, *
1883	otmp;	1771	otmp;
1884		1772
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1773	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1774	{
1887	dump_object (op);	1775	char *dump = dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1777	free (dump);
1889	return op;	1778	return op;
1890	}	1779	}
		1780
1891	if (where == NULL)	1781	if (where == NULL)
1892	{	1782	{
1893	dump_object (op);	1783	char *dump = dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1784	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1785	free (dump);
1895	return op;	1786	return op;
1896	}	1787	}
		1788
1897	if (where->head)	1789	if (where->head)
1898	{	1790	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1791	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1792	where = where->head;
1901	}	1793	}
		1794
1902	if (op->more)	1795	if (op->more)
1903	{	1796	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1797	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1798	return op;
1906	}	1799	}
		1800
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1801	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1802	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1803	if (op->nrof)
1910	{	1804	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1805	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1996	*/	1890	*/
1997		1891
1998	int	1892	int
1999	check_move_on (object *op, object *originator)	1893	check_move_on (object *op, object *originator)
2000	{	1894	{
2001	object *	1895	object *tmp;
2002	tmp;	1896	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1897	int x = op->x, y = op->y;
2009	MoveType	1898
2010	move_on,	1899	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1900
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1901	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1902	return 0;
2016
2017	tag = op->count;
2018		1903
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1904	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1905	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1906	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1907
…		…
2047	* we don't need to check all of them.	1932	* we don't need to check all of them.
2048	*/	1933	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1934	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1935	break;
2051	}	1936	}
		1937
2052	for (; tmp != NULL; tmp = tmp->below)	1938	for (; tmp; tmp = tmp->below)
2053	{	1939	{
2054	if (tmp == op)	1940	if (tmp == op)
2055	continue; /* Can't apply yourself */	1941	continue; /* Can't apply yourself */
2056		1942
2057	/* Check to see if one of the movement types should be slowed down.	1943	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1951	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1952	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1953	{
2068		1954
2069	float	1955	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1956	diff = tmp->move_slow_penalty * FABS (op->speed);
		1957
2073	if (op->type == PLAYER)	1958	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1959	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1960	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1961	diff /= 4.0;
2079	}	1962
2080	}
2081	op->speed_left -= diff;	1963	op->speed_left -= diff;
2082	}	1964	}
2083	}	1965	}
2084		1966
2085	/* Basically same logic as above, except now for actual apply. */	1967	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1968	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1969	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1970	{
2089
2090	move_apply (tmp, op, originator);	1971	move_apply (tmp, op, originator);
		1972
2091	if (was_destroyed (op, tag))	1973	if (op->destroyed ())
2092	return 1;	1974	return 1;
2093		1975
2094	/* what the person/creature stepped onto has moved the object	1976	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1977	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1978	* have a feeling strange problems would result.
2097	*/	1979	*/
2098	if (op->map != m || op->x != x || op->y != y)	1980	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1981	return 0;
2100	}	1982	}
2101	}	1983	}
		1984
2102	return 0;	1985	return 0;
2103	}	1986	}
2104		1987
2105	/*	1988	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1989	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1990	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1991	* The first matching object is returned, or NULL if none.
2109	*/	1992	*/
2110		1993
2111	object *	1994	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1995	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1996	{
2114	object *	1997	object *
2115	tmp;	1998	tmp;
2116		1999
2117	if (m == NULL || out_of_map (m, x, y))	2000	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	2013	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	2014	* The first matching object is returned, or NULL if none.
2132	*/	2015	*/
2133		2016
2134	object *	2017	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	2018	present (unsigned char type, maptile *m, int x, int y)
2136	{	2019	{
2137	object *	2020	object *
2138	tmp;	2021	tmp;
2139		2022
2140	if (out_of_map (m, x, y))	2023	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2163	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2164	* customized, changed states, etc.
2282	*/	2165	*/
2283		2166
2284	int	2167	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2168	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2169	{
2287	int	2170	int
2288	i,	2171	i,
2289	index = 0, flag;	2172	index = 0, flag;
2290	static int	2173	static int
…		…
2311	return -1;	2194	return -1;
2312	return altern[RANDOM () % index];	2195	return altern[RANDOM () % index];
2313	}	2196	}
2314		2197
2315	/*	2198	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2199	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2200	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2201	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2202	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2203	*/
2321		2204
2322	int	2205	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2206	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2207	{
2325	int	2208	int
2326	i;	2209	i;
2327		2210
2328	for (i = 0; i < SIZEOFFREE; i++)	2211	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2275	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2276	* there is capable of.
2394	*/	2277	*/
2395		2278
2396	int	2279	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2280	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2281	{
2399	int	2282	int
2400	i,	2283	i,
2401	max = SIZEOFFREE, mflags;	2284	max = SIZEOFFREE, mflags;
2402	sint16	2285
2403	nx,	2286	sint16 nx, ny;
2404	ny;
2405	object *	2287	object *
2406	tmp;	2288	tmp;
2407	mapstruct *	2289	maptile *
2408	mp;	2290	mp;
2409	MoveType	2291
2410	blocked,	2292	MoveType blocked, move_type;
2411	move_type;
2412		2293
2413	if (exclude && exclude->head)	2294	if (exclude && exclude->head)
2414	{	2295	{
2415	exclude = exclude->head;	2296	exclude = exclude->head;
2416	move_type = exclude->move_type;	2297	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2502	* Modified to be map tile aware -.MSW
2622	*/	2503	*/
2623		2504
2624		2505
2625	int	2506	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2507	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2508	{
2628	sint16	2509	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2510	int
2632	mflags;	2511	mflags;
2633		2512
2634	if (dir < 0)	2513	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2514	return 0; /* exit condition: invalid direction */
…		…
2713	if (prev)	2592	if (prev)
2714	prev->more = tmp;	2593	prev->more = tmp;
2715	prev = tmp;	2594	prev = tmp;
2716	}	2595	}
2717		2596
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2597	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2598	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2599
2724	return dst;	2600	return dst;
2725	}	2601	}
2726		2602
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2603	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2604	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2605	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2606	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2607	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2608	/* Also remember that multiparts objects are not supported for now. */
2747		2609
2748	object *	2610	object *
2749	load_object_str (const char *obstr)	2611	load_object_str (const char *obstr)
2750	{	2612	{
2751	object *	2613	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2614	char filename[MAX_BUF];
2755		2615
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2616	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2617
2758	FILE *
2759	tempfile = fopen (filename, "w");	2618	FILE *tempfile = fopen (filename, "w");
2760		2619
2761	if (tempfile == NULL)	2620	if (tempfile == NULL)
2762	{	2621	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2622	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2623	return NULL;
2765	};	2624	}
		2625
2766	fprintf (tempfile, obstr);	2626	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2627	fclose (tempfile);
2768		2628
2769	op = get_object ();	2629	op = get_object ();
2770		2630
2771	object_thawer	2631	object_thawer thawer (filename);
2772	thawer (filename);
2773		2632
2774	if (thawer)	2633	if (thawer)
2775	load_object (thawer, op, 0);	2634	load_object (thawer, op, 0);
2776		2635
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2636	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2644	* returns NULL if no match.
2786	*/	2645	*/
2787	object *	2646	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2647	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2648	{
2790	object *	2649	object *tmp;
2791	tmp;
2792		2650
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2651	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2652	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2653	return tmp;
2796		2654
…		…
2804	* do the desired thing.	2662	* do the desired thing.
2805	*/	2663	*/
2806	key_value *	2664	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2665	get_ob_key_link (const object *ob, const char *key)
2808	{	2666	{
2809	key_value *	2667	key_value *link;
2810	link;
2811		2668
2812	for (link = ob->key_values; link != NULL; link = link->next)	2669	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2670	if (link->key == key)
2815	{
2816	return link;	2671	return link;
2817	}
2818	}
2819		2672
2820	return NULL;	2673	return NULL;
2821	}	2674	}
2822		2675
2823	/*	2676	/*
…		…
2828	* The returned string is shared.	2681	* The returned string is shared.
2829	*/	2682	*/
2830	const char *	2683	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2684	get_ob_key_value (const object *op, const char *const key)
2832	{	2685	{
2833	key_value *	2686	key_value *link;
2834	link;	2687	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2688
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2689	if (!canonical_key)
2841	{	2690	{
2842	/* 1. There being a field named key on any object	2691	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2692	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2693	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2694	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2695	*/
2847	return NULL;	2696	return 0;
2848	}	2697	}
2849		2698
2850	/* This is copied from get_ob_key_link() above -	2699	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2700	* only 4 lines, and saves the function call overhead.
2852	*/	2701	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2702	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2703	if (link->key == canonical_key)
2856	{
2857	return link->value;	2704	return link->value;
2858	}	2705
2859	}
2860	return NULL;	2706	return 0;
2861	}	2707	}
2862		2708
2863		2709
2864	/*	2710	/*
2865	* Updates the canonical_key in op to value.	2711	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2747	if (last)
2902	last->next = field->next;	2748	last->next = field->next;
2903	else	2749	else
2904	op->key_values = field->next;	2750	op->key_values = field->next;
2905		2751
2906	delete
2907	field;	2752	delete field;
2908	}	2753	}
2909	}	2754	}
2910	return TRUE;	2755	return TRUE;
2911	}	2756	}
2912	/* IF we get here, key doesn't exist */	2757	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2792	* Returns TRUE on success.
2948	*/	2793	*/
2949	int	2794	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2795	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2796	{
2952	shstr
2953	key_ (key);	2797	shstr key_ (key);
2954		2798
2955	return set_ob_key_value_s (op, key_, value, add_key);	2799	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2800	}
		2801
		2802	object::depth_iterator::depth_iterator (object *container)
		2803	: iterator_base (container)
		2804	{
		2805	while (item->inv)
		2806	item = item->inv;
		2807	}
		2808
		2809	void
		2810	object::depth_iterator::next ()
		2811	{
		2812	if (item->below)
		2813	{
		2814	item = item->below;
		2815
		2816	while (item->inv)
		2817	item = item->inv;
		2818	}
		2819	else
		2820	item = item->env;
		2821	}
		2822
		2823	// return a suitable string describing an objetc in enough detail to find it
		2824	const char *
		2825	object::debug_desc (char *info) const
		2826	{
		2827	char info2[256 * 3];
		2828	char *p = info;
		2829
		2830	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2831	count,
		2832	&name,
		2833	title ? " " : "",
		2834	title ? (const char *)title : "");
		2835
		2836	if (env)
		2837	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2838
		2839	if (map)
		2840	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2841
		2842	return info;
		2843	}
		2844
		2845	const char *
		2846	object::debug_desc () const
		2847	{
		2848	static char info[256 * 3];
		2849	return debug_desc (info);
		2850	}
		2851

Diff Legend

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