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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 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: %" PRId64 "\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);
639		553
640	op2->clone (op);	554	op2->clone (op);
641		555
642	if (is_freed)	556	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	557	SET_FLAG (op, FLAG_FREED);
		558
644	if (is_removed)	559	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	560	SET_FLAG (op, FLAG_REMOVED);
646		561
647	if (op2->speed < 0)	562	if (op2->speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
…		…
698	/*	613	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	614	* 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.	615	* 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.	616	* This function needs to be called whenever the speed of an object changes.
702	*/	617	*/
703
704	void	618	void
705	update_ob_speed (object *op)	619	update_ob_speed (object *op)
706	{	620	{
707	extern int arch_init;	621	extern int arch_init;
708		622
…		…
717	abort ();	631	abort ();
718	#else	632	#else
719	op->speed = 0;	633	op->speed = 0;
720	#endif	634	#endif
721	}	635	}
		636
722	if (arch_init)	637	if (arch_init)
723	{
724	return;	638	return;
725	}	639
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	641	{
728	/* If already on active list, don't do anything */	642	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	643	if (op->active_next || op->active_prev || op == active_objects)
730	return;	644	return;
731		645
732	/* process_events() expects us to insert the object at the beginning	646	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	647	* of the list. */
734	op->active_next = active_objects;	648	op->active_next = active_objects;
		649
735	if (op->active_next != NULL)	650	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	651	op->active_next->active_prev = op;
		652
737	active_objects = op;	653	active_objects = op;
738	}	654	}
739	else	655	else
740	{	656	{
741	/* If not on the active list, nothing needs to be done */	657	/* If not on the active list, nothing needs to be done */
…		…
743	return;	659	return;
744		660
745	if (op->active_prev == NULL)	661	if (op->active_prev == NULL)
746	{	662	{
747	active_objects = op->active_next;	663	active_objects = op->active_next;
		664
748	if (op->active_next != NULL)	665	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	666	op->active_next->active_prev = NULL;
750	}	667	}
751	else	668	else
752	{	669	{
753	op->active_prev->active_next = op->active_next;	670	op->active_prev->active_next = op->active_next;
		671
754	if (op->active_next)	672	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	673	op->active_next->active_prev = op->active_prev;
756	}	674	}
		675
757	op->active_next = NULL;	676	op->active_next = NULL;
758	op->active_prev = NULL;	677	op->active_prev = NULL;
759	}	678	}
760	}	679	}
761		680
…		…
886	update_now = 1;	805	update_now = 1;
887		806
888	if ((move_slow | op->move_slow) != move_slow)	807	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	808	update_now = 1;
890	}	809	}
		810
891	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	813	* that is being removed.
894	*/	814	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	816	update_now = 1;
897	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	818	/* Nothing to do for that case */ ;
899	else	819	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		821
902	if (update_now)	822	if (update_now)
903	{	823	{
…		…
907		827
908	if (op->more != NULL)	828	if (op->more != NULL)
909	update_object (op->more, action);	829	update_object (op->more, action);
910	}	830	}
911		831
912	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
913	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
914		835
915	void object::free_mortals ()	836	void object::free_mortals ()
916	{	837	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
919	{	842	{
920	freed.push_back (*i);	843	delete *i;
921	mortals.erase (i);	844	mortals.erase (i);
922	}	845	}
923	else
924	++i;
925	}	846	}
926		847
927	object::object ()	848	object::object ()
928	{	849	{
929	SET_FLAG (this, FLAG_REMOVED);	850	SET_FLAG (this, FLAG_REMOVED);
930		851
931	expmul = 1.0;	852	expmul = 1.0;
932	face = blank_face;	853	face = blank_face;
933	attacked_by_count = -1;
934	}	854	}
935		855
936	object::~object ()	856	object::~object ()
937	{	857	{
938	free_key_values (this);	858	free_key_values (this);
939	}	859	}
940		860
941	void object::link ()	861	void object::link ()
942	{	862	{
943	count = ++ob_count;	863	count = ++ob_count;
		864	uuid = gen_uuid ();
944		865
945	prev = 0;	866	prev = 0;
946	next = objects;	867	next = object::first;
947		868
948	if (objects)	869	if (object::first)
949	objects->prev = this;	870	object::first->prev = this;
950		871
951	objects = this;	872	object::first = this;
952	}	873	}
953		874
954	void object::unlink ()	875	void object::unlink ()
955	{	876	{
956	count = 0;	877	if (this == object::first)
		878	object::first = next;
957		879
958	/* Remove this object from the list of used objects */	880	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	881	if (prev) prev->next = next;
		882	if (next) next->prev = prev;
		883
962	prev = 0;	884	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	885	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	886	}
974		887
975	object *object::create ()	888	object *object::create ()
976	{	889	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	890	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	891	op->link ();
990	return op;	892	return op;
991	}	893	}
992		894
993	/*	895	/*
…		…
995	* it from the list of used objects, and puts it on the list of	897	* it from the list of used objects, and puts it on the list of
996	* free objects. The IS_FREED() flag is set in the object.	898	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	899	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	900	* this function to succeed.
999	*	901	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	902	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	903	* inventory to the ground.
1002	*/	904	*/
1003	void object::free (bool free_inventory)	905	void object::destroy (bool destroy_inventory)
1004	{	906	{
		907	if (QUERY_FLAG (this, FLAG_FREED))
		908	return;
		909
		910	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		911	remove_friendly_object (this);
		912
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	913	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	914	remove_ob (this);
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		915
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);
1018	}
1019
1020	if (QUERY_FLAG (this, FLAG_FREED))	916	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		917
1027	if (more)	918	if (more)
1028	{	919	{
1029	more->free (free_inventory);	920	more->destroy (destroy_inventory);
1030	more = 0;	921	more = 0;
1031	}	922	}
1032		923
1033	if (inv)	924	if (inv)
1034	{	925	{
1035	/* Only if the space blocks everything do we not process -	926	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	927	* if some form of movement is allowed, let objects
1037	* drop on that space.	928	* drop on that space.
1038	*/	929	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	931	{
1041	object *	932	object *op = inv;
1042	op = inv;
1043		933
1044	while (op)	934	while (op)
1045	{	935	{
1046	object *
1047	tmp = op->below;	936	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	937	op->destroy (destroy_inventory);
1051	op = tmp;	938	op = tmp;
1052	}	939	}
1053	}	940	}
1054	else	941	else
1055	{ /* Put objects in inventory onto this space */	942	{ /* Put objects in inventory onto this space */
1056	object *	943	object *op = inv;
1057	op = inv;
1058		944
1059	while (op)	945	while (op)
1060	{	946	{
1061	object *
1062	tmp = op->below;	947	object *tmp = op->below;
1063		948
1064	remove_ob (op);	949	remove_ob (op);
1065		950
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	961	op = tmp;
1077	}	962	}
1078	}	963	}
1079	}	964	}
1080		965
1081	clear_owner (this);	966	// hack to ensure that freed objects still have a valid map
		967	{
		968	static maptile *freed_map; // freed objects are moved here to avoid crashes
		969
		970	if (!freed_map)
		971	{
		972	freed_map = new maptile;
		973
		974	freed_map->name = "/internal/freed_objects_map";
		975	freed_map->width = 3;
		976	freed_map->height = 3;
		977
		978	freed_map->allocate ();
		979	}
		980
		981	map = freed_map;
		982	x = 1;
		983	y = 1;
		984	}
		985
		986	// clear those pointers that likely might have circular references to us
		987	owner = 0;
		988	enemy = 0;
		989	attacked_by = 0;
		990
		991	// only relevant for players(?), but make sure of it anyways
		992	contr = 0;
1082		993
1083	/* Remove object from the active list */	994	/* Remove object from the active list */
1084	speed = 0;	995	speed = 0;
1085	update_ob_speed (this);	996	update_ob_speed (this);
1086		997
1087	unlink ();	998	unlink ();
1088		999
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1000	mortals.push_back (this);
1092	}	1001	}
1093		1002
1094	/*	1003	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1004	* sub_weight() recursively (outwards) subtracts a number from the
1096	* weight of an object (and what is carried by it's environment(s)).	1005	* weight of an object (and what is carried by it's environment(s)).
1097	*/	1006	*/
1098
1099	void	1007	void
1100	sub_weight (object *op, signed long weight)	1008	sub_weight (object *op, signed long weight)
1101	{	1009	{
1102	while (op != NULL)	1010	while (op != NULL)
1103	{	1011	{
1104	if (op->type == CONTAINER)	1012	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1013	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1014
1108	op->carrying -= weight;	1015	op->carrying -= weight;
1109	op = op->env;	1016	op = op->env;
1110	}	1017	}
1111	}	1018	}
1112		1019
…		…
1116	* object will have no environment. If the object previously had an	1023	* object will have no environment. If the object previously had an
1117	* environment, the x and y coordinates will be updated to	1024	* environment, the x and y coordinates will be updated to
1118	* the previous environment.	1025	* the previous environment.
1119	* Beware: This function is called from the editor as well!	1026	* Beware: This function is called from the editor as well!
1120	*/	1027	*/
1121
1122	void	1028	void
1123	remove_ob (object *op)	1029	object::remove ()
1124	{	1030	{
1125	object *tmp, *last = NULL;	1031	object *tmp, *last = 0;
1126	object *otmp;	1032	object *otmp;
1127		1033
1128	tag_t tag;
1129	int check_walk_off;	1034	int check_walk_off;
1130	mapstruct *m;
1131		1035
1132	sint16 x, y;
1133
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1036	if (QUERY_FLAG (this, FLAG_REMOVED))
1135	{	1037	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1038
1139	/* Changed it to always dump core in this case. As has been learned
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151
1152	if (op->more != NULL)
1153	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);	1039	SET_FLAG (this, FLAG_REMOVED);
		1040
		1041	if (more)
		1042	more->remove ();
1156		1043
1157	/*	1044	/*
1158	* In this case, the object to be removed is in someones	1045	* In this case, the object to be removed is in someones
1159	* inventory.	1046	* inventory.
1160	*/	1047	*/
1161	if (op->env != NULL)	1048	if (env)
1162	{	1049	{
1163	if (op->nrof)	1050	if (nrof)
1164	sub_weight (op->env, op->weight * op->nrof);	1051	sub_weight (env, weight * nrof);
1165	else	1052	else
1166	sub_weight (op->env, op->weight + op->carrying);	1053	sub_weight (env, weight + carrying);
1167		1054
1168	/* NO_FIX_PLAYER is set when a great many changes are being	1055	/* NO_FIX_PLAYER is set when a great many changes are being
1169	* made to players inventory. If set, avoiding the call	1056	* made to players inventory. If set, avoiding the call
1170	* to save cpu time.	1057	* to save cpu time.
1171	*/	1058	*/
1172	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1173	fix_player (otmp);	1060	fix_player (otmp);
1174		1061
1175	if (op->above != NULL)	1062	if (above != NULL)
1176	op->above->below = op->below;	1063	above->below = below;
1177	else	1064	else
1178	op->env->inv = op->below;	1065	env->inv = below;
1179		1066
1180	if (op->below != NULL)	1067	if (below != NULL)
1181	op->below->above = op->above;	1068	below->above = above;
1182		1069
1183	/* we set up values so that it could be inserted into	1070	/* we set up values so that it could be inserted into
1184	* the map, but we don't actually do that - it is up	1071	* the map, but we don't actually do that - it is up
1185	* to the caller to decide what we want to do.	1072	* to the caller to decide what we want to do.
1186	*/	1073	*/
1187	op->x = op->env->x, op->y = op->env->y;	1074	x = env->x, y = env->y;
1188	op->map = op->env->map;	1075	map = env->map;
1189	op->above = NULL, op->below = NULL;	1076	above = 0, below = 0;
1190	op->env = NULL;	1077	env = 0;
1191	return;
1192	}
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;
1199	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);
1201
1202	if (!m)
1203	{	1078	}
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1079	else if (map)
1205	op->map->path, op->x, op->y);	1080	{
1206	/* in old days, we used to set x and y to 0 and continue.	1081	/* Re did the following section of code - it looks like it had
1207	* it seems if we get into this case, something is probablye	1082	* lots of logic for things we no longer care about
1208	* screwed up and should be fixed.
1209	*/	1083	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1084
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1085	/* link the object above us */
1223	if (op->above)	1086	if (above)
1224	op->above->below = op->below;	1087	above->below = below;
1225	else	1088	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1227		1090
1228	/* Relink the object below us, if there is one */	1091	/* Relink the object below us, if there is one */
1229	if (op->below)	1092	if (below)
1230	op->below->above = op->above;	1093	below->above = above;
1231	else	1094	else
1232	{	1095	{
1233	/* Nothing below, which means we need to relink map object for this space	1096	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1097	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1098	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	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",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1099	*/
1270	if (tmp->container == op)	1100	if (GET_MAP_OB (map, x, y) != this)
1271	{	1101	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1102	char *dump = dump_object (this);
1273	tmp->container = NULL;	1103	LOG (llevError,
		1104	"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);
		1105	free (dump);
		1106	dump = dump_object (GET_MAP_OB (map, x, y));
		1107	LOG (llevError, "%s\n", dump);
		1108	free (dump);
1274	}	1109	}
1275		1110
1276	tmp->contr->socket.update_look = 1;	1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1112	}
1281	move_apply (tmp, op, NULL);
1282		1113
1283	if (was_destroyed (op, tag))	1114	above = 0;
		1115	below = 0;
		1116
		1117	if (map->in_memory == MAP_SAVING)
		1118	return;
		1119
		1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1121
		1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1123	{
		1124	/* No point updating the players look faces if he is the object
		1125	* being removed.
		1126	*/
		1127
		1128	if (tmp->type == PLAYER && tmp != this)
1284	{	1129	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1130	/* If a container that the player is currently using somehow gets
		1131	* removed (most likely destroyed), update the player view
		1132	* appropriately.
		1133	*/
		1134	if (tmp->container == this)
		1135	{
		1136	CLEAR_FLAG (this, FLAG_APPLIED);
		1137	tmp->container = 0;
		1138	}
		1139
		1140	tmp->contr->socket.update_look = 1;
1286	}	1141	}
		1142
		1143	/* See if player moving off should effect something */
		1144	if (check_walk_off
		1145	&& ((move_type & tmp->move_off)
		1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1147	{
		1148	move_apply (tmp, this, 0);
		1149
		1150	if (destroyed ())
		1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1152	}
1288		1153
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1155
1291	if (tmp->above == tmp)	1156	if (tmp->above == tmp)
1292	tmp->above = NULL;	1157	tmp->above = 0;
1293		1158
1294	last = tmp;	1159	last = tmp;
1295	}	1160	}
1296		1161
1297	/* last == NULL of there are no objects on this space */	1162	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1163	if (!last)
1299	{	1164	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1167	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1168	* be correct anyways.
1304	*/	1169	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1171	update_position (map, x, y);
1307	}	1172	}
1308	else	1173	else
1309	update_object (last, UP_OBJ_REMOVE);	1174	update_object (last, UP_OBJ_REMOVE);
1310		1175
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1312	update_all_los (op->map, op->x, op->y);	1177	update_all_los (map, x, y);
		1178	}
1313	}	1179	}
1314		1180
1315	/*	1181	/*
1316	* merge_ob(op,top):	1182	* merge_ob(op,top):
1317	*	1183	*
1318	* This function goes through all objects below and including top, and	1184	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1185	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1186	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1187	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1188	*/
1323
1324	object *	1189	object *
1325	merge_ob (object *op, object *top)	1190	merge_ob (object *op, object *top)
1326	{	1191	{
1327	if (!op->nrof)	1192	if (!op->nrof)
1328	return 0;	1193	return 0;
		1194
1329	if (top == NULL)	1195	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1196	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1197
1331	for (; top != NULL; top = top->below)	1198	for (; top != NULL; top = top->below)
1332	{	1199	{
1333	if (top == op)	1200	if (top == op)
1334	continue;	1201	continue;
1335	if (CAN_MERGE (op, top))	1202	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1208	remove_ob (op);
1342	free_object (op);	1209	free_object (op);
1343	return top;	1210	return top;
1344	}	1211	}
1345	}	1212	}
		1213
1346	return NULL;	1214	return 0;
1347	}	1215	}
1348		1216
1349	/*	1217	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1218	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1219	* job preparing multi-part monsters
1352	*/	1220	*/
1353	object *	1221	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1223	{
1356	object *	1224	object *tmp;
1357	tmp;
1358		1225
1359	if (op->head)	1226	if (op->head)
1360	op = op->head;	1227	op = op->head;
		1228
1361	for (tmp = op; tmp; tmp = tmp->more)	1229	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1230	{
1363	tmp->x = x + tmp->arch->clone.x;	1231	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1232	tmp->y = y + tmp->arch->clone.y;
1365	}	1233	}
		1234
1366	return insert_ob_in_map (op, m, originator, flag);	1235	return insert_ob_in_map (op, m, originator, flag);
1367	}	1236	}
1368		1237
1369	/*	1238	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1239	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1255	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1256	* just 'op' otherwise
1388	*/	1257	*/
1389		1258
1390	object *	1259	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1261	{
1393	object *tmp, *top, *floor = NULL;	1262	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1263	sint16 x, y;
1395		1264
1396	if (QUERY_FLAG (op, FLAG_FREED))	1265	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1268	return NULL;
1400	}	1269	}
1401		1270
1402	if (m == NULL)	1271	if (m == NULL)
1403	{	1272	{
1404	dump_object (op);	1273	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1275	free (dump);
1406	return op;	1276	return op;
1407	}	1277	}
1408		1278
1409	if (out_of_map (m, op->x, op->y))	1279	if (out_of_map (m, op->x, op->y))
1410	{	1280	{
1411	dump_object (op);	1281	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1282	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1283	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1284	/* Better to catch this here, as otherwise the next use of this object
1415	* is likely to cause a crash. Better to find out where it is getting	1285	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1286	* improperly inserted.
1417	*/	1287	*/
1418	abort ();	1288	abort ();
1419	#endif	1289	#endif
		1290	free (dump);
1420	return op;	1291	return op;
1421	}	1292	}
1422		1293
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1294	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1295	{
1425	dump_object (op);	1296	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1298	free (dump);
1427	return op;	1299	return op;
1428	}	1300	}
1429		1301
1430	if (op->more != NULL)	1302	if (op->more != NULL)
1431	{	1303	{
…		…
1661	* op is the object to insert it under: supplies x and the map.	1533	* op is the object to insert it under: supplies x and the map.
1662	*/	1534	*/
1663	void	1535	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1537	{
1666	object *tmp;	1538	object *
		1539	tmp;
1667	object *tmp1;	1540	object *
		1541	tmp1;
1668		1542
1669	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1670		1544
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1546	{
…		…
1675	remove_ob (tmp);	1549	remove_ob (tmp);
1676	free_object (tmp);	1550	free_object (tmp);
1677	}	1551	}
1678	}	1552	}
1679		1553
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1554	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1555
1682	tmp1->x = op->x;	1556	tmp1->x = op->x;
1683	tmp1->y = op->y;	1557	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1558	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1559	}
…		…
1703	if (orig_ob->nrof < nr)	1577	if (orig_ob->nrof < nr)
1704	{	1578	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1579	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1580	return NULL;
1707	}	1581	}
		1582
1708	newob = object_create_clone (orig_ob);	1583	newob = object_create_clone (orig_ob);
		1584
1709	if ((orig_ob->nrof -= nr) < 1)	1585	if ((orig_ob->nrof -= nr) < 1)
1710	{	1586	{
1711	if (!is_removed)	1587	if (!is_removed)
1712	remove_ob (orig_ob);	1588	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1589	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1597	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1598	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1599	return NULL;
1724	}	1600	}
1725	}	1601	}
		1602
1726	newob->nrof = nr;	1603	newob->nrof = nr;
1727		1604
1728	return newob;	1605	return newob;
1729	}	1606	}
1730		1607
…		…
1737	*/	1614	*/
1738		1615
1739	object *	1616	object *
1740	decrease_ob_nr (object *op, uint32 i)	1617	decrease_ob_nr (object *op, uint32 i)
1741	{	1618	{
1742	object *	1619	object *tmp;
1743	tmp;
1744	player *	1620	player *pl;
1745	pl;
1746		1621
1747	if (i == 0) /* objects with op->nrof require this check */	1622	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1623	return op;
1749		1624
1750	if (i > op->nrof)	1625	if (i > op->nrof)
1751	i = op->nrof;	1626	i = op->nrof;
1752		1627
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1628	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1629	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1630	else if (op->env != NULL)
1758	{	1631	{
1759	/* is this object in the players inventory, or sub container	1632	/* is this object in the players inventory, or sub container
1760	* therein?	1633	* therein?
1761	*/	1634	*/
…		…
1796	}	1669	}
1797	}	1670	}
1798	}	1671	}
1799	else	1672	else
1800	{	1673	{
1801	object *
1802	above = op->above;	1674	object *above = op->above;
1803		1675
1804	if (i < op->nrof)	1676	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1677	op->nrof -= i;
1807	}
1808	else	1678	else
1809	{	1679	{
1810	remove_ob (op);	1680	remove_ob (op);
1811	op->nrof = 0;	1681	op->nrof = 0;
1812	}	1682	}
		1683
1813	/* Since we just removed op, op->above is null */	1684	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1685	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1686	if (tmp->type == PLAYER)
1816	{	1687	{
1817	if (op->nrof)	1688	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1691	esrv_del_item (tmp->contr, op->count);
1821	}	1692	}
1822	}	1693	}
1823		1694
1824	if (op->nrof)	1695	if (op->nrof)
1825	{
1826	return op;	1696	return op;
1827	}
1828	else	1697	else
1829	{	1698	{
1830	free_object (op);	1699	free_object (op);
1831	return NULL;	1700	return NULL;
1832	}	1701	}
…		…
1841	add_weight (object *op, signed long weight)	1710	add_weight (object *op, signed long weight)
1842	{	1711	{
1843	while (op != NULL)	1712	while (op != NULL)
1844	{	1713	{
1845	if (op->type == CONTAINER)	1714	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1715	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1716
1849	op->carrying += weight;	1717	op->carrying += weight;
1850	op = op->env;	1718	op = op->env;
1851	}	1719	}
1852	}	1720	}
1853		1721
		1722	object *
		1723	insert_ob_in_ob (object *op, object *where)
		1724	{
		1725	if (!where)
		1726	{
		1727	char *dump = dump_object (op);
		1728	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1729	free (dump);
		1730	return op;
		1731	}
		1732
		1733	if (where->head)
		1734	{
		1735	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1736	where = where->head;
		1737	}
		1738
		1739	return where->insert (op);
		1740	}
		1741
1854	/*	1742	/*
1855	* insert_ob_in_ob(op,environment):	1743	* env->insert (op)
1856	* This function inserts the object op in the linked list	1744	* This function inserts the object op in the linked list
1857	* inside the object environment.	1745	* inside the object environment.
1858	*	1746	*
1859	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1860	* the inventory at the last position or next to other objects of the same
1861	* type.
1862	* Frank: Now sorted by type, archetype and magic!
1863	*
1864	* The function returns now pointer to inserted item, and return value can	1747	* The function returns now pointer to inserted item, and return value can
1865	* be != op, if items are merged. -Tero	1748	* be != op, if items are merged. -Tero
1866	*/	1749	*/
1867		1750
1868	object *	1751	object *
1869	insert_ob_in_ob (object *op, object *where)	1752	object::insert (object *op)
1870	{	1753	{
1871	object *	1754	object *tmp, *otmp;
1872	tmp, *
1873	otmp;
1874		1755
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1756	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1757	op->remove ();
1877	dump_object (op);	1758
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;
1880	}
1881	if (where == NULL)
1882	{
1883	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where->head)
1888	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;
1891	}
1892	if (op->more)	1759	if (op->more)
1893	{	1760	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1761	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1762	return op;
1896	}	1763	}
		1764
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1765	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1766	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1767	if (op->nrof)
1900	{	1768	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1769	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1902	if (CAN_MERGE (tmp, op))	1770	if (CAN_MERGE (tmp, op))
1903	{	1771	{
1904	/* return the original object and remove inserted object	1772	/* return the original object and remove inserted object
1905	(client needs the original object) */	1773	(client needs the original object) */
1906	tmp->nrof += op->nrof;	1774	tmp->nrof += op->nrof;
1907	/* Weight handling gets pretty funky. Since we are adding to	1775	/* Weight handling gets pretty funky. Since we are adding to
1908	* tmp->nrof, we need to increase the weight.	1776	* tmp->nrof, we need to increase the weight.
1909	*/	1777	*/
1910	add_weight (where, op->weight * op->nrof);	1778	add_weight (this, op->weight * op->nrof);
1911	SET_FLAG (op, FLAG_REMOVED);	1779	SET_FLAG (op, FLAG_REMOVED);
1912	free_object (op); /* free the inserted object */	1780	op->destroy (); /* free the inserted object */
1913	op = tmp;	1781	op = tmp;
1914	remove_ob (op); /* and fix old object's links */	1782	op->remove (); /* and fix old object's links */
1915	CLEAR_FLAG (op, FLAG_REMOVED);	1783	CLEAR_FLAG (op, FLAG_REMOVED);
1916	break;	1784	break;
1917	}	1785	}
1918		1786
1919	/* I assume combined objects have no inventory	1787	/* I assume combined objects have no inventory
1920	* We add the weight - this object could have just been removed	1788	* We add the weight - this object could have just been removed
1921	* (if it was possible to merge). calling remove_ob will subtract	1789	* (if it was possible to merge). calling remove_ob will subtract
1922	* the weight, so we need to add it in again, since we actually do	1790	* the weight, so we need to add it in again, since we actually do
1923	* the linking below	1791	* the linking below
1924	*/	1792	*/
1925	add_weight (where, op->weight * op->nrof);	1793	add_weight (this, op->weight * op->nrof);
1926	}	1794	}
1927	else	1795	else
1928	add_weight (where, (op->weight + op->carrying));	1796	add_weight (this, (op->weight + op->carrying));
1929		1797
1930	otmp = is_player_inv (where);	1798	otmp = is_player_inv (this);
1931	if (otmp && otmp->contr != NULL)	1799	if (otmp && otmp->contr)
1932	{
1933	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1800	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1934	fix_player (otmp);	1801	fix_player (otmp);
1935	}
1936		1802
1937	op->map = NULL;	1803	op->map = NULL;
1938	op->env = where;	1804	op->env = this;
1939	op->above = NULL;	1805	op->above = NULL;
1940	op->below = NULL;	1806	op->below = NULL;
1941	op->x = 0, op->y = 0;	1807	op->x = 0, op->y = 0;
1942		1808
1943	/* reset the light list and los of the players on the map */	1809	/* reset the light list and los of the players on the map */
1944	if ((op->glow_radius != 0) && where->map)	1810	if ((op->glow_radius != 0) && map)
1945	{	1811	{
1946	#ifdef DEBUG_LIGHTS	1812	#ifdef DEBUG_LIGHTS
1947	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1813	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1948	#endif /* DEBUG_LIGHTS */	1814	#endif /* DEBUG_LIGHTS */
1949	if (MAP_DARKNESS (where->map))	1815	if (MAP_DARKNESS (map))
1950	update_all_los (where->map, where->x, where->y);	1816	update_all_los (map, x, y);
1951	}	1817	}
1952		1818
1953	/* Client has no idea of ordering so lets not bother ordering it here.	1819	/* Client has no idea of ordering so lets not bother ordering it here.
1954	* It sure simplifies this function...	1820	* It sure simplifies this function...
1955	*/	1821	*/
1956	if (where->inv == NULL)	1822	if (!inv)
1957	where->inv = op;	1823	inv = op;
1958	else	1824	else
1959	{	1825	{
1960	op->below = where->inv;	1826	op->below = inv;
1961	op->below->above = op;	1827	op->below->above = op;
1962	where->inv = op;	1828	inv = op;
1963	}	1829	}
		1830
1964	return op;	1831	return op;
1965	}	1832	}
1966		1833
1967	/*	1834	/*
1968	* Checks if any objects has a move_type that matches objects	1835	* Checks if any objects has a move_type that matches objects
…		…
1987		1854
1988	int	1855	int
1989	check_move_on (object *op, object *originator)	1856	check_move_on (object *op, object *originator)
1990	{	1857	{
1991	object *tmp;	1858	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1859	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1860	int x = op->x, y = op->y;
1995		1861
1996	MoveType move_on, move_slow, move_block;	1862	MoveType move_on, move_slow, move_block;
1997		1863
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1864	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1865	return 0;
2000
2001	tag = op->count;
2002		1866
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1867	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2004	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1868	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2005	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1869	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1870
…		…
2049	{	1913	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1914	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1915	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1916	{
2053		1917
		1918	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1919	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1920
2056	if (op->type == PLAYER)	1921	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1922	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1923	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1924	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1931	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2067	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1932	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1933	{
2069	move_apply (tmp, op, originator);	1934	move_apply (tmp, op, originator);
2070		1935
2071	if (was_destroyed (op, tag))	1936	if (op->destroyed ())
2072	return 1;	1937	return 1;
2073		1938
2074	/* what the person/creature stepped onto has moved the object	1939	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1940	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1941	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1953	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1954	* The first matching object is returned, or NULL if none.
2090	*/	1955	*/
2091		1956
2092	object *	1957	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1958	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1959	{
2095	object *	1960	object *
2096	tmp;	1961	tmp;
2097		1962
2098	if (m == NULL || out_of_map (m, x, y))	1963	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	1976	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	1977	* The first matching object is returned, or NULL if none.
2113	*/	1978	*/
2114		1979
2115	object *	1980	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	1981	present (unsigned char type, maptile *m, int x, int y)
2117	{	1982	{
2118	object *	1983	object *
2119	tmp;	1984	tmp;
2120		1985
2121	if (out_of_map (m, x, y))	1986	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2126	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2127	* customized, changed states, etc.
2263	*/	2128	*/
2264		2129
2265	int	2130	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2131	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2132	{
2268	int	2133	int
2269	i,	2134	i,
2270	index = 0, flag;	2135	index = 0, flag;
2271	static int	2136	static int
…		…
2292	return -1;	2157	return -1;
2293	return altern[RANDOM () % index];	2158	return altern[RANDOM () % index];
2294	}	2159	}
2295		2160
2296	/*	2161	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2162	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2163	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2164	* But it will return the first available spot, not a random choice.
2300	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2165	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2166	*/
2302		2167
2303	int	2168	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2169	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2170	{
2306	int	2171	int
2307	i;	2172	i;
2308		2173
2309	for (i = 0; i < SIZEOFFREE; i++)	2174	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2238	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2239	* there is capable of.
2375	*/	2240	*/
2376		2241
2377	int	2242	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2243	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2244	{
2380	int	2245	int
2381	i,	2246	i,
2382	max = SIZEOFFREE, mflags;	2247	max = SIZEOFFREE, mflags;
2383	sint16	2248
2384	nx,	2249	sint16 nx, ny;
2385	ny;
2386	object *	2250	object *
2387	tmp;	2251	tmp;
2388	mapstruct *	2252	maptile *
2389	mp;	2253	mp;
2390	MoveType	2254
2391	blocked,	2255	MoveType blocked, move_type;
2392	move_type;
2393		2256
2394	if (exclude && exclude->head)	2257	if (exclude && exclude->head)
2395	{	2258	{
2396	exclude = exclude->head;	2259	exclude = exclude->head;
2397	move_type = exclude->move_type;	2260	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2465	* Modified to be map tile aware -.MSW
2603	*/	2466	*/
2604		2467
2605		2468
2606	int	2469	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2470	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2471	{
2609	sint16	2472	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2473	int
2613	mflags;	2474	mflags;
2614		2475
2615	if (dir < 0)	2476	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2477	return 0; /* exit condition: invalid direction */
…		…
2663	* create clone from object to another	2524	* create clone from object to another
2664	*/	2525	*/
2665	object *	2526	object *
2666	object_create_clone (object *asrc)	2527	object_create_clone (object *asrc)
2667	{	2528	{
2668	object *
2669	dst = NULL, *tmp, *src, *part, *prev, *item;	2529	object *dst = 0, *tmp, *src, *part, *prev, *item;
2670		2530
2671	if (!asrc)	2531	if (!asrc)
2672	return NULL;	2532	return 0;
		2533
2673	src = asrc;	2534	src = asrc;
2674	if (src->head)	2535	if (src->head)
2675	src = src->head;	2536	src = src->head;
2676		2537
2677	prev = NULL;	2538	prev = 0;
2678	for (part = src; part; part = part->more)	2539	for (part = src; part; part = part->more)
2679	{	2540	{
2680	tmp = get_object ();	2541	tmp = get_object ();
2681	copy_object (part, tmp);	2542	copy_object (part, tmp);
2682	tmp->x -= src->x;	2543	tmp->x -= src->x;
2683	tmp->y -= src->y;	2544	tmp->y -= src->y;
		2545
2684	if (!part->head)	2546	if (!part->head)
2685	{	2547	{
2686	dst = tmp;	2548	dst = tmp;
2687	tmp->head = NULL;	2549	tmp->head = 0;
2688	}	2550	}
2689	else	2551	else
2690	{	2552	{
2691	tmp->head = dst;	2553	tmp->head = dst;
2692	}	2554	}
		2555
2693	tmp->more = NULL;	2556	tmp->more = 0;
		2557
2694	if (prev)	2558	if (prev)
2695	prev->more = tmp;	2559	prev->more = tmp;
		2560
2696	prev = tmp;	2561	prev = tmp;
2697	}	2562	}
2698		2563
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2564	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2565	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2566
2705	return dst;	2567	return dst;
2706	}	2568	}
2707		2569
2708	/* return true if the object was destroyed, 0 otherwise */
2709	int
2710	was_destroyed (const object *op, tag_t old_tag)
2711	{
2712	/* checking for FLAG_FREED isn't necessary, but makes this function more
2713	* robust */
2714	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2715	}
2716
2717	/* GROS - Creates an object using a string representing its content. */	2570	/* GROS - Creates an object using a string representing its content. */
2718
2719	/* Basically, we save the content of the string to a temp file, then call */	2571	/* Basically, we save the content of the string to a temp file, then call */
2720
2721	/* load_object on it. I admit it is a highly inefficient way to make things, */	2572	/* load_object on it. I admit it is a highly inefficient way to make things, */
2722
2723	/* but it was simple to make and allows reusing the load_object function. */	2573	/* but it was simple to make and allows reusing the load_object function. */
2724
2725	/* Remember not to use load_object_str in a time-critical situation. */	2574	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2575	/* Also remember that multiparts objects are not supported for now. */
2728		2576
2729	object *	2577	object *
2730	load_object_str (const char *obstr)	2578	load_object_str (const char *obstr)
2731	{	2579	{
2732	object *	2580	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2581	char filename[MAX_BUF];
2736		2582
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2583	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2584
2739	FILE *
2740	tempfile = fopen (filename, "w");	2585	FILE *tempfile = fopen (filename, "w");
2741		2586
2742	if (tempfile == NULL)	2587	if (tempfile == NULL)
2743	{	2588	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2589	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2590	return NULL;
2746	};	2591	}
		2592
2747	fprintf (tempfile, obstr);	2593	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2594	fclose (tempfile);
2749		2595
2750	op = get_object ();	2596	op = get_object ();
2751		2597
2752	object_thawer	2598	object_thawer thawer (filename);
2753	thawer (filename);
2754		2599
2755	if (thawer)	2600	if (thawer)
2756	load_object (thawer, op, 0);	2601	load_object (thawer, op, 0);
2757		2602
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2603	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2611	* returns NULL if no match.
2767	*/	2612	*/
2768	object *	2613	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2614	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2615	{
2771	object *	2616	object *tmp;
2772	tmp;
2773		2617
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2618	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2619	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2620	return tmp;
2777		2621
…		…
2785	* do the desired thing.	2629	* do the desired thing.
2786	*/	2630	*/
2787	key_value *	2631	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2632	get_ob_key_link (const object *ob, const char *key)
2789	{	2633	{
2790	key_value *	2634	key_value *link;
2791	link;
2792		2635
2793	for (link = ob->key_values; link != NULL; link = link->next)	2636	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2637	if (link->key == key)
2796	{
2797	return link;	2638	return link;
2798	}
2799	}
2800		2639
2801	return NULL;	2640	return NULL;
2802	}	2641	}
2803		2642
2804	/*	2643	/*
…		…
2809	* The returned string is shared.	2648	* The returned string is shared.
2810	*/	2649	*/
2811	const char *	2650	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2651	get_ob_key_value (const object *op, const char *const key)
2813	{	2652	{
2814	key_value *	2653	key_value *link;
2815	link;	2654	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2655
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2656	if (!canonical_key)
2822	{	2657	{
2823	/* 1. There being a field named key on any object	2658	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2659	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2660	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2661	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2662	*/
2828	return NULL;	2663	return 0;
2829	}	2664	}
2830		2665
2831	/* This is copied from get_ob_key_link() above -	2666	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2667	* only 4 lines, and saves the function call overhead.
2833	*/	2668	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2669	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2670	if (link->key == canonical_key)
2837	{
2838	return link->value;	2671	return link->value;
2839	}	2672
2840	}
2841	return NULL;	2673	return 0;
2842	}	2674	}
2843		2675
2844		2676
2845	/*	2677	/*
2846	* Updates the canonical_key in op to value.	2678	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2714	if (last)
2883	last->next = field->next;	2715	last->next = field->next;
2884	else	2716	else
2885	op->key_values = field->next;	2717	op->key_values = field->next;
2886		2718
2887	delete
2888	field;	2719	delete field;
2889	}	2720	}
2890	}	2721	}
2891	return TRUE;	2722	return TRUE;
2892	}	2723	}
2893	/* IF we get here, key doesn't exist */	2724	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2759	* Returns TRUE on success.
2929	*/	2760	*/
2930	int	2761	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2762	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2763	{
2933	shstr
2934	key_ (key);	2764	shstr key_ (key);
2935		2765
2936	return set_ob_key_value_s (op, key_, value, add_key);	2766	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2767	}
		2768
		2769	object::depth_iterator::depth_iterator (object *container)
		2770	: iterator_base (container)
		2771	{
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
		2775
		2776	void
		2777	object::depth_iterator::next ()
		2778	{
		2779	if (item->below)
		2780	{
		2781	item = item->below;
		2782
		2783	while (item->inv)
		2784	item = item->inv;
		2785	}
		2786	else
		2787	item = item->env;
		2788	}
		2789
		2790	// return a suitable string describing an objetc in enough detail to find it
		2791	const char *
		2792	object::debug_desc (char *info) const
		2793	{
		2794	char info2[256 * 3];
		2795	char *p = info;
		2796
		2797	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2798	count,
		2799	&name,
		2800	title ? " " : "",
		2801	title ? (const char *)title : "");
		2802
		2803	if (env)
		2804	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2805
		2806	if (map)
		2807	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2808
		2809	return info;
		2810	}
		2811
		2812	const char *
		2813	object::debug_desc () const
		2814	{
		2815	static char info[256 * 3];
		2816	return debug_desc (info);
		2817	}
		2818

Diff Legend

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