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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

…		…
16		16
17	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
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	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>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <skills.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
53	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	135	{
…		…
207	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)
208	return 0;	285	return 0;
209		286
210	switch (ob1->type)	287	switch (ob1->type)
211	{	288	{
212	case SCROLL:	289	case SCROLL:
213	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
214	return 0;	291	return 0;
215	break;	292	break;
216	}	293	}
217		294
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	296	{
220	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	375	* Some error messages.
296	* 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.
297	*/	377	*/
298		378
299	void	379	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	380	dump_object (object *op)
355	{	381	{
356	if (op == NULL)	382	if (!op)
357	{	383	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		384
365	void	385	object_freezer freezer;
366	dump_all_objects (void)	386	save_object (freezer, op, 3);
367	{	387	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	388	}
376		389
377	/*	390	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
399	*/	412	*/
400		413
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	418	if (op->count == i)
408	break;	419	return op;
		420
409	return op;	421	return 0;
410	}	422	}
411		423
412	/*	424	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
416	*/	428	*/
417		429
418	object *	430	object *
419	find_object_name (const char *str)	431	find_object_name (const char *str)
420	{	432	{
421	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
422	object *op;	434	object *op;
423		435
424	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	437	if (op->name == str_)
426	break;	438	break;
427		439
428	return op;	440	return op;
429	}	441	}
430		442
…		…
433	{	445	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	447	}
436		448
437	/*	449	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* 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
477	* skill and experience objects.	451	* skill and experience objects.
478	*/	452	*/
479	void	453	void
480	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
481	{	455	{
482	if (owner == NULL || op == NULL)	456	if (!owner)
483	return;	457	return;
484		458
485	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
486	/* 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
487	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
488	* 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
489	* freed and then another object replacing it. Since the ownercounts	463	* freed and then another object replacing it. Since the ownercounts
490	* 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.
491	*/	465	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
493	owner = owner->owner;	467	owner = owner->owner;
494		468
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	469	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	470	}
535		471
536	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	473	* refcounts and freeing the links.
538	*/	474	*/
…		…
554	{	490	{
555	attachable_base::clear ();	491	attachable_base::clear ();
556		492
557	free_key_values (this);	493	free_key_values (this);
558		494
559	clear_owner (this);	495	owner = 0;
560
561	name = 0;	496	name = 0;
562	name_pl = 0;	497	name_pl = 0;
563	title = 0;	498	title = 0;
564	race = 0;	499	race = 0;
565	slaying = 0;	500	slaying = 0;
566	skill = 0;	501	skill = 0;
567	msg = 0;	502	msg = 0;
568	lore = 0;	503	lore = 0;
569	custom_name = 0;	504	custom_name = 0;
570	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;
571		517
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		519
574	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;
575	}	529	}
576		530
577	void object::clone (object *destination)	531	void object::clone (object *destination)
578	{	532	{
579	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
580	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
581		535
582	if (self || cb)	536	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */
609
610	op->expmul = 1.0;
611	op->face = blank_face;
612	op->attacked_by_count = -1;
613
614	if (settings.casting_time)
615	op->casting_time = -1;
616	}	538	}
617		539
618	/*	540	/*
619	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
620	* 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
621	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
622	* 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,
623	* 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
624	* will point at garbage.	546	* will point at garbage.
625	*/	547	*/
626
627	void	548	void
628	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
629	{	550	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
632		553
633	op2->clone (op);	554	op2->clone (op);
634		555
635	if (is_freed)	556	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	557	SET_FLAG (op, FLAG_FREED);
		558
637	if (is_removed)	559	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	560	SET_FLAG (op, FLAG_REMOVED);
639		561
640	if (op2->speed < 0)	562	if (op2->speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
…		…
691	/*	613	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	614	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	615	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	616	* This function needs to be called whenever the speed of an object changes.
695	*/	617	*/
696
697	void	618	void
698	update_ob_speed (object *op)	619	update_ob_speed (object *op)
699	{	620	{
700	extern int arch_init;	621	extern int arch_init;
701		622
…		…
710	abort ();	631	abort ();
711	#else	632	#else
712	op->speed = 0;	633	op->speed = 0;
713	#endif	634	#endif
714	}	635	}
		636
715	if (arch_init)	637	if (arch_init)
716	{
717	return;	638	return;
718	}	639
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	641	{
721	/* If already on active list, don't do anything */	642	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	643	if (op->active_next || op->active_prev || op == active_objects)
723	return;	644	return;
724		645
725	/* process_events() expects us to insert the object at the beginning	646	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	647	* of the list. */
727	op->active_next = active_objects;	648	op->active_next = active_objects;
		649
728	if (op->active_next != NULL)	650	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	651	op->active_next->active_prev = op;
		652
730	active_objects = op;	653	active_objects = op;
731	}	654	}
732	else	655	else
733	{	656	{
734	/* If not on the active list, nothing needs to be done */	657	/* If not on the active list, nothing needs to be done */
…		…
736	return;	659	return;
737		660
738	if (op->active_prev == NULL)	661	if (op->active_prev == NULL)
739	{	662	{
740	active_objects = op->active_next;	663	active_objects = op->active_next;
		664
741	if (op->active_next != NULL)	665	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	666	op->active_next->active_prev = NULL;
743	}	667	}
744	else	668	else
745	{	669	{
746	op->active_prev->active_next = op->active_next;	670	op->active_prev->active_next = op->active_next;
		671
747	if (op->active_next)	672	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	673	op->active_next->active_prev = op->active_prev;
749	}	674	}
		675
750	op->active_next = NULL;	676	op->active_next = NULL;
751	op->active_prev = NULL;	677	op->active_prev = NULL;
752	}	678	}
753	}	679	}
754		680
…		…
879	update_now = 1;	805	update_now = 1;
880		806
881	if ((move_slow | op->move_slow) != move_slow)	807	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;	808	update_now = 1;
883	}	809	}
		810
884	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	813	* that is being removed.
887	*/	814	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	816	update_now = 1;
890	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	818	/* Nothing to do for that case */ ;
892	else	819	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		821
895	if (update_now)	822	if (update_now)
896	{	823	{
…		…
900		827
901	if (op->more != NULL)	828	if (op->more != NULL)
902	update_object (op->more, action);	829	update_object (op->more, action);
903	}	830	}
904		831
905	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
906	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
907		835
908	void object::free_mortals ()	836	void object::free_mortals ()
909	{	837	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
912	{	842	{
913	freed.push_back (*i);	843	delete *i;
914	mortals.erase (i);	844	mortals.erase (i);
915	}	845	}
916	else
917	++i;
918	}	846	}
919		847
920	object::object ()	848	object::object ()
921	{	849	{
922	SET_FLAG (this, FLAG_REMOVED);	850	SET_FLAG (this, FLAG_REMOVED);
923		851
924	expmul = 1.0;	852	expmul = 1.0;
925	face = blank_face;	853	face = blank_face;
926	attacked_by_count = -1;
927	}	854	}
928		855
929	object::~object ()	856	object::~object ()
930	{	857	{
931	free_key_values (this);	858	free_key_values (this);
932	}	859	}
933		860
934	void object::link ()	861	void object::link ()
935	{	862	{
936	count = ++ob_count;	863	count = ++ob_count;
		864	uuid = gen_uuid ();
937		865
938	prev = 0;	866	prev = 0;
939	next = objects;	867	next = object::first;
940		868
941	if (objects)	869	if (object::first)
942	objects->prev = this;	870	object::first->prev = this;
943		871
944	objects = this;	872	object::first = this;
945	}	873	}
946		874
947	void object::unlink ()	875	void object::unlink ()
948	{	876	{
949	count = 0;	877	if (this == object::first)
		878	object::first = next;
950		879
951	/* Remove this object from the list of used objects */	880	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	881	if (prev) prev->next = next;
		882	if (next) next->prev = prev;
		883
955	prev = 0;	884	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	885	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	886	}
967		887
968	object *object::create ()	888	object *object::create ()
969	{	889	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	890	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	891	op->link ();
983	return op;	892	return op;
984	}	893	}
985		894
986	/*	895	/*
…		…
988	* it from the list of used objects, and puts it on the list of	897	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.	898	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	899	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	900	* this function to succeed.
992	*	901	*
993	* If free_inventory is set, free inventory as well. Else drop items in	902	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	903	* inventory to the ground.
995	*/	904	*/
996	void object::free (bool free_inventory)	905	void object::destroy (bool destroy_inventory)
997	{	906	{
		907	if (QUERY_FLAG (this, FLAG_FREED))
		908	return;
		909
		910	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		911	remove_friendly_object (this);
		912
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	913	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	914	remove ();
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		915
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008	{
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010	remove_friendly_object (this);
1011	}
1012
1013	if (QUERY_FLAG (this, FLAG_FREED))	916	SET_FLAG (this, FLAG_FREED);
1014	{
1015	dump_object (this);
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017	return;
1018	}
1019		917
1020	if (more)	918	if (more)
1021	{	919	{
1022	more->free (free_inventory);	920	more->destroy (destroy_inventory);
1023	more = 0;	921	more = 0;
1024	}	922	}
1025		923
1026	if (inv)	924	if (inv)
1027	{	925	{
1028	/* Only if the space blocks everything do we not process -	926	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	927	* if some form of movement is allowed, let objects
1030	* drop on that space.	928	* drop on that space.
1031	*/	929	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	931	{
1034	object *	932	object *op = inv;
1035	op = inv;
1036		933
1037	while (op)	934	while (op)
1038	{	935	{
1039	object *
1040	tmp = op->below;	936	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	937	op->destroy (destroy_inventory);
1044	op = tmp;	938	op = tmp;
1045	}	939	}
1046	}	940	}
1047	else	941	else
1048	{ /* Put objects in inventory onto this space */	942	{ /* Put objects in inventory onto this space */
1049	object *	943	object *op = inv;
1050	op = inv;
1051		944
1052	while (op)	945	while (op)
1053	{	946	{
1054	object *
1055	tmp = op->below;	947	object *tmp = op->below;
1056		948
1057	remove_ob (op);	949	op->remove ();
1058		950
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1061	free_object (op);	953	op->destroy (0);
1062	else	954	else
1063	{	955	{
1064	op->x = x;	956	op->x = x;
1065	op->y = y;	957	op->y = y;
1066	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	958	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1069	op = tmp;	961	op = tmp;
1070	}	962	}
1071	}	963	}
1072	}	964	}
1073		965
1074	clear_owner (this);	966	// hack to ensure that freed objects still have a valid map
		967	{
		968	static maptile *freed_map; // freed objects are moved here to avoid crashes
		969
		970	if (!freed_map)
		971	{
		972	freed_map = new maptile;
		973
		974	freed_map->name = "/internal/freed_objects_map";
		975	freed_map->width = 3;
		976	freed_map->height = 3;
		977
		978	freed_map->allocate ();
		979	}
		980
		981	map = freed_map;
		982	x = 1;
		983	y = 1;
		984	}
		985
		986	// clear those pointers that likely might have circular references to us
		987	owner = 0;
		988	enemy = 0;
		989	attacked_by = 0;
		990
		991	// only relevant for players(?), but make sure of it anyways
		992	contr = 0;
1075		993
1076	/* Remove object from the active list */	994	/* Remove object from the active list */
1077	speed = 0;	995	speed = 0;
1078	update_ob_speed (this);	996	update_ob_speed (this);
1079		997
1080	unlink ();	998	unlink ();
1081		999
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1000	mortals.push_back (this);
1085	}	1001	}
1086		1002
1087	/*	1003	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1004	* sub_weight() recursively (outwards) subtracts a number from the
1089	* weight of an object (and what is carried by it's environment(s)).	1005	* weight of an object (and what is carried by it's environment(s)).
1090	*/	1006	*/
1091
1092	void	1007	void
1093	sub_weight (object *op, signed long weight)	1008	sub_weight (object *op, signed long weight)
1094	{	1009	{
1095	while (op != NULL)	1010	while (op != NULL)
1096	{	1011	{
1097	if (op->type == CONTAINER)	1012	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1013	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1014
1101	op->carrying -= weight;	1015	op->carrying -= weight;
1102	op = op->env;	1016	op = op->env;
1103	}	1017	}
1104	}	1018	}
1105		1019
1106	/* remove_ob(op):	1020	/* op->remove ():
1107	* This function removes the object op from the linked list of objects	1021	* This function removes the object op from the linked list of objects
1108	* which it is currently tied to. When this function is done, the	1022	* which it is currently tied to. When this function is done, the
1109	* object will have no environment. If the object previously had an	1023	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	1024	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	1025	* the previous environment.
1112	* Beware: This function is called from the editor as well!	1026	* Beware: This function is called from the editor as well!
1113	*/	1027	*/
1114
1115	void	1028	void
1116	remove_ob (object *op)	1029	object::remove ()
1117	{	1030	{
1118	object *tmp, *last = NULL;	1031	object *tmp, *last = 0;
1119	object *otmp;	1032	object *otmp;
1120		1033
1121	tag_t tag;
1122	int check_walk_off;	1034	int check_walk_off;
1123	mapstruct *m;
1124		1035
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1036	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	1037	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1038
1132	/* Changed it to always dump core in this case. As has been learned
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144
1145	if (op->more != NULL)
1146	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);	1039	SET_FLAG (this, FLAG_REMOVED);
		1040
		1041	if (more)
		1042	more->remove ();
1149		1043
1150	/*	1044	/*
1151	* In this case, the object to be removed is in someones	1045	* In this case, the object to be removed is in someones
1152	* inventory.	1046	* inventory.
1153	*/	1047	*/
1154	if (op->env != NULL)	1048	if (env)
1155	{	1049	{
1156	if (op->nrof)	1050	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	1051	sub_weight (env, weight * nrof);
1158	else	1052	else
1159	sub_weight (op->env, op->weight + op->carrying);	1053	sub_weight (env, weight + carrying);
1160		1054
1161	/* NO_FIX_PLAYER is set when a great many changes are being	1055	/* NO_FIX_PLAYER is set when a great many changes are being
1162	* made to players inventory. If set, avoiding the call	1056	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	1057	* to save cpu time.
1164	*/	1058	*/
1165	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1166	fix_player (otmp);	1060	fix_player (otmp);
1167		1061
1168	if (op->above != NULL)	1062	if (above != NULL)
1169	op->above->below = op->below;	1063	above->below = below;
1170	else	1064	else
1171	op->env->inv = op->below;	1065	env->inv = below;
1172		1066
1173	if (op->below != NULL)	1067	if (below != NULL)
1174	op->below->above = op->above;	1068	below->above = above;
1175		1069
1176	/* we set up values so that it could be inserted into	1070	/* we set up values so that it could be inserted into
1177	* the map, but we don't actually do that - it is up	1071	* the map, but we don't actually do that - it is up
1178	* to the caller to decide what we want to do.	1072	* to the caller to decide what we want to do.
1179	*/	1073	*/
1180	op->x = op->env->x, op->y = op->env->y;	1074	x = env->x, y = env->y;
1181	op->map = op->env->map;	1075	map = env->map;
1182	op->above = NULL, op->below = NULL;	1076	above = 0, below = 0;
1183	op->env = NULL;	1077	env = 0;
1184	return;
1185	}
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;
1192	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);
1194
1195	if (!m)
1196	{	1078	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1079	else if (map)
1198	op->map->path, op->x, op->y);	1080	{
1199	/* in old days, we used to set x and y to 0 and continue.	1081	/* Re did the following section of code - it looks like it had
1200	* it seems if we get into this case, something is probablye	1082	* lots of logic for things we no longer care about
1201	* screwed up and should be fixed.
1202	*/	1083	*/
1203	abort ();
1204	}
1205	if (op->map != m)
1206	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208	op->map->path, m->path, op->x, op->y, x, y);
1209	}
1210		1084
1211	/* Re did the following section of code - it looks like it had
1212	* lots of logic for things we no longer care about
1213	*/
1214
1215	/* link the object above us */	1085	/* link the object above us */
1216	if (op->above)	1086	if (above)
1217	op->above->below = op->below;	1087	above->below = below;
1218	else	1088	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1220		1090
1221	/* Relink the object below us, if there is one */	1091	/* Relink the object below us, if there is one */
1222	if (op->below)	1092	if (below)
1223	op->below->above = op->above;	1093	below->above = above;
1224	else	1094	else
1225	{	1095	{
1226	/* Nothing below, which means we need to relink map object for this space	1096	/* Nothing below, which means we need to relink map object for this space
1227	* use translated coordinates in case some oddness with map tiling is	1097	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1098	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{
1232	dump_object (op);
1233	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",
1234	errmsg);
1235	dump_object (GET_MAP_OB (m, x, y));
1236	LOG (llevError, "%s\n", errmsg);
1237	}
1238
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240	}
1241
1242	op->above = NULL;
1243	op->below = NULL;
1244
1245	if (op->map->in_memory == MAP_SAVING)
1246	return;
1247
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{
1259	/* If a container that the player is currently using somehow gets
1260	* removed (most likely destroyed), update the player view
1261	* appropriately.
1262	*/	1099	*/
1263	if (tmp->container == op)	1100	if (GET_MAP_OB (map, x, y) != this)
1264	{	1101	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1102	char *dump = dump_object (this);
1266	tmp->container = NULL;	1103	LOG (llevError,
		1104	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1105	free (dump);
		1106	dump = dump_object (GET_MAP_OB (map, x, y));
		1107	LOG (llevError, "%s\n", dump);
		1108	free (dump);
1267	}	1109	}
1268		1110
1269	tmp->contr->socket.update_look = 1;	1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1270	}
1271	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273	{	1112	}
1274	move_apply (tmp, op, NULL);
1275		1113
1276	if (was_destroyed (op, tag))	1114	above = 0;
		1115	below = 0;
		1116
		1117	if (map->in_memory == MAP_SAVING)
		1118	return;
		1119
		1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1121
		1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1123	{
		1124	/* No point updating the players look faces if he is the object
		1125	* being removed.
		1126	*/
		1127
		1128	if (tmp->type == PLAYER && tmp != this)
1277	{	1129	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1130	/* If a container that the player is currently using somehow gets
		1131	* removed (most likely destroyed), update the player view
		1132	* appropriately.
		1133	*/
		1134	if (tmp->container == this)
		1135	{
		1136	CLEAR_FLAG (this, FLAG_APPLIED);
		1137	tmp->container = 0;
		1138	}
		1139
		1140	tmp->contr->socket.update_look = 1;
1279	}	1141	}
		1142
		1143	/* See if player moving off should effect something */
		1144	if (check_walk_off
		1145	&& ((move_type & tmp->move_off)
		1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1147	{
		1148	move_apply (tmp, this, 0);
		1149
		1150	if (destroyed ())
		1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1152	}
1281		1153
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1155
1284	if (tmp->above == tmp)	1156	if (tmp->above == tmp)
1285	tmp->above = NULL;	1157	tmp->above = 0;
1286		1158
1287	last = tmp;	1159	last = tmp;
1288	}	1160	}
1289		1161
1290	/* last == NULL of there are no objects on this space */	1162	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1163	if (!last)
1292	{	1164	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't	1167	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1168	* be correct anyways.
1297	*/	1169	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1171	update_position (map, x, y);
1300	}	1172	}
1301	else	1173	else
1302	update_object (last, UP_OBJ_REMOVE);	1174	update_object (last, UP_OBJ_REMOVE);
1303		1175
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1177	update_all_los (map, x, y);
		1178	}
1306	}	1179	}
1307		1180
1308	/*	1181	/*
1309	* merge_ob(op,top):	1182	* merge_ob(op,top):
1310	*	1183	*
1311	* This function goes through all objects below and including top, and	1184	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1185	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1186	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1187	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1188	*/
1316
1317	object *	1189	object *
1318	merge_ob (object *op, object *top)	1190	merge_ob (object *op, object *top)
1319	{	1191	{
1320	if (!op->nrof)	1192	if (!op->nrof)
1321	return 0;	1193	return 0;
		1194
1322	if (top == NULL)	1195	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1196	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1197
1324	for (; top != NULL; top = top->below)	1198	for (; top != NULL; top = top->below)
1325	{	1199	{
1326	if (top == op)	1200	if (top == op)
1327	continue;	1201	continue;
1328	if (CAN_MERGE (op, top))	1202	if (CAN_MERGE (op, top))
1329	{	1203	{
1330	top->nrof += op->nrof;	1204	top->nrof += op->nrof;
1331		1205
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1206	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1207	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1208	op->remove ();
1335	free_object (op);	1209	op->destroy (0);
1336	return top;	1210	return top;
1337	}	1211	}
1338	}	1212	}
		1213
1339	return NULL;	1214	return 0;
1340	}	1215	}
1341		1216
1342	/*	1217	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1218	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1219	* job preparing multi-part monsters
1345	*/	1220	*/
1346	object *	1221	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1223	{
1349	object *	1224	object *tmp;
1350	tmp;
1351		1225
1352	if (op->head)	1226	if (op->head)
1353	op = op->head;	1227	op = op->head;
		1228
1354	for (tmp = op; tmp; tmp = tmp->more)	1229	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1230	{
1356	tmp->x = x + tmp->arch->clone.x;	1231	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1232	tmp->y = y + tmp->arch->clone.y;
1358	}	1233	}
		1234
1359	return insert_ob_in_map (op, m, originator, flag);	1235	return insert_ob_in_map (op, m, originator, flag);
1360	}	1236	}
1361		1237
1362	/*	1238	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1239	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1255	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1256	* just 'op' otherwise
1381	*/	1257	*/
1382		1258
1383	object *	1259	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1261	{
1386	object *tmp, *top, *floor = NULL;	1262	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1263	sint16 x, y;
1388		1264
1389	if (QUERY_FLAG (op, FLAG_FREED))	1265	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1268	return NULL;
1393	}	1269	}
1394		1270
1395	if (m == NULL)	1271	if (m == NULL)
1396	{	1272	{
1397	dump_object (op);	1273	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1275	free (dump);
1399	return op;	1276	return op;
1400	}	1277	}
1401		1278
1402	if (out_of_map (m, op->x, op->y))	1279	if (out_of_map (m, op->x, op->y))
1403	{	1280	{
1404	dump_object (op);	1281	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1282	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1283	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1284	/* Better to catch this here, as otherwise the next use of this object
1408	* is likely to cause a crash. Better to find out where it is getting	1285	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1286	* improperly inserted.
1410	*/	1287	*/
1411	abort ();	1288	abort ();
1412	#endif	1289	#endif
		1290	free (dump);
1413	return op;	1291	return op;
1414	}	1292	}
1415		1293
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1294	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1295	{
1418	dump_object (op);	1296	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1298	free (dump);
1420	return op;	1299	return op;
1421	}	1300	}
1422		1301
1423	if (op->more != NULL)	1302	if (op->more != NULL)
1424	{	1303	{
…		…
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1344	if (op->nrof && !(flag & INS_NO_MERGE))
1466	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1345	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1467	if (CAN_MERGE (op, tmp))	1346	if (CAN_MERGE (op, tmp))
1468	{	1347	{
1469	op->nrof += tmp->nrof;	1348	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1349	tmp->remove ();
1471	free_object (tmp);	1350	tmp->destroy (0);
1472	}	1351	}
1473		1352
1474	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1355
…		…
1654	* op is the object to insert it under: supplies x and the map.	1533	* op is the object to insert it under: supplies x and the map.
1655	*/	1534	*/
1656	void	1535	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1537	{
1659	object *tmp;	1538	object *
		1539	tmp;
1660	object *tmp1;	1540	object *
		1541	tmp1;
1661		1542
1662	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1663		1544
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{	1546	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1548	{
1668	remove_ob (tmp);	1549	tmp->remove ();
1669	free_object (tmp);	1550	tmp->destroy (0);
1670	}	1551	}
1671	}	1552	}
1672		1553
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1554	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1555
1675	tmp1->x = op->x;	1556	tmp1->x = op->x;
1676	tmp1->y = op->y;	1557	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1558	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1559	}
…		…
1696	if (orig_ob->nrof < nr)	1577	if (orig_ob->nrof < nr)
1697	{	1578	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1579	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1580	return NULL;
1700	}	1581	}
		1582
1701	newob = object_create_clone (orig_ob);	1583	newob = object_create_clone (orig_ob);
		1584
1702	if ((orig_ob->nrof -= nr) < 1)	1585	if ((orig_ob->nrof -= nr) < 1)
1703	{	1586	orig_ob->destroy (1);
1704	if (!is_removed)
1705	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);
1707	}
1708	else if (!is_removed)	1587	else if (!is_removed)
1709	{	1588	{
1710	if (orig_ob->env != NULL)	1589	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1590	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1591	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1593	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1594	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1595	return NULL;
1717	}	1596	}
1718	}	1597	}
		1598
1719	newob->nrof = nr;	1599	newob->nrof = nr;
1720		1600
1721	return newob;	1601	return newob;
1722	}	1602	}
1723		1603
…		…
1730	*/	1610	*/
1731		1611
1732	object *	1612	object *
1733	decrease_ob_nr (object *op, uint32 i)	1613	decrease_ob_nr (object *op, uint32 i)
1734	{	1614	{
1735	object *	1615	object *tmp;
1736	tmp;
1737	player *	1616	player *pl;
1738	pl;
1739		1617
1740	if (i == 0) /* objects with op->nrof require this check */	1618	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1619	return op;
1742		1620
1743	if (i > op->nrof)	1621	if (i > op->nrof)
1744	i = op->nrof;	1622	i = op->nrof;
1745		1623
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1624	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1625	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1626	else if (op->env != NULL)
1751	{	1627	{
1752	/* is this object in the players inventory, or sub container	1628	/* is this object in the players inventory, or sub container
1753	* therein?	1629	* therein?
1754	*/	1630	*/
…		…
1779	esrv_send_item (tmp, op);	1655	esrv_send_item (tmp, op);
1780	}	1656	}
1781	}	1657	}
1782	else	1658	else
1783	{	1659	{
1784	remove_ob (op);	1660	op->remove ();
1785	op->nrof = 0;	1661	op->nrof = 0;
1786	if (tmp)	1662	if (tmp)
1787	{	1663	{
1788	esrv_del_item (tmp->contr, op->count);	1664	esrv_del_item (tmp->contr, op->count);
1789	}	1665	}
1790	}	1666	}
1791	}	1667	}
1792	else	1668	else
1793	{	1669	{
1794	object *
1795	above = op->above;	1670	object *above = op->above;
1796		1671
1797	if (i < op->nrof)	1672	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1673	op->nrof -= i;
1800	}
1801	else	1674	else
1802	{	1675	{
1803	remove_ob (op);	1676	op->remove ();
1804	op->nrof = 0;	1677	op->nrof = 0;
1805	}	1678	}
		1679
1806	/* Since we just removed op, op->above is null */	1680	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1681	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1682	if (tmp->type == PLAYER)
1809	{	1683	{
1810	if (op->nrof)	1684	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1687	esrv_del_item (tmp->contr, op->count);
1814	}	1688	}
1815	}	1689	}
1816		1690
1817	if (op->nrof)	1691	if (op->nrof)
1818	{
1819	return op;	1692	return op;
1820	}
1821	else	1693	else
1822	{	1694	{
1823	free_object (op);	1695	op->destroy (0);
1824	return NULL;	1696	return NULL;
1825	}	1697	}
1826	}	1698	}
1827		1699
1828	/*	1700	/*
…		…
1834	add_weight (object *op, signed long weight)	1706	add_weight (object *op, signed long weight)
1835	{	1707	{
1836	while (op != NULL)	1708	while (op != NULL)
1837	{	1709	{
1838	if (op->type == CONTAINER)	1710	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1711	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1712
1842	op->carrying += weight;	1713	op->carrying += weight;
1843	op = op->env;	1714	op = op->env;
1844	}	1715	}
1845	}	1716	}
1846		1717
		1718	object *
		1719	insert_ob_in_ob (object *op, object *where)
		1720	{
		1721	if (!where)
		1722	{
		1723	char *dump = dump_object (op);
		1724	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1725	free (dump);
		1726	return op;
		1727	}
		1728
		1729	if (where->head)
		1730	{
		1731	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1732	where = where->head;
		1733	}
		1734
		1735	return where->insert (op);
		1736	}
		1737
1847	/*	1738	/*
1848	* insert_ob_in_ob(op,environment):	1739	* env->insert (op)
1849	* This function inserts the object op in the linked list	1740	* This function inserts the object op in the linked list
1850	* inside the object environment.	1741	* inside the object environment.
1851	*	1742	*
1852	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1853	* the inventory at the last position or next to other objects of the same
1854	* type.
1855	* Frank: Now sorted by type, archetype and magic!
1856	*
1857	* The function returns now pointer to inserted item, and return value can	1743	* The function returns now pointer to inserted item, and return value can
1858	* be != op, if items are merged. -Tero	1744	* be != op, if items are merged. -Tero
1859	*/	1745	*/
1860		1746
1861	object *	1747	object *
1862	insert_ob_in_ob (object *op, object *where)	1748	object::insert (object *op)
1863	{	1749	{
1864	object *	1750	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1751
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1752	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1753	op->remove ();
1870	dump_object (op);	1754
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;
1873	}
1874	if (where == NULL)
1875	{
1876	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;
1879	}
1880	if (where->head)
1881	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;
1884	}
1885	if (op->more)	1755	if (op->more)
1886	{	1756	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1757	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1758	return op;
1889	}	1759	}
		1760
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1761	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1762	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1763	if (op->nrof)
1893	{	1764	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1765	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1766	if (CAN_MERGE (tmp, op))
1896	{	1767	{
1897	/* return the original object and remove inserted object	1768	/* return the original object and remove inserted object
1898	(client needs the original object) */	1769	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1770	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1771	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1772	* tmp->nrof, we need to increase the weight.
1902	*/	1773	*/
1903	add_weight (where, op->weight * op->nrof);	1774	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1775	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1776	op->destroy (); /* free the inserted object */
1906	op = tmp;	1777	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1778	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1779	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1780	break;
1910	}	1781	}
1911		1782
1912	/* I assume combined objects have no inventory	1783	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1784	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1785	* (if it was possible to merge). calling remove_ob will subtract
1915	* the weight, so we need to add it in again, since we actually do	1786	* the weight, so we need to add it in again, since we actually do
1916	* the linking below	1787	* the linking below
1917	*/	1788	*/
1918	add_weight (where, op->weight * op->nrof);	1789	add_weight (this, op->weight * op->nrof);
1919	}	1790	}
1920	else	1791	else
1921	add_weight (where, (op->weight + op->carrying));	1792	add_weight (this, (op->weight + op->carrying));
1922		1793
1923	otmp = is_player_inv (where);	1794	otmp = is_player_inv (this);
1924	if (otmp && otmp->contr != NULL)	1795	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1796	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1797	fix_player (otmp);
1928	}
1929		1798
1930	op->map = NULL;	1799	op->map = NULL;
1931	op->env = where;	1800	op->env = this;
1932	op->above = NULL;	1801	op->above = NULL;
1933	op->below = NULL;	1802	op->below = NULL;
1934	op->x = 0, op->y = 0;	1803	op->x = 0, op->y = 0;
1935		1804
1936	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1937	if ((op->glow_radius != 0) && where->map)	1806	if ((op->glow_radius != 0) && map)
1938	{	1807	{
1939	#ifdef DEBUG_LIGHTS	1808	#ifdef DEBUG_LIGHTS
1940	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1809	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1941	#endif /* DEBUG_LIGHTS */	1810	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1811	if (MAP_DARKNESS (map))
1943	update_all_los (where->map, where->x, where->y);	1812	update_all_los (map, x, y);
1944	}	1813	}
1945		1814
1946	/* Client has no idea of ordering so lets not bother ordering it here.	1815	/* Client has no idea of ordering so lets not bother ordering it here.
1947	* It sure simplifies this function...	1816	* It sure simplifies this function...
1948	*/	1817	*/
1949	if (where->inv == NULL)	1818	if (!inv)
1950	where->inv = op;	1819	inv = op;
1951	else	1820	else
1952	{	1821	{
1953	op->below = where->inv;	1822	op->below = inv;
1954	op->below->above = op;	1823	op->below->above = op;
1955	where->inv = op;	1824	inv = op;
1956	}	1825	}
		1826
1957	return op;	1827	return op;
1958	}	1828	}
1959		1829
1960	/*	1830	/*
1961	* Checks if any objects has a move_type that matches objects	1831	* Checks if any objects has a move_type that matches objects
…		…
1980		1850
1981	int	1851	int
1982	check_move_on (object *op, object *originator)	1852	check_move_on (object *op, object *originator)
1983	{	1853	{
1984	object *tmp;	1854	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1855	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1856	int x = op->x, y = op->y;
1988		1857
1989	MoveType move_on, move_slow, move_block;	1858	MoveType move_on, move_slow, move_block;
1990		1859
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1860	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1861	return 0;
1993
1994	tag = op->count;
1995		1862
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1863	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1864	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1865	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1866
…		…
2042	{	1909	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1910	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1911	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1912	{
2046		1913
		1914	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1915	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1916
2049	if (op->type == PLAYER)	1917	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1918	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)))	1919	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1920	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1927	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1928	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1929	{
2062	move_apply (tmp, op, originator);	1930	move_apply (tmp, op, originator);
2063		1931
2064	if (was_destroyed (op, tag))	1932	if (op->destroyed ())
2065	return 1;	1933	return 1;
2066		1934
2067	/* what the person/creature stepped onto has moved the object	1935	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1936	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1937	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1949	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1950	* The first matching object is returned, or NULL if none.
2083	*/	1951	*/
2084		1952
2085	object *	1953	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1954	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1955	{
2088	object *	1956	object *
2089	tmp;	1957	tmp;
2090		1958
2091	if (m == NULL || out_of_map (m, x, y))	1959	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1972	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2106	*/	1974	*/
2107		1975
2108	object *	1976	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1977	present (unsigned char type, maptile *m, int x, int y)
2110	{	1978	{
2111	object *	1979	object *
2112	tmp;	1980	tmp;
2113		1981
2114	if (out_of_map (m, x, y))	1982	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2122	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2123	* customized, changed states, etc.
2256	*/	2124	*/
2257		2125
2258	int	2126	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2127	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2128	{
2261	int	2129	int
2262	i,	2130	i,
2263	index = 0, flag;	2131	index = 0, flag;
2264	static int	2132	static int
…		…
2285	return -1;	2153	return -1;
2286	return altern[RANDOM () % index];	2154	return altern[RANDOM () % index];
2287	}	2155	}
2288		2156
2289	/*	2157	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2158	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2159	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2160	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2161	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2162	*/
2295		2163
2296	int	2164	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2165	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2166	{
2299	int	2167	int
2300	i;	2168	i;
2301		2169
2302	for (i = 0; i < SIZEOFFREE; i++)	2170	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2234	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2235	* there is capable of.
2368	*/	2236	*/
2369		2237
2370	int	2238	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2239	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2240	{
2373	int	2241	int
2374	i,	2242	i,
2375	max = SIZEOFFREE, mflags;	2243	max = SIZEOFFREE, mflags;
2376	sint16	2244
2377	nx,	2245	sint16 nx, ny;
2378	ny;
2379	object *	2246	object *
2380	tmp;	2247	tmp;
2381	mapstruct *	2248	maptile *
2382	mp;	2249	mp;
2383	MoveType	2250
2384	blocked,	2251	MoveType blocked, move_type;
2385	move_type;
2386		2252
2387	if (exclude && exclude->head)	2253	if (exclude && exclude->head)
2388	{	2254	{
2389	exclude = exclude->head;	2255	exclude = exclude->head;
2390	move_type = exclude->move_type;	2256	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2461	* Modified to be map tile aware -.MSW
2596	*/	2462	*/
2597		2463
2598		2464
2599	int	2465	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2466	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2467	{
2602	sint16	2468	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2469	int
2606	mflags;	2470	mflags;
2607		2471
2608	if (dir < 0)	2472	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2473	return 0; /* exit condition: invalid direction */
…		…
2656	* create clone from object to another	2520	* create clone from object to another
2657	*/	2521	*/
2658	object *	2522	object *
2659	object_create_clone (object *asrc)	2523	object_create_clone (object *asrc)
2660	{	2524	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2525	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2526
2664	if (!asrc)	2527	if (!asrc)
2665	return NULL;	2528	return 0;
		2529
2666	src = asrc;	2530	src = asrc;
2667	if (src->head)	2531	if (src->head)
2668	src = src->head;	2532	src = src->head;
2669		2533
2670	prev = NULL;	2534	prev = 0;
2671	for (part = src; part; part = part->more)	2535	for (part = src; part; part = part->more)
2672	{	2536	{
2673	tmp = get_object ();	2537	tmp = get_object ();
2674	copy_object (part, tmp);	2538	copy_object (part, tmp);
2675	tmp->x -= src->x;	2539	tmp->x -= src->x;
2676	tmp->y -= src->y;	2540	tmp->y -= src->y;
		2541
2677	if (!part->head)	2542	if (!part->head)
2678	{	2543	{
2679	dst = tmp;	2544	dst = tmp;
2680	tmp->head = NULL;	2545	tmp->head = 0;
2681	}	2546	}
2682	else	2547	else
2683	{	2548	{
2684	tmp->head = dst;	2549	tmp->head = dst;
2685	}	2550	}
		2551
2686	tmp->more = NULL;	2552	tmp->more = 0;
		2553
2687	if (prev)	2554	if (prev)
2688	prev->more = tmp;	2555	prev->more = tmp;
		2556
2689	prev = tmp;	2557	prev = tmp;
2690	}	2558	}
2691		2559
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2560	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2561	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2562
2698	return dst;	2563	return dst;
2699	}	2564	}
2700		2565
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2566	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* Basically, we save the content of the string to a temp file, then call */	2567	/* Basically, we save the content of the string to a temp file, then call */
2713
2714	/* load_object on it. I admit it is a highly inefficient way to make things, */	2568	/* load_object on it. I admit it is a highly inefficient way to make things, */
2715
2716	/* but it was simple to make and allows reusing the load_object function. */	2569	/* but it was simple to make and allows reusing the load_object function. */
2717
2718	/* Remember not to use load_object_str in a time-critical situation. */	2570	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2571	/* Also remember that multiparts objects are not supported for now. */
2721		2572
2722	object *	2573	object *
2723	load_object_str (const char *obstr)	2574	load_object_str (const char *obstr)
2724	{	2575	{
2725	object *	2576	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2577	char filename[MAX_BUF];
2729		2578
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2579	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2580
2732	FILE *
2733	tempfile = fopen (filename, "w");	2581	FILE *tempfile = fopen (filename, "w");
2734		2582
2735	if (tempfile == NULL)	2583	if (tempfile == NULL)
2736	{	2584	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2585	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2586	return NULL;
2739	};	2587	}
		2588
2740	fprintf (tempfile, obstr);	2589	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2590	fclose (tempfile);
2742		2591
2743	op = get_object ();	2592	op = get_object ();
2744		2593
2745	object_thawer	2594	object_thawer thawer (filename);
2746	thawer (filename);
2747		2595
2748	if (thawer)	2596	if (thawer)
2749	load_object (thawer, op, 0);	2597	load_object (thawer, op, 0);
2750		2598
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2599	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2607	* returns NULL if no match.
2760	*/	2608	*/
2761	object *	2609	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2610	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2611	{
2764	object *	2612	object *tmp;
2765	tmp;
2766		2613
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2614	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2615	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2616	return tmp;
2770		2617
…		…
2778	* do the desired thing.	2625	* do the desired thing.
2779	*/	2626	*/
2780	key_value *	2627	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2628	get_ob_key_link (const object *ob, const char *key)
2782	{	2629	{
2783	key_value *	2630	key_value *link;
2784	link;
2785		2631
2786	for (link = ob->key_values; link != NULL; link = link->next)	2632	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2633	if (link->key == key)
2789	{
2790	return link;	2634	return link;
2791	}
2792	}
2793		2635
2794	return NULL;	2636	return NULL;
2795	}	2637	}
2796		2638
2797	/*	2639	/*
…		…
2802	* The returned string is shared.	2644	* The returned string is shared.
2803	*/	2645	*/
2804	const char *	2646	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2647	get_ob_key_value (const object *op, const char *const key)
2806	{	2648	{
2807	key_value *	2649	key_value *link;
2808	link;	2650	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2651
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2652	if (!canonical_key)
2815	{	2653	{
2816	/* 1. There being a field named key on any object	2654	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2655	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2656	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2657	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2658	*/
2821	return NULL;	2659	return 0;
2822	}	2660	}
2823		2661
2824	/* This is copied from get_ob_key_link() above -	2662	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2663	* only 4 lines, and saves the function call overhead.
2826	*/	2664	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2665	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2666	if (link->key == canonical_key)
2830	{
2831	return link->value;	2667	return link->value;
2832	}	2668
2833	}
2834	return NULL;	2669	return 0;
2835	}	2670	}
2836		2671
2837		2672
2838	/*	2673	/*
2839	* Updates the canonical_key in op to value.	2674	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2710	if (last)
2876	last->next = field->next;	2711	last->next = field->next;
2877	else	2712	else
2878	op->key_values = field->next;	2713	op->key_values = field->next;
2879		2714
2880	delete
2881	field;	2715	delete field;
2882	}	2716	}
2883	}	2717	}
2884	return TRUE;	2718	return TRUE;
2885	}	2719	}
2886	/* IF we get here, key doesn't exist */	2720	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2755	* Returns TRUE on success.
2922	*/	2756	*/
2923	int	2757	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2758	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2759	{
2926	shstr
2927	key_ (key);	2760	shstr key_ (key);
2928		2761
2929	return set_ob_key_value_s (op, key_, value, add_key);	2762	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2763	}
		2764
		2765	object::depth_iterator::depth_iterator (object *container)
		2766	: iterator_base (container)
		2767	{
		2768	while (item->inv)
		2769	item = item->inv;
		2770	}
		2771
		2772	void
		2773	object::depth_iterator::next ()
		2774	{
		2775	if (item->below)
		2776	{
		2777	item = item->below;
		2778
		2779	while (item->inv)
		2780	item = item->inv;
		2781	}
		2782	else
		2783	item = item->env;
		2784	}
		2785
		2786	// return a suitable string describing an objetc in enough detail to find it
		2787	const char *
		2788	object::debug_desc (char *info) const
		2789	{
		2790	char info2[256 * 3];
		2791	char *p = info;
		2792
		2793	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2794	count,
		2795	&name,
		2796	title ? " " : "",
		2797	title ? (const char *)title : "");
		2798
		2799	if (env)
		2800	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2801
		2802	if (map)
		2803	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2804
		2805	return info;
		2806	}
		2807
		2808	const char *
		2809	object::debug_desc () const
		2810	{
		2811	static char info[256 * 3];
		2812	return debug_desc (info);
		2813	}
		2814

Diff Legend

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