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.53 by root, Tue Nov 7 16:30:54 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.
…		…
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	object *op;
412		418
413	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	420	if (op->count == i)
415	break;	421	break;
		422
416	return op;	423	return op;
417	}	424	}
418		425
419	/*	426	/*
420	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
…		…
423	*/	430	*/
424		431
425	object *	432	object *
426	find_object_name (const char *str)	433	find_object_name (const char *str)
427	{	434	{
428	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
429	object *op;	436	object *op;
430		437
431	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	439	if (op->name == str_)
433	break;	440	break;
434		441
435	return op;	442	return op;
436	}	443	}
437		444
…		…
440	{	447	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	449	}
443		450
444	/*	451	/*
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	452	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	453	* skill and experience objects.
485	*/	454	*/
486	void	455	void
487	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
488	{	457	{
489	if (owner == NULL || op == NULL)	458	if (!owner)
490	return;	459	return;
491		460
492	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	463	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	465	* 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.	466	* didn't match, this check is valid and I believe that cause is valid.
498	*/	467	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
500	owner = owner->owner;	469	owner = owner->owner;
501		470
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;	471	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	}	472	}
543		473
544	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	475	* refcounts and freeing the links.
546	*/	476	*/
…		…
562	{	492	{
563	attachable_base::clear ();	493	attachable_base::clear ();
564		494
565	free_key_values (this);	495	free_key_values (this);
566		496
		497	owner = 0;
567	name = 0;	498	name = 0;
568	name_pl = 0;	499	name_pl = 0;
569	title = 0;	500	title = 0;
570	race = 0;	501	race = 0;
571	slaying = 0;	502	slaying = 0;
572	skill = 0;	503	skill = 0;
573	msg = 0;	504	msg = 0;
574	lore = 0;	505	lore = 0;
575	custom_name = 0;	506	custom_name = 0;
576	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
577		519
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		521
580	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
		523
		524	/* What is not cleared is next, prev, and count */
		525
		526	expmul = 1.0;
		527	face = blank_face;
		528
		529	if (settings.casting_time)
		530	casting_time = -1;
581	}	531	}
582		532
583	void object::clone (object *destination)	533	void object::clone (object *destination)
584	{	534	{
585	*(object_copy *) destination = *this;	535	*(object_copy *)destination = *this;
586	*(object_pod *) destination = *this;	536	*(object_pod *)destination = *this;
587		537
588	if (self || cb)	538	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	539	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	}	540	}
623		541
624	/*	542	/*
625	* copy object first frees everything allocated by the second object,	543	* copy object first frees everything allocated by the second object,
626	* and then copies the contends of the first object into the second	544	* and then copies the contends of the first object into the second
627	* object, allocating what needs to be allocated. Basically, any	545	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	546	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	547	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	548	* will point at garbage.
631	*/	549	*/
632
633	void	550	void
634	copy_object (object *op2, object *op)	551	copy_object (object *op2, object *op)
635	{	552	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
697	/*	614	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
701	*/	618	*/
702
703	void	619	void
704	update_ob_speed (object *op)	620	update_ob_speed (object *op)
705	{	621	{
706	extern int arch_init;	622	extern int arch_init;
707		623
…		…
716	abort ();	632	abort ();
717	#else	633	#else
718	op->speed = 0;	634	op->speed = 0;
719	#endif	635	#endif
720	}	636	}
		637
721	if (arch_init)	638	if (arch_init)
722	{
723	return;	639	return;
724	}	640
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	642	{
727	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
729	return;	645	return;
730		646
731	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	648	* of the list. */
733	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
734	if (op->active_next != NULL)	651	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
736	active_objects = op;	654	active_objects = op;
737	}	655	}
738	else	656	else
739	{	657	{
740	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
742	return;	660	return;
743		661
744	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
745	{	663	{
746	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
747	if (op->active_next != NULL)	666	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
749	}	668	}
750	else	669	else
751	{	670	{
752	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
753	if (op->active_next)	673	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
755	}	675	}
		676
756	op->active_next = NULL;	677	op->active_next = NULL;
757	op->active_prev = NULL;	678	op->active_prev = NULL;
758	}	679	}
759	}	680	}
760		681
…		…
890	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	813	* that is being removed.
893	*/	814	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	816	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	818	/* Nothing to do for that case */ ;
901	}
902	else	819	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		821
907	if (update_now)	822	if (update_now)
908	{	823	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	824	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);	825	update_position (op->map, op->x, op->y);
…		…
912		827
913	if (op->more != NULL)	828	if (op->more != NULL)
914	update_object (op->more, action);	829	update_object (op->more, action);
915	}	830	}
916		831
917	static	832	object::vector object::mortals;
918	std::vector < object *>	833	object::vector object::objects; // not yet used
919	mortals;	834	object *object::first;
920		835
921	void object::free_mortals ()	836	void object::free_mortals ()
922	{	837	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
925	i;	842	{
		843	delete *i;
		844	mortals.erase (i);
		845	}
926		846
927	mortals.clear ();	847	static int lastmortals = 0;//D
		848
		849	if (mortals.size() != lastmortals && lastmortals > 100)//D
		850	{
		851	lastmortals = mortals.size ();//D
		852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		853	}
928	}	854	}
929		855
930	object::object ()	856	object::object ()
931	{	857	{
932	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
933		859
934	expmul = 1.0;	860	expmul = 1.0;
935	face = blank_face;	861	face = blank_face;
936	attacked_by_count = -1;
937	}	862	}
938		863
939	object::~object ()	864	object::~object ()
940	{	865	{
941	free_key_values (this);	866	free_key_values (this);
942	}	867	}
943		868
944	void object::link ()	869	void object::link ()
945	{	870	{
946	count = ++ob_count;	871	count = ++ob_count;
		872	uuid = gen_uuid ();
947		873
948	prev = 0;	874	prev = 0;
949	next = objects;	875	next = object::first;
950		876
951	if (objects)	877	if (object::first)
952	objects->prev = this;	878	object::first->prev = this;
953		879
954	objects = this;	880	object::first = this;
955	}	881	}
956		882
957	void object::unlink ()	883	void object::unlink ()
958	{	884	{
959	count = 0;	885	if (this == object::first)
		886	object::first = next;
960		887
961	/* Remove this object from the list of used objects */	888	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	889	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	890	if (next) next->prev = prev;
966	if (this == objects)	891
967	objects = next;	892	prev = 0;
		893	next = 0;
968	}	894	}
969		895
970	object *object::create ()	896	object *object::create ()
971	{	897	{
972	object *
973	op = new object;	898	object *op = new object;
974
975	op->link ();	899	op->link ();
976	return op;	900	return op;
977	}	901	}
978		902
979	/*	903	/*
…		…
981	* it from the list of used objects, and puts it on the list of	905	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.	906	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for	907	* The object must have been removed by remove_ob() first for
984	* this function to succeed.	908	* this function to succeed.
985	*	909	*
986	* If free_inventory is set, free inventory as well. Else drop items in	910	* If destroy_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	911	* inventory to the ground.
988	*/	912	*/
989	void object::free (bool free_inventory)	913	void object::destroy (bool destroy_inventory)
990	{	914	{
		915	if (QUERY_FLAG (this, FLAG_FREED))
		916	return;
		917
		918	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		919	remove_friendly_object (this);
		920
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	921	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	922	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		923
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))	924	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		925
1013	if (more)	926	if (more)
1014	{	927	{
1015	more->free (free_inventory);	928	more->destroy (destroy_inventory);
1016	more = 0;	929	more = 0;
1017	}	930	}
1018		931
1019	if (inv)	932	if (inv)
1020	{	933	{
1021	/* Only if the space blocks everything do we not process -	934	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	935	* if some form of movement is allowed, let objects
1023	* drop on that space.	936	* drop on that space.
1024	*/	937	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	939	{
1027	object *	940	object *op = inv;
1028	op = inv;
1029		941
1030	while (op)	942	while (op)
1031	{	943	{
1032	object *
1033	tmp = op->below;	944	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	945	op->destroy (destroy_inventory);
1037	op = tmp;	946	op = tmp;
1038	}	947	}
1039	}	948	}
1040	else	949	else
1041	{ /* Put objects in inventory onto this space */	950	{ /* Put objects in inventory onto this space */
1042	object *	951	object *op = inv;
1043	op = inv;
1044		952
1045	while (op)	953	while (op)
1046	{	954	{
1047	object *
1048	tmp = op->below;	955	object *tmp = op->below;
1049		956
1050	remove_ob (op);	957	remove_ob (op);
1051		958
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	959	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))	960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1062	op = tmp;	969	op = tmp;
1063	}	970	}
1064	}	971	}
1065	}	972	}
1066		973
		974	// clear those pointers that likely might have circular references to us
		975	owner = 0;
		976	enemy = 0;
		977	attacked_by = 0;
		978
		979	// only relevant for players(?), but make sure of it anyways
		980	contr = 0;
		981
1067	/* Remove object from the active list */	982	/* Remove object from the active list */
1068	speed = 0;	983	speed = 0;
1069	update_ob_speed (this);	984	update_ob_speed (this);
1070		985
1071	unlink ();	986	unlink ();
1072		987
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	988	mortals.push_back (this);
1076	}	989	}
1077		990
1078	/*	991	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	992	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1084	sub_weight (object *op, signed long weight)	997	sub_weight (object *op, signed long weight)
1085	{	998	{
1086	while (op != NULL)	999	while (op != NULL)
1087	{	1000	{
1088	if (op->type == CONTAINER)	1001	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1002	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1003
1092	op->carrying -= weight;	1004	op->carrying -= weight;
1093	op = op->env;	1005	op = op->env;
1094	}	1006	}
1095	}	1007	}
1096		1008
…		…
1104	*/	1016	*/
1105		1017
1106	void	1018	void
1107	remove_ob (object *op)	1019	remove_ob (object *op)
1108	{	1020	{
		1021	object *tmp, *last = 0;
1109	object *	1022	object *otmp;
1110	tmp, *	1023
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1024	int check_walk_off;
1118	mapstruct *	1025	maptile *m;
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1026
		1027	sint16 x, y;
1124		1028
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1029	if (QUERY_FLAG (op, FLAG_REMOVED))
1126	{	1030	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1031
1130	/* Changed it to always dump core in this case. As has been learned	1032	SET_FLAG (op, FLAG_REMOVED);
1131	* in the past, trying to recover from errors almost always	1033
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)	1034	if (op->more != NULL)
1143	remove_ob (op->more);	1035	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1036
1147	/*	1037	/*
1148	* In this case, the object to be removed is in someones	1038	* In this case, the object to be removed is in someones
1149	* inventory.	1039	* inventory.
1150	*/	1040	*/
…		…
1176	*/	1066	*/
1177	op->x = op->env->x, op->y = op->env->y;	1067	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1068	op->map = op->env->map;
1179	op->above = NULL, op->below = NULL;	1069	op->above = NULL, op->below = NULL;
1180	op->env = NULL;	1070	op->env = NULL;
1181	return;	1071	}
		1072	else if (op->map)
1182	}	1073	{
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;	1074	x = op->x;
1189	y = op->y;	1075	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);	1076	m = get_map_from_coord (op->map, &x, &y);
1191		1077
1192	if (!m)	1078	if (!m)
1193	{	1079	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	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);	1081	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.	1082	/* 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	1083	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.	1084	* screwed up and should be fixed.
		1085	*/
		1086	abort ();
		1087	}
		1088
		1089	if (op->map != m)
		1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1091	op->map->path, m->path, op->x, op->y, x, y);
		1092
		1093	/* Re did the following section of code - it looks like it had
		1094	* lots of logic for things we no longer care about
1199	*/	1095	*/
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		1096
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 */	1097	/* link the object above us */
1213	if (op->above)	1098	if (op->above)
1214	op->above->below = op->below;	1099	op->above->below = op->below;
1215	else	1100	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1101	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217		1102
1218	/* Relink the object below us, if there is one */	1103	/* Relink the object below us, if there is one */
1219	if (op->below)	1104	if (op->below)
1220	{
1221	op->below->above = op->above;	1105	op->below->above = op->above;
1222	}
1223	else	1106	else
1224	{	1107	{
1225	/* Nothing below, which means we need to relink map object for this space	1108	/* 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	1109	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1110	* 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	*/	1111	*/
1259	if (tmp->container == op)	1112	if (GET_MAP_OB (m, x, y) != op)
1260	{	1113	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1114	char *dump = dump_object (op);
1262	tmp->container = NULL;	1115	LOG (llevError,
		1116	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1117	free (dump);
		1118	dump = dump_object (GET_MAP_OB (m, x, y));
		1119	LOG (llevError, "%s\n", dump);
		1120	free (dump);
1263	}	1121	}
1264	tmp->contr->socket.update_look = 1;	1122
1265	}	1123	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	{	1124	}
1269		1125
1270	move_apply (tmp, op, NULL);	1126	op->above = 0;
1271	if (was_destroyed (op, tag))	1127	op->below = 0;
		1128
		1129	if (op->map->in_memory == MAP_SAVING)
		1130	return;
		1131
		1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1133
		1134	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1135	{
		1136	/* No point updating the players look faces if he is the object
		1137	* being removed.
		1138	*/
		1139
		1140	if (tmp->type == PLAYER && tmp != op)
1272	{	1141	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1142	/* If a container that the player is currently using somehow gets
		1143	* removed (most likely destroyed), update the player view
		1144	* appropriately.
		1145	*/
		1146	if (tmp->container == op)
		1147	{
		1148	CLEAR_FLAG (op, FLAG_APPLIED);
		1149	tmp->container = NULL;
		1150	}
		1151
		1152	tmp->contr->socket.update_look = 1;
1274	}	1153	}
		1154
		1155	/* See if player moving off should effect something */
		1156	if (check_walk_off
		1157	&& ((op->move_type & tmp->move_off)
		1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1159	{
		1160	move_apply (tmp, op, NULL);
		1161
		1162	if (op->destroyed ())
		1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1275	}	1164	}
1276		1165
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1167
1279	if (tmp->above == tmp)	1168	if (tmp->above == tmp)
1280	tmp->above = NULL;	1169	tmp->above = NULL;
		1170
1281	last = tmp;	1171	last = tmp;
1282	}	1172	}
		1173
1283	/* last == NULL of there are no objects on this space */	1174	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1175	if (last == NULL)
1285	{	1176	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1178	* 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	1179	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1180	* be correct anyways.
1290	*/	1181	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1183	update_position (op->map, op->x, op->y);
1293	}	1184	}
1294	else	1185	else
1295	update_object (last, UP_OBJ_REMOVE);	1186	update_object (last, UP_OBJ_REMOVE);
1296		1187
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);	1189	update_all_los (op->map, op->x, op->y);
1299		1190	}
1300	}	1191	}
1301		1192
1302	/*	1193	/*
1303	* merge_ob(op,top):	1194	* merge_ob(op,top):
1304	*	1195	*
1305	* This function goes through all objects below and including top, and	1196	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1197	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1198	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1199	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1200	*/
1310
1311	object *	1201	object *
1312	merge_ob (object *op, object *top)	1202	merge_ob (object *op, object *top)
1313	{	1203	{
1314	if (!op->nrof)	1204	if (!op->nrof)
1315	return 0;	1205	return 0;
		1206
1316	if (top == NULL)	1207	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1208	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1209
1318	for (; top != NULL; top = top->below)	1210	for (; top != NULL; top = top->below)
1319	{	1211	{
1320	if (top == op)	1212	if (top == op)
1321	continue;	1213	continue;
1322	if (CAN_MERGE (op, top))	1214	if (CAN_MERGE (op, top))
…		…
1328	remove_ob (op);	1220	remove_ob (op);
1329	free_object (op);	1221	free_object (op);
1330	return top;	1222	return top;
1331	}	1223	}
1332	}	1224	}
		1225
1333	return NULL;	1226	return 0;
1334	}	1227	}
1335		1228
1336	/*	1229	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1230	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1231	* job preparing multi-part monsters
1339	*/	1232	*/
1340	object *	1233	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1234	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1235	{
1343	object *	1236	object *tmp;
1344	tmp;
1345		1237
1346	if (op->head)	1238	if (op->head)
1347	op = op->head;	1239	op = op->head;
		1240
1348	for (tmp = op; tmp; tmp = tmp->more)	1241	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1242	{
1350	tmp->x = x + tmp->arch->clone.x;	1243	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1244	tmp->y = y + tmp->arch->clone.y;
1352	}	1245	}
		1246
1353	return insert_ob_in_map (op, m, originator, flag);	1247	return insert_ob_in_map (op, m, originator, flag);
1354	}	1248	}
1355		1249
1356	/*	1250	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1251	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1267	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1268	* just 'op' otherwise
1375	*/	1269	*/
1376		1270
1377	object *	1271	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1273	{
1380	object *	1274	object *tmp, *top, *floor = NULL;
1381	tmp, *	1275	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1276
1388	if (QUERY_FLAG (op, FLAG_FREED))	1277	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1278	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1279	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1280	return NULL;
1392	}	1281	}
		1282
1393	if (m == NULL)	1283	if (m == NULL)
1394	{	1284	{
1395	dump_object (op);	1285	char *dump = dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1286	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1287	free (dump);
1397	return op;	1288	return op;
1398	}	1289	}
		1290
1399	if (out_of_map (m, op->x, op->y))	1291	if (out_of_map (m, op->x, op->y))
1400	{	1292	{
1401	dump_object (op);	1293	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1294	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1295	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1296	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1297	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1298	* improperly inserted.
1407	*/	1299	*/
1408	abort ();	1300	abort ();
1409	#endif	1301	#endif
		1302	free (dump);
1410	return op;	1303	return op;
1411	}	1304	}
		1305
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1306	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1307	{
1414	dump_object (op);	1308	char *dump = dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1309	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1310	free (dump);
1416	return op;	1311	return op;
1417	}	1312	}
		1313
1418	if (op->more != NULL)	1314	if (op->more != NULL)
1419	{	1315	{
1420	/* The part may be on a different map. */	1316	/* The part may be on a different map. */
1421		1317
1422	object *
1423	more = op->more;	1318	object *more = op->more;
1424		1319
1425	/* We really need the caller to normalize coordinates - if	1320	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1321	* 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	1322	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1323	* is clear wrong do we normalize it.
1429	*/	1324	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1325	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1326	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1327	else if (!more->map)
1435	{	1328	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1329	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1330	* more->map should always point to the parent.
1438	*/	1331	*/
…		…
1441		1334
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1335	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1336	{
1444	if (!op->head)	1337	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1338	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1339
1446	return NULL;	1340	return NULL;
1447	}	1341	}
1448	}	1342	}
		1343
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1344	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1345
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1346	/* 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	1347	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1348	* need extra work
…		…
1457	y = op->y;	1352	y = op->y;
1458		1353
1459	/* this has to be done after we translate the coordinates.	1354	/* this has to be done after we translate the coordinates.
1460	*/	1355	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1356	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1357	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1358	if (CAN_MERGE (op, tmp))
1465	{	1359	{
1466	op->nrof += tmp->nrof;	1360	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1361	remove_ob (tmp);
1468	free_object (tmp);	1362	free_object (tmp);
1469	}	1363	}
1470	}
1471		1364
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1365	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1366	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1367
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1368	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1369	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1370
1477	if (flag & INS_BELOW_ORIGINATOR)	1371	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1372	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1373	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1374	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1375	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1376	abort ();
1483	}	1377	}
		1378
1484	op->above = originator;	1379	op->above = originator;
1485	op->below = originator->below;	1380	op->below = originator->below;
		1381
1486	if (op->below)	1382	if (op->below)
1487	op->below->above = op;	1383	op->below->above = op;
1488	else	1384	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1385	SET_MAP_OB (op->map, op->x, op->y, op);
		1386
1490	/* since *below* originator, no need to update top */	1387	/* since *below* originator, no need to update top */
1491	originator->below = op;	1388	originator->below = op;
1492	}	1389	}
1493	else	1390	else
1494	{	1391	{
1495	/* If there are other objects, then */	1392	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1393	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1394	{
1498	object *
1499	last = NULL;	1395	object *last = NULL;
1500		1396
1501	/*	1397	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1398	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1399	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1400	* Generally, we want to put the new object on top. But if
…		…
1513		1409
1514	while (top != NULL)	1410	while (top != NULL)
1515	{	1411	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1412	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1413	floor = top;
		1414
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1415	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1416	{
1520	/* We insert above top, so we want this object below this */	1417	/* We insert above top, so we want this object below this */
1521	top = top->below;	1418	top = top->below;
1522	break;	1419	break;
1523	}	1420	}
		1421
1524	last = top;	1422	last = top;
1525	top = top->above;	1423	top = top->above;
1526	}	1424	}
		1425
1527	/* Don't want top to be NULL, so set it to the last valid object */	1426	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1427	top = last;
1529		1428
1530	/* We let update_position deal with figuring out what the space	1429	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1430	* looks like instead of lots of conditions here.
…		…
1551	*/	1450	*/
1552	if (last && last->below && last != floor)	1451	if (last && last->below && last != floor)
1553	top = last->below;	1452	top = last->below;
1554	}	1453	}
1555	} /* If objects on this space */	1454	} /* If objects on this space */
		1455
1556	if (flag & INS_MAP_LOAD)	1456	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1457	top = GET_MAP_TOP (op->map, op->x, op->y);
		1458
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1459	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1460	top = floor;
1560		1461
1561	/* Top is the object that our object (op) is going to get inserted above.	1462	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1463	*/
1563		1464
1564	/* First object on this space */	1465	/* First object on this space */
1565	if (!top)	1466	if (!top)
1566	{	1467	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1468	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1469
1568	if (op->above)	1470	if (op->above)
1569	op->above->below = op;	1471	op->above->below = op;
		1472
1570	op->below = NULL;	1473	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1474	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1475	}
1573	else	1476	else
1574	{ /* get inserted into the stack above top */	1477	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1478	op->above = top->above;
		1479
1576	if (op->above)	1480	if (op->above)
1577	op->above->below = op;	1481	op->above->below = op;
		1482
1578	op->below = top;	1483	op->below = top;
1579	top->above = op;	1484	top->above = op;
1580	}	1485	}
		1486
1581	if (op->above == NULL)	1487	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1488	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1489	} /* else not INS_BELOW_ORIGINATOR */
1584		1490
1585	if (op->type == PLAYER)	1491	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1494	/* 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.	1495	* it, so save a few ticks and start from there.
1590	*/	1496	*/
1591	if (!(flag & INS_MAP_LOAD))	1497	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1498	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1499	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1500	tmp->contr->socket.update_look = 1;
1596	}
1597		1501
1598	/* If this object glows, it may affect lighting conditions that are	1502	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1503	* 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	1504	* 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	1505	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1509	* of effect may be sufficient.
1606	*/	1510	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1511	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1512	update_all_los (op->map, op->x, op->y);
1609		1513
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1514	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1515	update_object (op, UP_OBJ_INSERT);
1613
1614		1516
1615	/* Don't know if moving this to the end will break anything. However,	1517	/* 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.	1518	* we want to have update_look set above before calling this.
1617	*	1519	*
1618	* check_move_on() must be after this because code called from	1520	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1523	* update_object().
1622	*/	1524	*/
1623		1525
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* 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)	1527	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1528	{
1628	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1629	return NULL;	1530	return NULL;
1630		1531
…		…
1633	*/	1534	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1535	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1536	if (check_move_on (tmp, originator))
1636	return NULL;	1537	return NULL;
1637	}	1538	}
		1539
1638	return op;	1540	return op;
1639	}	1541	}
1640		1542
1641	/* this function inserts an object in the map, but if it	1543	/* 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.	1544	* finds an object of its own type, it'll remove that one first.
…		…
1659	remove_ob (tmp);	1561	remove_ob (tmp);
1660	free_object (tmp);	1562	free_object (tmp);
1661	}	1563	}
1662	}	1564	}
1663		1565
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1566	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1567
1667	tmp1->x = op->x;	1568	tmp1->x = op->x;
1668	tmp1->y = op->y;	1569	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1570	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1571	}
…		…
1688	if (orig_ob->nrof < nr)	1589	if (orig_ob->nrof < nr)
1689	{	1590	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1591	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1592	return NULL;
1692	}	1593	}
		1594
1693	newob = object_create_clone (orig_ob);	1595	newob = object_create_clone (orig_ob);
		1596
1694	if ((orig_ob->nrof -= nr) < 1)	1597	if ((orig_ob->nrof -= nr) < 1)
1695	{	1598	{
1696	if (!is_removed)	1599	if (!is_removed)
1697	remove_ob (orig_ob);	1600	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);	1601	free_object2 (orig_ob, 1);
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1609	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");	1610	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1611	return NULL;
1709	}	1612	}
1710	}	1613	}
		1614
1711	newob->nrof = nr;	1615	newob->nrof = nr;
1712		1616
1713	return newob;	1617	return newob;
1714	}	1618	}
1715		1619
…		…
1722	*/	1626	*/
1723		1627
1724	object *	1628	object *
1725	decrease_ob_nr (object *op, uint32 i)	1629	decrease_ob_nr (object *op, uint32 i)
1726	{	1630	{
1727	object *	1631	object *tmp;
1728	tmp;
1729	player *	1632	player *pl;
1730	pl;
1731		1633
1732	if (i == 0) /* objects with op->nrof require this check */	1634	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1635	return op;
1734		1636
1735	if (i > op->nrof)	1637	if (i > op->nrof)
1736	i = op->nrof;	1638	i = op->nrof;
1737		1639
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1640	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1641	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1642	else if (op->env != NULL)
1743	{	1643	{
1744	/* is this object in the players inventory, or sub container	1644	/* is this object in the players inventory, or sub container
1745	* therein?	1645	* therein?
1746	*/	1646	*/
…		…
1781	}	1681	}
1782	}	1682	}
1783	}	1683	}
1784	else	1684	else
1785	{	1685	{
1786	object *
1787	above = op->above;	1686	object *above = op->above;
1788		1687
1789	if (i < op->nrof)	1688	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1689	op->nrof -= i;
1792	}
1793	else	1690	else
1794	{	1691	{
1795	remove_ob (op);	1692	remove_ob (op);
1796	op->nrof = 0;	1693	op->nrof = 0;
1797	}	1694	}
		1695
1798	/* Since we just removed op, op->above is null */	1696	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1697	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1698	if (tmp->type == PLAYER)
1801	{	1699	{
1802	if (op->nrof)	1700	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1703	esrv_del_item (tmp->contr, op->count);
1806	}	1704	}
1807	}	1705	}
1808		1706
1809	if (op->nrof)	1707	if (op->nrof)
1810	{
1811	return op;	1708	return op;
1812	}
1813	else	1709	else
1814	{	1710	{
1815	free_object (op);	1711	free_object (op);
1816	return NULL;	1712	return NULL;
1817	}	1713	}
…		…
1826	add_weight (object *op, signed long weight)	1722	add_weight (object *op, signed long weight)
1827	{	1723	{
1828	while (op != NULL)	1724	while (op != NULL)
1829	{	1725	{
1830	if (op->type == CONTAINER)	1726	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1727	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1728
1834	op->carrying += weight;	1729	op->carrying += weight;
1835	op = op->env;	1730	op = op->env;
1836	}	1731	}
1837	}	1732	}
1838		1733
…		…
1857	tmp, *	1752	tmp, *
1858	otmp;	1753	otmp;
1859		1754
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1756	{
1862	dump_object (op);	1757	char *dump = dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1759	free (dump);
1864	return op;	1760	return op;
1865	}	1761	}
		1762
1866	if (where == NULL)	1763	if (where == NULL)
1867	{	1764	{
1868	dump_object (op);	1765	char *dump = dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1766	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1767	free (dump);
1870	return op;	1768	return op;
1871	}	1769	}
		1770
1872	if (where->head)	1771	if (where->head)
1873	{	1772	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1773	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;	1774	where = where->head;
1876	}	1775	}
		1776
1877	if (op->more)	1777	if (op->more)
1878	{	1778	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1779	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1780	return op;
1881	}	1781	}
		1782
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1784	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1785	if (op->nrof)
1885	{	1786	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1971	*/	1872	*/
1972		1873
1973	int	1874	int
1974	check_move_on (object *op, object *originator)	1875	check_move_on (object *op, object *originator)
1975	{	1876	{
1976	object *	1877	object *tmp;
1977	tmp;	1878	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1879	int x = op->x, y = op->y;
1984	MoveType	1880
1985	move_on,	1881	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1882
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1883	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1884	return 0;
1991
1992	tag = op->count;
1993		1885
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1886	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1887	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1888	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1889
…		…
2022	* we don't need to check all of them.	1914	* we don't need to check all of them.
2023	*/	1915	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1916	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1917	break;
2026	}	1918	}
		1919
2027	for (; tmp != NULL; tmp = tmp->below)	1920	for (; tmp; tmp = tmp->below)
2028	{	1921	{
2029	if (tmp == op)	1922	if (tmp == op)
2030	continue; /* Can't apply yourself */	1923	continue; /* Can't apply yourself */
2031		1924
2032	/* Check to see if one of the movement types should be slowed down.	1925	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1933	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))	1934	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1935	{
2043		1936
2044	float	1937	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1938	diff = tmp->move_slow_penalty * FABS (op->speed);
		1939
2048	if (op->type == PLAYER)	1940	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1941	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)))	1942	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1943	diff /= 4.0;
2054	}	1944
2055	}
2056	op->speed_left -= diff;	1945	op->speed_left -= diff;
2057	}	1946	}
2058	}	1947	}
2059		1948
2060	/* Basically same logic as above, except now for actual apply. */	1949	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1950	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))	1951	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1952	{
2064
2065	move_apply (tmp, op, originator);	1953	move_apply (tmp, op, originator);
		1954
2066	if (was_destroyed (op, tag))	1955	if (op->destroyed ())
2067	return 1;	1956	return 1;
2068		1957
2069	/* what the person/creature stepped onto has moved the object	1958	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1959	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1960	* have a feeling strange problems would result.
2072	*/	1961	*/
2073	if (op->map != m || op->x != x || op->y != y)	1962	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1963	return 0;
2075	}	1964	}
2076	}	1965	}
		1966
2077	return 0;	1967	return 0;
2078	}	1968	}
2079		1969
2080	/*	1970	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1971	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1972	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2084	*/	1974	*/
2085		1975
2086	object *	1976	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1977	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1978	{
2089	object *	1979	object *
2090	tmp;	1980	tmp;
2091		1981
2092	if (m == NULL || out_of_map (m, x, y))	1982	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	1995	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1996	* The first matching object is returned, or NULL if none.
2107	*/	1997	*/
2108		1998
2109	object *	1999	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	2000	present (unsigned char type, maptile *m, int x, int y)
2111	{	2001	{
2112	object *	2002	object *
2113	tmp;	2003	tmp;
2114		2004
2115	if (out_of_map (m, x, y))	2005	if (out_of_map (m, x, y))
…		…
2255	* the archetype because that isn't correct if the monster has been	2145	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2146	* customized, changed states, etc.
2257	*/	2147	*/
2258		2148
2259	int	2149	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2150	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2151	{
2262	int	2152	int
2263	i,	2153	i,
2264	index = 0, flag;	2154	index = 0, flag;
2265	static int	2155	static int
…		…
2286	return -1;	2176	return -1;
2287	return altern[RANDOM () % index];	2177	return altern[RANDOM () % index];
2288	}	2178	}
2289		2179
2290	/*	2180	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2181	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2182	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2183	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2184	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2185	*/
2296		2186
2297	int	2187	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2188	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2189	{
2300	int	2190	int
2301	i;	2191	i;
2302		2192
2303	for (i = 0; i < SIZEOFFREE; i++)	2193	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* because we have to know what movement the thing looking to move	2257	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2258	* there is capable of.
2369	*/	2259	*/
2370		2260
2371	int	2261	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2262	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2263	{
2374	int	2264	int
2375	i,	2265	i,
2376	max = SIZEOFFREE, mflags;	2266	max = SIZEOFFREE, mflags;
2377	sint16	2267
2378	nx,	2268	sint16 nx, ny;
2379	ny;
2380	object *	2269	object *
2381	tmp;	2270	tmp;
2382	mapstruct *	2271	maptile *
2383	mp;	2272	mp;
2384	MoveType	2273
2385	blocked,	2274	MoveType blocked, move_type;
2386	move_type;
2387		2275
2388	if (exclude && exclude->head)	2276	if (exclude && exclude->head)
2389	{	2277	{
2390	exclude = exclude->head;	2278	exclude = exclude->head;
2391	move_type = exclude->move_type;	2279	move_type = exclude->move_type;
…		…
2596	* Modified to be map tile aware -.MSW	2484	* Modified to be map tile aware -.MSW
2597	*/	2485	*/
2598		2486
2599		2487
2600	int	2488	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2489	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2490	{
2603	sint16	2491	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2492	int
2607	mflags;	2493	mflags;
2608		2494
2609	if (dir < 0)	2495	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2496	return 0; /* exit condition: invalid direction */
…		…
2688	if (prev)	2574	if (prev)
2689	prev->more = tmp;	2575	prev->more = tmp;
2690	prev = tmp;	2576	prev = tmp;
2691	}	2577	}
2692		2578
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2579	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2580	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2581
2699	return dst;	2582	return dst;
2700	}	2583	}
2701		2584
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. */	2585	/* 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 */	2586	/* 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, */	2587	/* 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. */	2588	/* 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. */	2589	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2590	/* Also remember that multiparts objects are not supported for now. */
2722		2591
2723	object *	2592	object *
2724	load_object_str (const char *obstr)	2593	load_object_str (const char *obstr)
2725	{	2594	{
2726	object *	2595	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2596	char filename[MAX_BUF];
2730		2597
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2598	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2599
2733	FILE *
2734	tempfile = fopen (filename, "w");	2600	FILE *tempfile = fopen (filename, "w");
2735		2601
2736	if (tempfile == NULL)	2602	if (tempfile == NULL)
2737	{	2603	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2604	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2605	return NULL;
2740	};	2606	}
		2607
2741	fprintf (tempfile, obstr);	2608	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2609	fclose (tempfile);
2743		2610
2744	op = get_object ();	2611	op = get_object ();
2745		2612
2746	object_thawer	2613	object_thawer thawer (filename);
2747	thawer (filename);
2748		2614
2749	if (thawer)	2615	if (thawer)
2750	load_object (thawer, op, 0);	2616	load_object (thawer, op, 0);
2751		2617
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2618	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2626	* returns NULL if no match.
2761	*/	2627	*/
2762	object *	2628	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2629	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2630	{
2765	object *	2631	object *tmp;
2766	tmp;
2767		2632
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2633	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2634	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2635	return tmp;
2771		2636
…		…
2779	* do the desired thing.	2644	* do the desired thing.
2780	*/	2645	*/
2781	key_value *	2646	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2647	get_ob_key_link (const object *ob, const char *key)
2783	{	2648	{
2784	key_value *	2649	key_value *link;
2785	link;
2786		2650
2787	for (link = ob->key_values; link != NULL; link = link->next)	2651	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2652	if (link->key == key)
2790	{
2791	return link;	2653	return link;
2792	}
2793	}
2794		2654
2795	return NULL;	2655	return NULL;
2796	}	2656	}
2797		2657
2798	/*	2658	/*
…		…
2803	* The returned string is shared.	2663	* The returned string is shared.
2804	*/	2664	*/
2805	const char *	2665	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2666	get_ob_key_value (const object *op, const char *const key)
2807	{	2667	{
2808	key_value *	2668	key_value *link;
2809	link;	2669	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2670
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2671	if (!canonical_key)
2816	{	2672	{
2817	/* 1. There being a field named key on any object	2673	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2674	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2675	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2676	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2677	*/
2822	return NULL;	2678	return 0;
2823	}	2679	}
2824		2680
2825	/* This is copied from get_ob_key_link() above -	2681	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2682	* only 4 lines, and saves the function call overhead.
2827	*/	2683	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2684	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2685	if (link->key == canonical_key)
2831	{
2832	return link->value;	2686	return link->value;
2833	}	2687
2834	}
2835	return NULL;	2688	return 0;
2836	}	2689	}
2837		2690
2838		2691
2839	/*	2692	/*
2840	* Updates the canonical_key in op to value.	2693	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2729	if (last)
2877	last->next = field->next;	2730	last->next = field->next;
2878	else	2731	else
2879	op->key_values = field->next;	2732	op->key_values = field->next;
2880		2733
2881	delete
2882	field;	2734	delete field;
2883	}	2735	}
2884	}	2736	}
2885	return TRUE;	2737	return TRUE;
2886	}	2738	}
2887	/* IF we get here, key doesn't exist */	2739	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2774	* Returns TRUE on success.
2923	*/	2775	*/
2924	int	2776	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2777	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2778	{
2927	shstr
2928	key_ (key);	2779	shstr key_ (key);
2929		2780
2930	return set_ob_key_value_s (op, key_, value, add_key);	2781	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2782	}
		2783
		2784	object::depth_iterator::depth_iterator (object *container)
		2785	: iterator_base (container)
		2786	{
		2787	while (item->inv)
		2788	item = item->inv;
		2789	}
		2790
		2791	void
		2792	object::depth_iterator::next ()
		2793	{
		2794	if (item->below)
		2795	{
		2796	item = item->below;
		2797
		2798	while (item->inv)
		2799	item = item->inv;
		2800	}
		2801	else
		2802	item = item->env;
		2803	}
		2804
		2805	// return a suitable string describing an objetc in enough detail to find it
		2806	const char *
		2807	object::debug_desc (char *info) const
		2808	{
		2809	char info2[256 * 3];
		2810	char *p = info;
		2811
		2812	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2813	count,
		2814	&name,
		2815	title ? " " : "",
		2816	title ? (const char *)title : "");
		2817
		2818	if (env)
		2819	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2820
		2821	if (map)
		2822	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2823
		2824	return info;
		2825	}
		2826
		2827	const char *
		2828	object::debug_desc () const
		2829	{
		2830	static char info[256 * 3];
		2831	return debug_desc (info);
		2832	}
		2833

Diff Legend

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