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.24 by root, Sun Sep 10 16:00:23 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.24 2006/09/10 16:00:23 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
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	470	}
543		471
544	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	473	* refcounts and freeing the links.
546	*/	474	*/
…		…
562	{	490	{
563	attachable_base::clear ();	491	attachable_base::clear ();
564		492
565	free_key_values (this);	493	free_key_values (this);
566		494
		495	owner = 0;
567	name = 0;	496	name = 0;
568	name_pl = 0;	497	name_pl = 0;
569	title = 0;	498	title = 0;
570	race = 0;	499	race = 0;
571	slaying = 0;	500	slaying = 0;
572	skill = 0;	501	skill = 0;
573	msg = 0;	502	msg = 0;
574	lore = 0;	503	lore = 0;
575	custom_name = 0;	504	custom_name = 0;
576	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;
577		517
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		519
580	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;
581	}	529	}
582		530
583	void object::clone (object *destination)	531	void object::clone (object *destination)
584	{	532	{
585	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
587		535
588	if (self || cb)	536	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}	538	}
623		539
624	/*	540	/*
625	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
626	* 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
627	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
628	* 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,
629	* 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
630	* will point at garbage.	546	* will point at garbage.
631	*/	547	*/
632
633	void	548	void
634	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
635	{	550	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	612	/*
698	* 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
699	* 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.
700	* 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.
701	*/	616	*/
702
703	void	617	void
704	update_ob_speed (object *op)	618	update_ob_speed (object *op)
705	{	619	{
706	extern int arch_init;	620	extern int arch_init;
707		621
…		…
716	abort ();	630	abort ();
717	#else	631	#else
718	op->speed = 0;	632	op->speed = 0;
719	#endif	633	#endif
720	}	634	}
		635
721	if (arch_init)	636	if (arch_init)
722	{
723	return;	637	return;
724	}	638
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	640	{
727	/* If already on active list, don't do anything */	641	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	642	if (op->active_next || op->active_prev || op == active_objects)
729	return;	643	return;
730		644
731	/* process_events() expects us to insert the object at the beginning	645	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	646	* of the list. */
733	op->active_next = active_objects;	647	op->active_next = active_objects;
		648
734	if (op->active_next != NULL)	649	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	650	op->active_next->active_prev = op;
		651
736	active_objects = op;	652	active_objects = op;
737	}	653	}
738	else	654	else
739	{	655	{
740	/* If not on the active list, nothing needs to be done */	656	/* If not on the active list, nothing needs to be done */
…		…
742	return;	658	return;
743		659
744	if (op->active_prev == NULL)	660	if (op->active_prev == NULL)
745	{	661	{
746	active_objects = op->active_next;	662	active_objects = op->active_next;
		663
747	if (op->active_next != NULL)	664	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	665	op->active_next->active_prev = NULL;
749	}	666	}
750	else	667	else
751	{	668	{
752	op->active_prev->active_next = op->active_next;	669	op->active_prev->active_next = op->active_next;
		670
753	if (op->active_next)	671	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	672	op->active_next->active_prev = op->active_prev;
755	}	673	}
		674
756	op->active_next = NULL;	675	op->active_next = NULL;
757	op->active_prev = NULL;	676	op->active_prev = NULL;
758	}	677	}
759	}	678	}
760		679
…		…
890	/* if the object is being removed, we can't make intelligent	809	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	810	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	811	* that is being removed.
893	*/	812	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	814	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	815	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	816	/* Nothing to do for that case */ ;
901	}
902	else	817	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	818	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		819
907	if (update_now)	820	if (update_now)
908	{	821	{
909	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);
910	update_position (op->map, op->x, op->y);	823	update_position (op->map, op->x, op->y);
…		…
912		825
913	if (op->more != NULL)	826	if (op->more != NULL)
914	update_object (op->more, action);	827	update_object (op->more, action);
915	}	828	}
916		829
917	static	830	object::vector object::mortals;
918	std::vector < object *>	831	object::vector object::objects; // not yet used
919	mortals;	832	object *object::first;
920		833
921	void object::free_mortals ()	834	void object::free_mortals ()
922	{	835	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	837	if ((*i)->refcnt)
		838	++i; // further delay freeing
		839	else
925	i;	840	{
		841	delete *i;
		842	mortals.erase (i);
		843	}
926		844
927	mortals.clear ();	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	}
928	}	852	}
929		853
930	object::object ()	854	object::object ()
931	{	855	{
932	SET_FLAG (this, FLAG_REMOVED);	856	SET_FLAG (this, FLAG_REMOVED);
933		857
934	expmul = 1.0;	858	expmul = 1.0;
935	face = blank_face;	859	face = blank_face;
936	attacked_by_count = -1;
937	}	860	}
938		861
939	object::~object ()	862	object::~object ()
940	{	863	{
941	free_key_values (this);	864	free_key_values (this);
942	}	865	}
943		866
944	void object::link ()	867	void object::link ()
945	{	868	{
946	count = ++ob_count;	869	count = ++ob_count;
		870	uuid = gen_uuid ();
947		871
948	prev = 0;	872	prev = 0;
949	next = objects;	873	next = object::first;
950		874
951	if (objects)	875	if (object::first)
952	objects->prev = this;	876	object::first->prev = this;
953		877
954	objects = this;	878	object::first = this;
955	}	879	}
956		880
957	void object::unlink ()	881	void object::unlink ()
958	{	882	{
959	count = 0;	883	if (this == object::first)
		884	object::first = next;
960		885
961	/* Remove this object from the list of used objects */	886	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	887	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	888	if (next) next->prev = prev;
966	if (this == objects)	889
967	objects = next;	890	prev = 0;
		891	next = 0;
968	}	892	}
969		893
970	object *object::create ()	894	object *object::create ()
971	{	895	{
972	object *
973	op = new object;	896	object *op = new object;
974
975	op->link ();	897	op->link ();
976	return op;	898	return op;
977	}	899	}
978		900
979	/*	901	/*
…		…
981	* 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
982	* free objects. The IS_FREED() flag is set in the object.	904	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for	905	* The object must have been removed by remove_ob() first for
984	* this function to succeed.	906	* this function to succeed.
985	*	907	*
986	* 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
987	* inventory to the ground.	909	* inventory to the ground.
988	*/	910	*/
989	void object::free (bool free_inventory)	911	void object::destroy (bool destroy_inventory)
990	{	912	{
		913	if (QUERY_FLAG (this, FLAG_FREED))
		914	return;
		915
		916	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		917	remove_friendly_object (this);
		918
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	919	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	920	remove_ob (this);
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		921
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	922	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		923
1013	if (more)	924	if (more)
1014	{	925	{
1015	more->free (free_inventory);	926	more->destroy (destroy_inventory);
1016	more = 0;	927	more = 0;
1017	}	928	}
1018		929
1019	if (inv)	930	if (inv)
1020	{	931	{
1021	/* Only if the space blocks everything do we not process -	932	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	933	* if some form of movement is allowed, let objects
1023	* drop on that space.	934	* drop on that space.
1024	*/	935	*/
1025	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)
1026	{	937	{
1027	object *	938	object *op = inv;
1028	op = inv;
1029		939
1030	while (op)	940	while (op)
1031	{	941	{
1032	object *
1033	tmp = op->below;	942	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	943	op->destroy (destroy_inventory);
1037	op = tmp;	944	op = tmp;
1038	}	945	}
1039	}	946	}
1040	else	947	else
1041	{ /* Put objects in inventory onto this space */	948	{ /* Put objects in inventory onto this space */
1042	object *	949	object *op = inv;
1043	op = inv;
1044		950
1045	while (op)	951	while (op)
1046	{	952	{
1047	object *
1048	tmp = op->below;	953	object *tmp = op->below;
1049		954
1050	remove_ob (op);	955	remove_ob (op);
1051		956
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| 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))
…		…
1062	op = tmp;	967	op = tmp;
1063	}	968	}
1064	}	969	}
1065	}	970	}
1066		971
		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;
		999
1067	/* Remove object from the active list */	1000	/* Remove object from the active list */
1068	speed = 0;	1001	speed = 0;
1069	update_ob_speed (this);	1002	update_ob_speed (this);
1070		1003
1071	unlink ();	1004	unlink ();
1072		1005
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	1006	mortals.push_back (this);
1076	}	1007	}
1077		1008
1078	/*	1009	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	1010	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1084	sub_weight (object *op, signed long weight)	1015	sub_weight (object *op, signed long weight)
1085	{	1016	{
1086	while (op != NULL)	1017	while (op != NULL)
1087	{	1018	{
1088	if (op->type == CONTAINER)	1019	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1021
1092	op->carrying -= weight;	1022	op->carrying -= weight;
1093	op = op->env;	1023	op = op->env;
1094	}	1024	}
1095	}	1025	}
1096		1026
…		…
1104	*/	1034	*/
1105		1035
1106	void	1036	void
1107	remove_ob (object *op)	1037	remove_ob (object *op)
1108	{	1038	{
		1039	object *tmp, *last = 0;
1109	object *	1040	object *otmp;
1110	tmp, *	1041
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1042	int check_walk_off;
1118	mapstruct *	1043	maptile *m;
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1044
		1045	sint16 x, y;
1124		1046
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1047	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1048	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1049
1130	/* Changed it to always dump core in this case. As has been learned	1050	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1051
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)	1052	if (op->more != NULL)
1143	remove_ob (op->more);	1053	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1054
1147	/*	1055	/*
1148	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1149	* inventory.	1057	* inventory.
1150	*/	1058	*/
…		…
1176	*/	1084	*/
1177	op->x = op->env->x, op->y = op->env->y;	1085	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1086	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1087	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1088	op->env = NULL;
1181	return;	1089	}
		1090	else if (op->map)
1182	}	1091	{
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;	1092	x = op->x;
1189	y = op->y;	1093	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1094	m = get_map_from_coord (op->map, &x, &y);
1191		1095
1192	if (!m)	1096	if (!m)
1193	{	1097	{
1194	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",
1195	op->map->path, op->x, op->y);	1099	op->map->path, op->x, op->y);
1196	/* 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.
1197	* it seems if we get into this case, something is probablye	1101	* it seems if we get into this case, something is probablye
1198	* 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
1199	*/	1113	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1114
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1115	/* link the object above us */
1213	if (op->above)	1116	if (op->above)
1214	op->above->below = op->below;	1117	op->above->below = op->below;
1215	else	1118	else
1216	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 */
1217		1120
1218	/* Relink the object below us, if there is one */	1121	/* Relink the object below us, if there is one */
1219	if (op->below)	1122	if (op->below)
1220	{
1221	op->below->above = op->above;	1123	op->below->above = op->above;
1222	}
1223	else	1124	else
1224	{	1125	{
1225	/* 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
1226	* use translated coordinates in case some oddness with map tiling is	1127	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1128	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	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",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1129	*/
1259	if (tmp->container == op)	1130	if (GET_MAP_OB (m, x, y) != op)
1260	{	1131	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1132	char *dump = dump_object (op);
1262	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);
1263	}	1139	}
1264	tmp->contr->socket.update_look = 1;	1140
1265	}	1141	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1142	}
1269		1143
1270	move_apply (tmp, op, NULL);	1144	op->above = 0;
1271	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)
1272	{	1159	{
1273	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;
1274	}	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 ());
1275	}	1182	}
1276		1183
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1184	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1185
1279	if (tmp->above == tmp)	1186	if (tmp->above == tmp)
1280	tmp->above = NULL;	1187	tmp->above = NULL;
		1188
1281	last = tmp;	1189	last = tmp;
1282	}	1190	}
		1191
1283	/* last == NULL of there are no objects on this space */	1192	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1193	if (last == NULL)
1285	{	1194	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1195	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* 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
1288	* 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
1289	* be correct anyways.	1198	* be correct anyways.
1290	*/	1199	*/
1291	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);
1292	update_position (op->map, op->x, op->y);	1201	update_position (op->map, op->x, op->y);
1293	}	1202	}
1294	else	1203	else
1295	update_object (last, UP_OBJ_REMOVE);	1204	update_object (last, UP_OBJ_REMOVE);
1296		1205
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1206	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1207	update_all_los (op->map, op->x, op->y);
1299		1208	}
1300	}	1209	}
1301		1210
1302	/*	1211	/*
1303	* merge_ob(op,top):	1212	* merge_ob(op,top):
1304	*	1213	*
1305	* This function goes through all objects below and including top, and	1214	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1215	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1216	* If top is NULL, it is calculated.
1308	* 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
1309	*/	1218	*/
1310
1311	object *	1219	object *
1312	merge_ob (object *op, object *top)	1220	merge_ob (object *op, object *top)
1313	{	1221	{
1314	if (!op->nrof)	1222	if (!op->nrof)
1315	return 0;	1223	return 0;
		1224
1316	if (top == NULL)	1225	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1226	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1227
1318	for (; top != NULL; top = top->below)	1228	for (; top != NULL; top = top->below)
1319	{	1229	{
1320	if (top == op)	1230	if (top == op)
1321	continue;	1231	continue;
1322	if (CAN_MERGE (op, top))	1232	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1238	remove_ob (op);
1329	free_object (op);	1239	free_object (op);
1330	return top;	1240	return top;
1331	}	1241	}
1332	}	1242	}
		1243
1333	return NULL;	1244	return 0;
1334	}	1245	}
1335		1246
1336	/*	1247	/*
1337	* 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
1338	* job preparing multi-part monsters	1249	* job preparing multi-part monsters
1339	*/	1250	*/
1340	object *	1251	object *
1341	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)
1342	{	1253	{
1343	object *	1254	object *tmp;
1344	tmp;
1345		1255
1346	if (op->head)	1256	if (op->head)
1347	op = op->head;	1257	op = op->head;
		1258
1348	for (tmp = op; tmp; tmp = tmp->more)	1259	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1260	{
1350	tmp->x = x + tmp->arch->clone.x;	1261	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1262	tmp->y = y + tmp->arch->clone.y;
1352	}	1263	}
		1264
1353	return insert_ob_in_map (op, m, originator, flag);	1265	return insert_ob_in_map (op, m, originator, flag);
1354	}	1266	}
1355		1267
1356	/*	1268	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1269	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1285	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1286	* just 'op' otherwise
1375	*/	1287	*/
1376		1288
1377	object *	1289	object *
1378	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)
1379	{	1291	{
1380	object *	1292	object *tmp, *top, *floor = NULL;
1381	tmp, *	1293	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1294
1388	if (QUERY_FLAG (op, FLAG_FREED))	1295	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1296	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1297	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1298	return NULL;
1392	}	1299	}
		1300
1393	if (m == NULL)	1301	if (m == NULL)
1394	{	1302	{
1395	dump_object (op);	1303	char *dump = dump_object (op);
1396	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);
1397	return op;	1306	return op;
1398	}	1307	}
		1308
1399	if (out_of_map (m, op->x, op->y))	1309	if (out_of_map (m, op->x, op->y))
1400	{	1310	{
1401	dump_object (op);	1311	char *dump = dump_object (op);
1402	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);
1403	#ifdef MANY_CORES	1313	#ifdef MANY_CORES
1404	/* 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
1405	* 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
1406	* improperly inserted.	1316	* improperly inserted.
1407	*/	1317	*/
1408	abort ();	1318	abort ();
1409	#endif	1319	#endif
		1320	free (dump);
1410	return op;	1321	return op;
1411	}	1322	}
		1323
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1324	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1325	{
1414	dump_object (op);	1326	char *dump = dump_object (op);
1415	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);
1416	return op;	1329	return op;
1417	}	1330	}
		1331
1418	if (op->more != NULL)	1332	if (op->more != NULL)
1419	{	1333	{
1420	/* The part may be on a different map. */	1334	/* The part may be on a different map. */
1421		1335
1422	object *
1423	more = op->more;	1336	object *more = op->more;
1424		1337
1425	/* We really need the caller to normalize coordinates - if	1338	/* We really need the caller to normalize coordinates - if
1426	* 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
1427	* 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
1428	* is clear wrong do we normalize it.	1341	* is clear wrong do we normalize it.
1429	*/	1342	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1343	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1344	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1345	else if (!more->map)
1435	{	1346	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1347	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1348	* more->map should always point to the parent.
1438	*/	1349	*/
…		…
1441		1352
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1353	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1354	{
1444	if (!op->head)	1355	if (!op->head)
1445	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
1446	return NULL;	1358	return NULL;
1447	}	1359	}
1448	}	1360	}
		1361
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1362	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1363
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1364	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1365	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1366	* need extra work
…		…
1457	y = op->y;	1370	y = op->y;
1458		1371
1459	/* this has to be done after we translate the coordinates.	1372	/* this has to be done after we translate the coordinates.
1460	*/	1373	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1374	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1375	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1376	if (CAN_MERGE (op, tmp))
1465	{	1377	{
1466	op->nrof += tmp->nrof;	1378	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1379	remove_ob (tmp);
1468	free_object (tmp);	1380	free_object (tmp);
1469	}	1381	}
1470	}
1471		1382
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1383	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1384	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1385
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1386	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1387	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1388
1477	if (flag & INS_BELOW_ORIGINATOR)	1389	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1390	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1391	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1392	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1393	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1394	abort ();
1483	}	1395	}
		1396
1484	op->above = originator;	1397	op->above = originator;
1485	op->below = originator->below;	1398	op->below = originator->below;
		1399
1486	if (op->below)	1400	if (op->below)
1487	op->below->above = op;	1401	op->below->above = op;
1488	else	1402	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1403	SET_MAP_OB (op->map, op->x, op->y, op);
		1404
1490	/* since *below* originator, no need to update top */	1405	/* since *below* originator, no need to update top */
1491	originator->below = op;	1406	originator->below = op;
1492	}	1407	}
1493	else	1408	else
1494	{	1409	{
1495	/* If there are other objects, then */	1410	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1411	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1412	{
1498	object *
1499	last = NULL;	1413	object *last = NULL;
1500		1414
1501	/*	1415	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1416	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1417	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1418	* Generally, we want to put the new object on top. But if
…		…
1513		1427
1514	while (top != NULL)	1428	while (top != NULL)
1515	{	1429	{
1516	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))
1517	floor = top;	1431	floor = top;
		1432
1518	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))
1519	{	1434	{
1520	/* We insert above top, so we want this object below this */	1435	/* We insert above top, so we want this object below this */
1521	top = top->below;	1436	top = top->below;
1522	break;	1437	break;
1523	}	1438	}
		1439
1524	last = top;	1440	last = top;
1525	top = top->above;	1441	top = top->above;
1526	}	1442	}
		1443
1527	/* 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 */
1528	top = last;	1445	top = last;
1529		1446
1530	/* We let update_position deal with figuring out what the space	1447	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1448	* looks like instead of lots of conditions here.
…		…
1551	*/	1468	*/
1552	if (last && last->below && last != floor)	1469	if (last && last->below && last != floor)
1553	top = last->below;	1470	top = last->below;
1554	}	1471	}
1555	} /* If objects on this space */	1472	} /* If objects on this space */
		1473
1556	if (flag & INS_MAP_LOAD)	1474	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1475	top = GET_MAP_TOP (op->map, op->x, op->y);
		1476
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1477	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1478	top = floor;
1560		1479
1561	/* Top is the object that our object (op) is going to get inserted above.	1480	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1481	*/
1563		1482
1564	/* First object on this space */	1483	/* First object on this space */
1565	if (!top)	1484	if (!top)
1566	{	1485	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1486	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1487
1568	if (op->above)	1488	if (op->above)
1569	op->above->below = op;	1489	op->above->below = op;
		1490
1570	op->below = NULL;	1491	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1492	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1493	}
1573	else	1494	else
1574	{ /* get inserted into the stack above top */	1495	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1496	op->above = top->above;
		1497
1576	if (op->above)	1498	if (op->above)
1577	op->above->below = op;	1499	op->above->below = op;
		1500
1578	op->below = top;	1501	op->below = top;
1579	top->above = op;	1502	top->above = op;
1580	}	1503	}
		1504
1581	if (op->above == NULL)	1505	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1506	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1507	} /* else not INS_BELOW_ORIGINATOR */
1584		1508
1585	if (op->type == PLAYER)	1509	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1512	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1513	* it, so save a few ticks and start from there.
1590	*/	1514	*/
1591	if (!(flag & INS_MAP_LOAD))	1515	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1516	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1517	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1518	tmp->contr->socket.update_look = 1;
1596	}
1597		1519
1598	/* If this object glows, it may affect lighting conditions that are	1520	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1521	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1522	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1523	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1527	* of effect may be sufficient.
1606	*/	1528	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1529	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1530	update_all_los (op->map, op->x, op->y);
1609		1531
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1532	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1533	update_object (op, UP_OBJ_INSERT);
1613
1614		1534
1615	/* 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,
1616	* we want to have update_look set above before calling this.	1536	* we want to have update_look set above before calling this.
1617	*	1537	*
1618	* check_move_on() must be after this because code called from	1538	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1540	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1541	* update_object().
1622	*/	1542	*/
1623		1543
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1544	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1545	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1546	{
1628	if (check_move_on (op, originator))	1547	if (check_move_on (op, originator))
1629	return NULL;	1548	return NULL;
1630		1549
…		…
1633	*/	1552	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1553	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1554	if (check_move_on (tmp, originator))
1636	return NULL;	1555	return NULL;
1637	}	1556	}
		1557
1638	return op;	1558	return op;
1639	}	1559	}
1640		1560
1641	/* this function inserts an object in the map, but if it	1561	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1562	* finds an object of its own type, it'll remove that one first.
…		…
1659	remove_ob (tmp);	1579	remove_ob (tmp);
1660	free_object (tmp);	1580	free_object (tmp);
1661	}	1581	}
1662	}	1582	}
1663		1583
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1584	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1585
1667	tmp1->x = op->x;	1586	tmp1->x = op->x;
1668	tmp1->y = op->y;	1587	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1588	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1589	}
…		…
1688	if (orig_ob->nrof < nr)	1607	if (orig_ob->nrof < nr)
1689	{	1608	{
1690	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);
1691	return NULL;	1610	return NULL;
1692	}	1611	}
		1612
1693	newob = object_create_clone (orig_ob);	1613	newob = object_create_clone (orig_ob);
		1614
1694	if ((orig_ob->nrof -= nr) < 1)	1615	if ((orig_ob->nrof -= nr) < 1)
1695	{	1616	{
1696	if (!is_removed)	1617	if (!is_removed)
1697	remove_ob (orig_ob);	1618	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1619	free_object2 (orig_ob, 1);
…		…
1706	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.");
1707	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");
1708	return NULL;	1629	return NULL;
1709	}	1630	}
1710	}	1631	}
		1632
1711	newob->nrof = nr;	1633	newob->nrof = nr;
1712		1634
1713	return newob;	1635	return newob;
1714	}	1636	}
1715		1637
…		…
1722	*/	1644	*/
1723		1645
1724	object *	1646	object *
1725	decrease_ob_nr (object *op, uint32 i)	1647	decrease_ob_nr (object *op, uint32 i)
1726	{	1648	{
1727	object *	1649	object *tmp;
1728	tmp;
1729	player *	1650	player *pl;
1730	pl;
1731		1651
1732	if (i == 0) /* objects with op->nrof require this check */	1652	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1653	return op;
1734		1654
1735	if (i > op->nrof)	1655	if (i > op->nrof)
1736	i = op->nrof;	1656	i = op->nrof;
1737		1657
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1658	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1659	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1660	else if (op->env != NULL)
1743	{	1661	{
1744	/* is this object in the players inventory, or sub container	1662	/* is this object in the players inventory, or sub container
1745	* therein?	1663	* therein?
1746	*/	1664	*/
…		…
1781	}	1699	}
1782	}	1700	}
1783	}	1701	}
1784	else	1702	else
1785	{	1703	{
1786	object *
1787	above = op->above;	1704	object *above = op->above;
1788		1705
1789	if (i < op->nrof)	1706	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1707	op->nrof -= i;
1792	}
1793	else	1708	else
1794	{	1709	{
1795	remove_ob (op);	1710	remove_ob (op);
1796	op->nrof = 0;	1711	op->nrof = 0;
1797	}	1712	}
		1713
1798	/* Since we just removed op, op->above is null */	1714	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1715	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1716	if (tmp->type == PLAYER)
1801	{	1717	{
1802	if (op->nrof)	1718	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1721	esrv_del_item (tmp->contr, op->count);
1806	}	1722	}
1807	}	1723	}
1808		1724
1809	if (op->nrof)	1725	if (op->nrof)
1810	{
1811	return op;	1726	return op;
1812	}
1813	else	1727	else
1814	{	1728	{
1815	free_object (op);	1729	free_object (op);
1816	return NULL;	1730	return NULL;
1817	}	1731	}
…		…
1826	add_weight (object *op, signed long weight)	1740	add_weight (object *op, signed long weight)
1827	{	1741	{
1828	while (op != NULL)	1742	while (op != NULL)
1829	{	1743	{
1830	if (op->type == CONTAINER)	1744	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1745	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1746
1834	op->carrying += weight;	1747	op->carrying += weight;
1835	op = op->env;	1748	op = op->env;
1836	}	1749	}
1837	}	1750	}
1838		1751
…		…
1857	tmp, *	1770	tmp, *
1858	otmp;	1771	otmp;
1859		1772
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1773	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1774	{
1862	dump_object (op);	1775	char *dump = dump_object (op);
1863	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);
1864	return op;	1778	return op;
1865	}	1779	}
		1780
1866	if (where == NULL)	1781	if (where == NULL)
1867	{	1782	{
1868	dump_object (op);	1783	char *dump = dump_object (op);
1869	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);
1870	return op;	1786	return op;
1871	}	1787	}
		1788
1872	if (where->head)	1789	if (where->head)
1873	{	1790	{
1874	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");
1875	where = where->head;	1792	where = where->head;
1876	}	1793	}
		1794
1877	if (op->more)	1795	if (op->more)
1878	{	1796	{
1879	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);
1880	return op;	1798	return op;
1881	}	1799	}
		1800
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1801	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1802	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1803	if (op->nrof)
1885	{	1804	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1805	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1971	*/	1890	*/
1972		1891
1973	int	1892	int
1974	check_move_on (object *op, object *originator)	1893	check_move_on (object *op, object *originator)
1975	{	1894	{
1976	object *	1895	object *tmp;
1977	tmp;	1896	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1897	int x = op->x, y = op->y;
1984	MoveType	1898
1985	move_on,	1899	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1900
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1901	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1902	return 0;
1991
1992	tag = op->count;
1993		1903
1994	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);
1995	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);
1996	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);
1997		1907
…		…
2022	* we don't need to check all of them.	1932	* we don't need to check all of them.
2023	*/	1933	*/
2024	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))
2025	break;	1935	break;
2026	}	1936	}
		1937
2027	for (; tmp != NULL; tmp = tmp->below)	1938	for (; tmp; tmp = tmp->below)
2028	{	1939	{
2029	if (tmp == op)	1940	if (tmp == op)
2030	continue; /* Can't apply yourself */	1941	continue; /* Can't apply yourself */
2031		1942
2032	/* 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.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1951	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((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))
2042	{	1953	{
2043		1954
2044	float	1955	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1956	diff = tmp->move_slow_penalty * FABS (op->speed);
		1957
2048	if (op->type == PLAYER)	1958	if (op->type == PLAYER)
2049	{
2050	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)) ||
2051	(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)))
2052	{
2053	diff /= 4.0;	1961	diff /= 4.0;
2054	}	1962
2055	}
2056	op->speed_left -= diff;	1963	op->speed_left -= diff;
2057	}	1964	}
2058	}	1965	}
2059		1966
2060	/* Basically same logic as above, except now for actual apply. */	1967	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1968	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((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))
2063	{	1970	{
2064
2065	move_apply (tmp, op, originator);	1971	move_apply (tmp, op, originator);
		1972
2066	if (was_destroyed (op, tag))	1973	if (op->destroyed ())
2067	return 1;	1974	return 1;
2068		1975
2069	/* what the person/creature stepped onto has moved the object	1976	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1977	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1978	* have a feeling strange problems would result.
2072	*/	1979	*/
2073	if (op->map != m || op->x != x || op->y != y)	1980	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1981	return 0;
2075	}	1982	}
2076	}	1983	}
		1984
2077	return 0;	1985	return 0;
2078	}	1986	}
2079		1987
2080	/*	1988	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1989	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1990	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1991	* The first matching object is returned, or NULL if none.
2084	*/	1992	*/
2085		1993
2086	object *	1994	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1995	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1996	{
2089	object *	1997	object *
2090	tmp;	1998	tmp;
2091		1999
2092	if (m == NULL || out_of_map (m, x, y))	2000	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	2013	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	2014	* The first matching object is returned, or NULL if none.
2107	*/	2015	*/
2108		2016
2109	object *	2017	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	2018	present (unsigned char type, maptile *m, int x, int y)
2111	{	2019	{
2112	object *	2020	object *
2113	tmp;	2021	tmp;
2114		2022
2115	if (out_of_map (m, x, y))	2023	if (out_of_map (m, x, y))
…		…
2255	* 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
2256	* customized, changed states, etc.	2164	* customized, changed states, etc.
2257	*/	2165	*/
2258		2166
2259	int	2167	int
2260	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)
2261	{	2169	{
2262	int	2170	int
2263	i,	2171	i,
2264	index = 0, flag;	2172	index = 0, flag;
2265	static int	2173	static int
…		…
2286	return -1;	2194	return -1;
2287	return altern[RANDOM () % index];	2195	return altern[RANDOM () % index];
2288	}	2196	}
2289		2197
2290	/*	2198	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2199	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2200	* find_free_spot(), but it will search max number of squares.
2293	* 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.
2294	* 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.
2295	*/	2203	*/
2296		2204
2297	int	2205	int
2298	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)
2299	{	2207	{
2300	int	2208	int
2301	i;	2209	i;
2302		2210
2303	for (i = 0; i < SIZEOFFREE; i++)	2211	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* 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
2368	* there is capable of.	2276	* there is capable of.
2369	*/	2277	*/
2370		2278
2371	int	2279	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2280	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2281	{
2374	int	2282	int
2375	i,	2283	i,
2376	max = SIZEOFFREE, mflags;	2284	max = SIZEOFFREE, mflags;
2377	sint16	2285
2378	nx,	2286	sint16 nx, ny;
2379	ny;
2380	object *	2287	object *
2381	tmp;	2288	tmp;
2382	mapstruct *	2289	maptile *
2383	mp;	2290	mp;
2384	MoveType	2291
2385	blocked,	2292	MoveType blocked, move_type;
2386	move_type;
2387		2293
2388	if (exclude && exclude->head)	2294	if (exclude && exclude->head)
2389	{	2295	{
2390	exclude = exclude->head;	2296	exclude = exclude->head;
2391	move_type = exclude->move_type;	2297	move_type = exclude->move_type;
…		…
2596	* Modified to be map tile aware -.MSW	2502	* Modified to be map tile aware -.MSW
2597	*/	2503	*/
2598		2504
2599		2505
2600	int	2506	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2507	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2508	{
2603	sint16	2509	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2510	int
2607	mflags;	2511	mflags;
2608		2512
2609	if (dir < 0)	2513	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2514	return 0; /* exit condition: invalid direction */
…		…
2688	if (prev)	2592	if (prev)
2689	prev->more = tmp;	2593	prev->more = tmp;
2690	prev = tmp;	2594	prev = tmp;
2691	}	2595	}
2692		2596
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2597	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2598	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2599
2699	return dst;	2600	return dst;
2700	}	2601	}
2701		2602
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2603	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* 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 */
2714
2715	/* 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, */
2716
2717	/* 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. */
2718
2719	/* 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. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2608	/* Also remember that multiparts objects are not supported for now. */
2722		2609
2723	object *	2610	object *
2724	load_object_str (const char *obstr)	2611	load_object_str (const char *obstr)
2725	{	2612	{
2726	object *	2613	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2614	char filename[MAX_BUF];
2730		2615
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2616	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2617
2733	FILE *
2734	tempfile = fopen (filename, "w");	2618	FILE *tempfile = fopen (filename, "w");
2735		2619
2736	if (tempfile == NULL)	2620	if (tempfile == NULL)
2737	{	2621	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2622	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2623	return NULL;
2740	};	2624	}
		2625
2741	fprintf (tempfile, obstr);	2626	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2627	fclose (tempfile);
2743		2628
2744	op = get_object ();	2629	op = get_object ();
2745		2630
2746	object_thawer	2631	object_thawer thawer (filename);
2747	thawer (filename);
2748		2632
2749	if (thawer)	2633	if (thawer)
2750	load_object (thawer, op, 0);	2634	load_object (thawer, op, 0);
2751		2635
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2636	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2644	* returns NULL if no match.
2761	*/	2645	*/
2762	object *	2646	object *
2763	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)
2764	{	2648	{
2765	object *	2649	object *tmp;
2766	tmp;
2767		2650
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2651	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2652	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2653	return tmp;
2771		2654
…		…
2779	* do the desired thing.	2662	* do the desired thing.
2780	*/	2663	*/
2781	key_value *	2664	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2665	get_ob_key_link (const object *ob, const char *key)
2783	{	2666	{
2784	key_value *	2667	key_value *link;
2785	link;
2786		2668
2787	for (link = ob->key_values; link != NULL; link = link->next)	2669	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2670	if (link->key == key)
2790	{
2791	return link;	2671	return link;
2792	}
2793	}
2794		2672
2795	return NULL;	2673	return NULL;
2796	}	2674	}
2797		2675
2798	/*	2676	/*
…		…
2803	* The returned string is shared.	2681	* The returned string is shared.
2804	*/	2682	*/
2805	const char *	2683	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2684	get_ob_key_value (const object *op, const char *const key)
2807	{	2685	{
2808	key_value *	2686	key_value *link;
2809	link;	2687	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2688
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2689	if (!canonical_key)
2816	{	2690	{
2817	/* 1. There being a field named key on any object	2691	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2692	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2693	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2694	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2695	*/
2822	return NULL;	2696	return 0;
2823	}	2697	}
2824		2698
2825	/* This is copied from get_ob_key_link() above -	2699	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2700	* only 4 lines, and saves the function call overhead.
2827	*/	2701	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2702	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2703	if (link->key == canonical_key)
2831	{
2832	return link->value;	2704	return link->value;
2833	}	2705
2834	}
2835	return NULL;	2706	return 0;
2836	}	2707	}
2837		2708
2838		2709
2839	/*	2710	/*
2840	* Updates the canonical_key in op to value.	2711	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2747	if (last)
2877	last->next = field->next;	2748	last->next = field->next;
2878	else	2749	else
2879	op->key_values = field->next;	2750	op->key_values = field->next;
2880		2751
2881	delete
2882	field;	2752	delete field;
2883	}	2753	}
2884	}	2754	}
2885	return TRUE;	2755	return TRUE;
2886	}	2756	}
2887	/* IF we get here, key doesn't exist */	2757	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2792	* Returns TRUE on success.
2923	*/	2793	*/
2924	int	2794	int
2925	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)
2926	{	2796	{
2927	shstr
2928	key_ (key);	2797	shstr key_ (key);
2929		2798
2930	return set_ob_key_value_s (op, key_, value, add_key);	2799	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	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