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.65 by root, Wed Dec 13 00:42:03 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);
575	}
576		521
577	void object::clone (object *destination)
578	{
579	*(object_copy *) destination = *this;
580	*(object_pod *) destination = *this;
581
582	if (self || cb)
583	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 */	522	/* What is not cleared is next, prev, and count */
609		523
610	op->expmul = 1.0;	524	expmul = 1.0;
611	op->face = blank_face;	525	face = blank_face;
612	op->attacked_by_count = -1;
613		526
614	if (settings.casting_time)	527	if (settings.casting_time)
615	op->casting_time = -1;	528	casting_time = -1;
616	}	529	}
617		530
618	/*	531	/*
619	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
620	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
621	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	535	* 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	536	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	537	* will point at garbage.
625	*/	538	*/
626
627	void	539	void
628	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
629	{	541	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
632		544
633	op2->clone (op);	545	*(object_copy *)dst = *this;
		546	*(object_pod *)dst = *this;
		547
		548	if (self || cb)
		549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
634		550
635	if (is_freed)	551	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
637	if (is_removed)	554	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
639		556
640	if (op2->speed < 0)	557	if (speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
642		559
643	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
644	if (op2->key_values)	561	if (key_values)
645	{	562	{
646	key_value *tail = 0;	563	key_value *tail = 0;
647	key_value *i;	564	key_value *i;
648		565
649	op->key_values = 0;	566	dst->key_values = 0;
650		567
651	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
652	{	569	{
653	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
654		571
655	new_link->next = 0;	572	new_link->next = 0;
656	new_link->key = i->key;	573	new_link->key = i->key;
657	new_link->value = i->value;	574	new_link->value = i->value;
658		575
659	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
660	if (!op->key_values)	577	if (!dst->key_values)
661	{	578	{
662	op->key_values = new_link;	579	dst->key_values = new_link;
663	tail = new_link;	580	tail = new_link;
664	}	581	}
665	else	582	else
666	{	583	{
667	tail->next = new_link;	584	tail->next = new_link;
668	tail = new_link;	585	tail = new_link;
669	}	586	}
670	}	587	}
671	}	588	}
672		589
673	update_ob_speed (op);	590	update_ob_speed (dst);
		591	}
		592
		593	object *
		594	object::clone ()
		595	{
		596	object *neu = create ();
		597	copy_to (neu);
		598	return neu;
674	}	599	}
675		600
676	/*	601	/*
677	* If an object with the IS_TURNABLE() flag needs to be turned due	602	* If an object with the IS_TURNABLE() flag needs to be turned due
678	* to the closest player being on the other side, this function can	603	* to the closest player being on the other side, this function can
…		…
691	/*	616	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	617	* 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.	618	* 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.	619	* This function needs to be called whenever the speed of an object changes.
695	*/	620	*/
696
697	void	621	void
698	update_ob_speed (object *op)	622	update_ob_speed (object *op)
699	{	623	{
700	extern int arch_init;	624	extern int arch_init;
701		625
…		…
710	abort ();	634	abort ();
711	#else	635	#else
712	op->speed = 0;	636	op->speed = 0;
713	#endif	637	#endif
714	}	638	}
		639
715	if (arch_init)	640	if (arch_init)
716	{
717	return;	641	return;
718	}	642
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	644	{
721	/* If already on active list, don't do anything */	645	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	646	if (op->active_next || op->active_prev || op == active_objects)
723	return;	647	return;
724		648
725	/* process_events() expects us to insert the object at the beginning	649	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	650	* of the list. */
727	op->active_next = active_objects;	651	op->active_next = active_objects;
		652
728	if (op->active_next != NULL)	653	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	654	op->active_next->active_prev = op;
		655
730	active_objects = op;	656	active_objects = op;
731	}	657	}
732	else	658	else
733	{	659	{
734	/* If not on the active list, nothing needs to be done */	660	/* If not on the active list, nothing needs to be done */
…		…
736	return;	662	return;
737		663
738	if (op->active_prev == NULL)	664	if (op->active_prev == NULL)
739	{	665	{
740	active_objects = op->active_next;	666	active_objects = op->active_next;
		667
741	if (op->active_next != NULL)	668	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	669	op->active_next->active_prev = NULL;
743	}	670	}
744	else	671	else
745	{	672	{
746	op->active_prev->active_next = op->active_next;	673	op->active_prev->active_next = op->active_next;
		674
747	if (op->active_next)	675	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	676	op->active_next->active_prev = op->active_prev;
749	}	677	}
		678
750	op->active_next = NULL;	679	op->active_next = NULL;
751	op->active_prev = NULL;	680	op->active_prev = NULL;
752	}	681	}
753	}	682	}
754		683
…		…
879	update_now = 1;	808	update_now = 1;
880		809
881	if ((move_slow | op->move_slow) != move_slow)	810	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;	811	update_now = 1;
883	}	812	}
		813
884	/* if the object is being removed, we can't make intelligent	814	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	815	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	816	* that is being removed.
887	*/	817	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	819	update_now = 1;
890	else if (action == UP_OBJ_FACE)	820	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	821	/* Nothing to do for that case */ ;
892	else	822	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	823	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		824
895	if (update_now)	825	if (update_now)
896	{	826	{
…		…
900		830
901	if (op->more != NULL)	831	if (op->more != NULL)
902	update_object (op->more, action);	832	update_object (op->more, action);
903	}	833	}
904		834
905	static unordered_vector<object *> mortals;	835	object::vector object::mortals;
906	static std::vector<object *> freed;	836	object::vector object::objects; // not yet used
		837	object *object::first;
907		838
908	void object::free_mortals ()	839	void object::free_mortals ()
909	{	840	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	842	if ((*i)->refcnt)
		843	++i; // further delay freeing
		844	else
912	{	845	{
913	freed.push_back (*i);	846	delete *i;
914	mortals.erase (i);	847	mortals.erase (i);
915	}	848	}
916	else
917	++i;
918	}	849	}
919		850
920	object::object ()	851	object::object ()
921	{	852	{
922	SET_FLAG (this, FLAG_REMOVED);	853	SET_FLAG (this, FLAG_REMOVED);
923		854
924	expmul = 1.0;	855	expmul = 1.0;
925	face = blank_face;	856	face = blank_face;
926	attacked_by_count = -1;
927	}	857	}
928		858
929	object::~object ()	859	object::~object ()
930	{	860	{
931	free_key_values (this);	861	free_key_values (this);
932	}	862	}
933		863
934	void object::link ()	864	void object::link ()
935	{	865	{
936	count = ++ob_count;	866	count = ++ob_count;
		867	uuid = gen_uuid ();
937		868
938	prev = 0;	869	prev = 0;
939	next = objects;	870	next = object::first;
940		871
941	if (objects)	872	if (object::first)
942	objects->prev = this;	873	object::first->prev = this;
943		874
944	objects = this;	875	object::first = this;
945	}	876	}
946		877
947	void object::unlink ()	878	void object::unlink ()
948	{	879	{
949	count = 0;	880	if (this == object::first)
		881	object::first = next;
950		882
951	/* Remove this object from the list of used objects */	883	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	884	if (prev) prev->next = next;
		885	if (next) next->prev = prev;
		886
955	prev = 0;	887	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	888	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	889	}
967		890
968	object *object::create ()	891	object *object::create ()
969	{	892	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	893	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 ();	894	op->link ();
983	return op;	895	return op;
984	}	896	}
985		897
986	/*	898	/*
…		…
988	* it from the list of used objects, and puts it on the list of	900	* 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.	901	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	902	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	903	* this function to succeed.
992	*	904	*
993	* If free_inventory is set, free inventory as well. Else drop items in	905	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	906	* inventory to the ground.
995	*/	907	*/
996	void object::free (bool free_inventory)	908	void object::destroy (bool destroy_inventory)
997	{	909	{
		910	if (QUERY_FLAG (this, FLAG_FREED))
		911	return;
		912
		913	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		914	remove_friendly_object (this);
		915
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	916	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	917	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		918
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))	919	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		920
1020	if (more)	921	if (more)
1021	{	922	{
1022	more->free (free_inventory);	923	more->destroy (destroy_inventory);
1023	more = 0;	924	more = 0;
1024	}	925	}
1025		926
1026	if (inv)	927	if (inv)
1027	{	928	{
1028	/* Only if the space blocks everything do we not process -	929	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	930	* if some form of movement is allowed, let objects
1030	* drop on that space.	931	* drop on that space.
1031	*/	932	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	934	{
1034	object *	935	object *op = inv;
1035	op = inv;
1036		936
1037	while (op)	937	while (op)
1038	{	938	{
1039	object *
1040	tmp = op->below;	939	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	940	op->destroy (destroy_inventory);
1044	op = tmp;	941	op = tmp;
1045	}	942	}
1046	}	943	}
1047	else	944	else
1048	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
1049	object *	946	object *op = inv;
1050	op = inv;
1051		947
1052	while (op)	948	while (op)
1053	{	949	{
1054	object *
1055	tmp = op->below;	950	object *tmp = op->below;
1056		951
1057	remove_ob (op);	952	op->remove ();
1058		953
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	954	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))	955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1061	free_object (op);	956	op->destroy ();
1062	else	957	else
1063	{	958	{
1064	op->x = x;	959	op->x = x;
1065	op->y = y;	960	op->y = y;
1066	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1069	op = tmp;	964	op = tmp;
1070	}	965	}
1071	}	966	}
1072	}	967	}
1073		968
1074	clear_owner (this);	969	// hack to ensure that freed objects still have a valid map
		970	{
		971	static maptile *freed_map; // freed objects are moved here to avoid crashes
		972
		973	if (!freed_map)
		974	{
		975	freed_map = new maptile;
		976
		977	freed_map->name = "/internal/freed_objects_map";
		978	freed_map->width = 3;
		979	freed_map->height = 3;
		980
		981	freed_map->allocate ();
		982	}
		983
		984	map = freed_map;
		985	x = 1;
		986	y = 1;
		987	}
		988
		989	// clear those pointers that likely might have circular references to us
		990	owner = 0;
		991	enemy = 0;
		992	attacked_by = 0;
		993
		994	// only relevant for players(?), but make sure of it anyways
		995	contr = 0;
1075		996
1076	/* Remove object from the active list */	997	/* Remove object from the active list */
1077	speed = 0;	998	speed = 0;
1078	update_ob_speed (this);	999	update_ob_speed (this);
1079		1000
1080	unlink ();	1001	unlink ();
1081		1002
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1003	mortals.push_back (this);
1085	}	1004	}
1086		1005
1087	/*	1006	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1007	* sub_weight() recursively (outwards) subtracts a number from the
1089	* weight of an object (and what is carried by it's environment(s)).	1008	* weight of an object (and what is carried by it's environment(s)).
1090	*/	1009	*/
1091
1092	void	1010	void
1093	sub_weight (object *op, signed long weight)	1011	sub_weight (object *op, signed long weight)
1094	{	1012	{
1095	while (op != NULL)	1013	while (op != NULL)
1096	{	1014	{
1097	if (op->type == CONTAINER)	1015	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1016	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1017
1101	op->carrying -= weight;	1018	op->carrying -= weight;
1102	op = op->env;	1019	op = op->env;
1103	}	1020	}
1104	}	1021	}
1105		1022
1106	/* remove_ob(op):	1023	/* op->remove ():
1107	* This function removes the object op from the linked list of objects	1024	* 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	1025	* which it is currently tied to. When this function is done, the
1109	* object will have no environment. If the object previously had an	1026	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	1027	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	1028	* the previous environment.
1112	* Beware: This function is called from the editor as well!	1029	* Beware: This function is called from the editor as well!
1113	*/	1030	*/
1114
1115	void	1031	void
1116	remove_ob (object *op)	1032	object::remove ()
1117	{	1033	{
1118	object *tmp, *last = NULL;	1034	object *tmp, *last = 0;
1119	object *otmp;	1035	object *otmp;
1120		1036
1121	tag_t tag;
1122	int check_walk_off;	1037	int check_walk_off;
1123	mapstruct *m;
1124		1038
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	1040	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1041
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);	1042	SET_FLAG (this, FLAG_REMOVED);
		1043
		1044	if (more)
		1045	more->remove ();
1149		1046
1150	/*	1047	/*
1151	* In this case, the object to be removed is in someones	1048	* In this case, the object to be removed is in someones
1152	* inventory.	1049	* inventory.
1153	*/	1050	*/
1154	if (op->env != NULL)	1051	if (env)
1155	{	1052	{
1156	if (op->nrof)	1053	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	1054	sub_weight (env, weight * nrof);
1158	else	1055	else
1159	sub_weight (op->env, op->weight + op->carrying);	1056	sub_weight (env, weight + carrying);
1160		1057
1161	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1162	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	1060	* to save cpu time.
1164	*/	1061	*/
1165	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1166	fix_player (otmp);	1063	fix_player (otmp);
1167		1064
1168	if (op->above != NULL)	1065	if (above != NULL)
1169	op->above->below = op->below;	1066	above->below = below;
1170	else	1067	else
1171	op->env->inv = op->below;	1068	env->inv = below;
1172		1069
1173	if (op->below != NULL)	1070	if (below != NULL)
1174	op->below->above = op->above;	1071	below->above = above;
1175		1072
1176	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1177	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1178	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1179	*/	1076	*/
1180	op->x = op->env->x, op->y = op->env->y;	1077	x = env->x, y = env->y;
1181	op->map = op->env->map;	1078	map = env->map;
1182	op->above = NULL, op->below = NULL;	1079	above = 0, below = 0;
1183	op->env = NULL;	1080	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	{	1081	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1082	else if (map)
1198	op->map->path, op->x, op->y);	1083	{
1199	/* in old days, we used to set x and y to 0 and continue.	1084	/* Re did the following section of code - it looks like it had
1200	* it seems if we get into this case, something is probablye	1085	* lots of logic for things we no longer care about
1201	* screwed up and should be fixed.
1202	*/	1086	*/
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		1087
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 */	1088	/* link the object above us */
1216	if (op->above)	1089	if (above)
1217	op->above->below = op->below;	1090	above->below = below;
1218	else	1091	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1220		1093
1221	/* Relink the object below us, if there is one */	1094	/* Relink the object below us, if there is one */
1222	if (op->below)	1095	if (below)
1223	op->below->above = op->above;	1096	below->above = above;
1224	else	1097	else
1225	{	1098	{
1226	/* Nothing below, which means we need to relink map object for this space	1099	/* 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	1100	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1101	* 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	*/	1102	*/
1263	if (tmp->container == op)	1103	if (GET_MAP_OB (map, x, y) != this)
1264	{	1104	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1105	char *dump = dump_object (this);
1266	tmp->container = NULL;	1106	LOG (llevError,
		1107	"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);
		1108	free (dump);
		1109	dump = dump_object (GET_MAP_OB (map, x, y));
		1110	LOG (llevError, "%s\n", dump);
		1111	free (dump);
1267	}	1112	}
1268		1113
1269	tmp->contr->socket.update_look = 1;	1114	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	{	1115	}
1274	move_apply (tmp, op, NULL);
1275		1116
1276	if (was_destroyed (op, tag))	1117	above = 0;
		1118	below = 0;
		1119
		1120	if (map->in_memory == MAP_SAVING)
		1121	return;
		1122
		1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1124
		1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1126	{
		1127	/* No point updating the players look faces if he is the object
		1128	* being removed.
		1129	*/
		1130
		1131	if (tmp->type == PLAYER && tmp != this)
1277	{	1132	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1133	/* If a container that the player is currently using somehow gets
		1134	* removed (most likely destroyed), update the player view
		1135	* appropriately.
		1136	*/
		1137	if (tmp->container == this)
		1138	{
		1139	CLEAR_FLAG (this, FLAG_APPLIED);
		1140	tmp->container = 0;
		1141	}
		1142
		1143	tmp->contr->socket.update_look = 1;
1279	}	1144	}
		1145
		1146	/* See if player moving off should effect something */
		1147	if (check_walk_off
		1148	&& ((move_type & tmp->move_off)
		1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1150	{
		1151	move_apply (tmp, this, 0);
		1152
		1153	if (destroyed ())
		1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1155	}
1281		1156
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1158
1284	if (tmp->above == tmp)	1159	if (tmp->above == tmp)
1285	tmp->above = NULL;	1160	tmp->above = 0;
1286		1161
1287	last = tmp;	1162	last = tmp;
1288	}	1163	}
1289		1164
1290	/* last == NULL of there are no objects on this space */	1165	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1166	if (!last)
1292	{	1167	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1169	* 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	1170	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1171	* be correct anyways.
1297	*/	1172	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1174	update_position (map, x, y);
1300	}	1175	}
1301	else	1176	else
1302	update_object (last, UP_OBJ_REMOVE);	1177	update_object (last, UP_OBJ_REMOVE);
1303		1178
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1180	update_all_los (map, x, y);
		1181	}
1306	}	1182	}
1307		1183
1308	/*	1184	/*
1309	* merge_ob(op,top):	1185	* merge_ob(op,top):
1310	*	1186	*
1311	* This function goes through all objects below and including top, and	1187	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1188	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1189	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1190	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1191	*/
1316
1317	object *	1192	object *
1318	merge_ob (object *op, object *top)	1193	merge_ob (object *op, object *top)
1319	{	1194	{
1320	if (!op->nrof)	1195	if (!op->nrof)
1321	return 0;	1196	return 0;
		1197
1322	if (top == NULL)	1198	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1199	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1200
1324	for (; top != NULL; top = top->below)	1201	for (; top != NULL; top = top->below)
1325	{	1202	{
1326	if (top == op)	1203	if (top == op)
1327	continue;	1204	continue;
1328	if (CAN_MERGE (op, top))	1205	if (CAN_MERGE (op, top))
1329	{	1206	{
1330	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1331		1208
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1211	op->destroy ();
1335	free_object (op);
1336	return top;	1212	return top;
1337	}	1213	}
1338	}	1214	}
		1215
1339	return NULL;	1216	return 0;
1340	}	1217	}
1341		1218
1342	/*	1219	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1345	*/	1222	*/
1346	object *	1223	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1225	{
1349	object *	1226	object *tmp;
1350	tmp;
1351		1227
1352	if (op->head)	1228	if (op->head)
1353	op = op->head;	1229	op = op->head;
		1230
1354	for (tmp = op; tmp; tmp = tmp->more)	1231	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1232	{
1356	tmp->x = x + tmp->arch->clone.x;	1233	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1234	tmp->y = y + tmp->arch->clone.y;
1358	}	1235	}
		1236
1359	return insert_ob_in_map (op, m, originator, flag);	1237	return insert_ob_in_map (op, m, originator, flag);
1360	}	1238	}
1361		1239
1362	/*	1240	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1241	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1258	* just 'op' otherwise
1381	*/	1259	*/
1382		1260
1383	object *	1261	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1263	{
1386	object *tmp, *top, *floor = NULL;	1264	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1265	sint16 x, y;
1388		1266
1389	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1270	return NULL;
1393	}	1271	}
1394		1272
1395	if (m == NULL)	1273	if (m == NULL)
1396	{	1274	{
1397	dump_object (op);	1275	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1277	free (dump);
1399	return op;	1278	return op;
1400	}	1279	}
1401		1280
1402	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1403	{	1282	{
1404	dump_object (op);	1283	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1286	/* 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	1287	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1288	* improperly inserted.
1410	*/	1289	*/
1411	abort ();	1290	abort ();
1412	#endif	1291	#endif
		1292	free (dump);
1413	return op;	1293	return op;
1414	}	1294	}
1415		1295
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1297	{
1418	dump_object (op);	1298	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1300	free (dump);
1420	return op;	1301	return op;
1421	}	1302	}
1422		1303
1423	if (op->more != NULL)	1304	if (op->more != NULL)
1424	{	1305	{
…		…
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1466	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1467	if (CAN_MERGE (op, tmp))	1348	if (CAN_MERGE (op, tmp))
1468	{	1349	{
1469	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1351	tmp->destroy ();
1471	free_object (tmp);
1472	}	1352	}
1473		1353
1474	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1356
…		…
1654	* op is the object to insert it under: supplies x and the map.	1534	* op is the object to insert it under: supplies x and the map.
1655	*/	1535	*/
1656	void	1536	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1537	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1538	{
1659	object *tmp;	1539	object *
		1540	tmp;
1660	object *tmp1;	1541	object *
		1542	tmp1;
1661		1543
1662	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1663		1545
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1548	tmp->destroy ();
1668	remove_ob (tmp);
1669	free_object (tmp);
1670	}
1671	}
1672		1549
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1551
1675	tmp1->x = op->x;	1552	tmp1->x = op->x;
1676	tmp1->y = op->y;	1553	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1555	}
…		…
1686	*/	1563	*/
1687		1564
1688	object *	1565	object *
1689	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1690	{	1567	{
1691	object *	1568	object *newob;
1692	newob;
1693	int
1694	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1695		1570
1696	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1697	{	1572	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1574	return NULL;
1700	}	1575	}
		1576
1701	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
		1578
1702	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1703	{	1580	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)	1581	else if (!is_removed)
1709	{	1582	{
1710	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1585	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.");	1587	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");	1588	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1589	return NULL;
1717	}	1590	}
1718	}	1591	}
		1592
1719	newob->nrof = nr;	1593	newob->nrof = nr;
1720		1594
1721	return newob;	1595	return newob;
1722	}	1596	}
1723		1597
…		…
1730	*/	1604	*/
1731		1605
1732	object *	1606	object *
1733	decrease_ob_nr (object *op, uint32 i)	1607	decrease_ob_nr (object *op, uint32 i)
1734	{	1608	{
1735	object *	1609	object *tmp;
1736	tmp;
1737	player *	1610	player *pl;
1738	pl;
1739		1611
1740	if (i == 0) /* objects with op->nrof require this check */	1612	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1613	return op;
1742		1614
1743	if (i > op->nrof)	1615	if (i > op->nrof)
1744	i = op->nrof;	1616	i = op->nrof;
1745		1617
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1618	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1619	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1620	else if (op->env != NULL)
1751	{	1621	{
1752	/* is this object in the players inventory, or sub container	1622	/* is this object in the players inventory, or sub container
1753	* therein?	1623	* therein?
1754	*/	1624	*/
…		…
1779	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1780	}	1650	}
1781	}	1651	}
1782	else	1652	else
1783	{	1653	{
1784	remove_ob (op);	1654	op->remove ();
1785	op->nrof = 0;	1655	op->nrof = 0;
1786	if (tmp)	1656	if (tmp)
1787	{	1657	{
1788	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1789	}	1659	}
1790	}	1660	}
1791	}	1661	}
1792	else	1662	else
1793	{	1663	{
1794	object *
1795	above = op->above;	1664	object *above = op->above;
1796		1665
1797	if (i < op->nrof)	1666	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1667	op->nrof -= i;
1800	}
1801	else	1668	else
1802	{	1669	{
1803	remove_ob (op);	1670	op->remove ();
1804	op->nrof = 0;	1671	op->nrof = 0;
1805	}	1672	}
		1673
1806	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1676	if (tmp->type == PLAYER)
1809	{	1677	{
1810	if (op->nrof)	1678	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1681	esrv_del_item (tmp->contr, op->count);
1814	}	1682	}
1815	}	1683	}
1816		1684
1817	if (op->nrof)	1685	if (op->nrof)
1818	{
1819	return op;	1686	return op;
1820	}
1821	else	1687	else
1822	{	1688	{
1823	free_object (op);	1689	op->destroy ();
1824	return NULL;	1690	return NULL;
1825	}	1691	}
1826	}	1692	}
1827		1693
1828	/*	1694	/*
…		…
1834	add_weight (object *op, signed long weight)	1700	add_weight (object *op, signed long weight)
1835	{	1701	{
1836	while (op != NULL)	1702	while (op != NULL)
1837	{	1703	{
1838	if (op->type == CONTAINER)	1704	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1705	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1706
1842	op->carrying += weight;	1707	op->carrying += weight;
1843	op = op->env;	1708	op = op->env;
1844	}	1709	}
1845	}	1710	}
1846		1711
		1712	object *
		1713	insert_ob_in_ob (object *op, object *where)
		1714	{
		1715	if (!where)
		1716	{
		1717	char *dump = dump_object (op);
		1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1719	free (dump);
		1720	return op;
		1721	}
		1722
		1723	if (where->head)
		1724	{
		1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1726	where = where->head;
		1727	}
		1728
		1729	return where->insert (op);
		1730	}
		1731
1847	/*	1732	/*
1848	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1849	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1850	* inside the object environment.	1735	* inside the object environment.
1851	*	1736	*
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	1737	* The function returns now pointer to inserted item, and return value can
1858	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1859	*/	1739	*/
1860		1740
1861	object *	1741	object *
1862	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1863	{	1743	{
1864	object *	1744	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1745
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1747	op->remove ();
1870	dump_object (op);	1748
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)	1749	if (op->more)
1886	{	1750	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1752	return op;
1889	}	1753	}
		1754
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1757	if (op->nrof)
1893	{	1758	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1760	if (CAN_MERGE (tmp, op))
1896	{	1761	{
1897	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1898	(client needs the original object) */	1763	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1902	*/	1767	*/
1903	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1906	op = tmp;	1771	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1774	break;
1910	}	1775	}
1911		1776
1912	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1779	* (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	1780	* the weight, so we need to add it in again, since we actually do
1916	* the linking below	1781	* the linking below
1917	*/	1782	*/
1918	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1919	}	1784	}
1920	else	1785	else
1921	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1922		1787
1923	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1924	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1791	fix_player (otmp);
1928	}
1929		1792
1930	op->map = NULL;	1793	op->map = NULL;
1931	op->env = where;	1794	op->env = this;
1932	op->above = NULL;	1795	op->above = NULL;
1933	op->below = NULL;	1796	op->below = NULL;
1934	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1935		1798
1936	/* reset the light list and los of the players on the map */	1799	/* reset the light list and los of the players on the map */
1937	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1938	{	1801	{
1939	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1940	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1941	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1943	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1944	}	1807	}
1945		1808
1946	/* Client has no idea of ordering so lets not bother ordering it here.	1809	/* Client has no idea of ordering so lets not bother ordering it here.
1947	* It sure simplifies this function...	1810	* It sure simplifies this function...
1948	*/	1811	*/
1949	if (where->inv == NULL)	1812	if (!inv)
1950	where->inv = op;	1813	inv = op;
1951	else	1814	else
1952	{	1815	{
1953	op->below = where->inv;	1816	op->below = inv;
1954	op->below->above = op;	1817	op->below->above = op;
1955	where->inv = op;	1818	inv = op;
1956	}	1819	}
		1820
1957	return op;	1821	return op;
1958	}	1822	}
1959		1823
1960	/*	1824	/*
1961	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1980		1844
1981	int	1845	int
1982	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1983	{	1847	{
1984	object *tmp;	1848	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1849	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
1988		1851
1989	MoveType move_on, move_slow, move_block;	1852	MoveType move_on, move_slow, move_block;
1990		1853
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1855	return 0;
1993
1994	tag = op->count;
1995		1856
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1857	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);	1858	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);	1859	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1860
…		…
2042	{	1903	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1904	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))	1905	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1906	{
2046		1907
		1908	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1909	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1910
2049	if (op->type == PLAYER)	1911	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1912	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)))	1913	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1914	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	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))	1922	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1923	{
2062	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
2063		1925
2064	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
2065	return 1;	1927	return 1;
2066		1928
2067	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2083	*/	1945	*/
2084		1946
2085	object *	1947	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1949	{
2088	object *	1950	object *
2089	tmp;	1951	tmp;
2090		1952
2091	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2106	*/	1968	*/
2107		1969
2108	object *	1970	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2110	{	1972	{
2111	object *	1973	object *
2112	tmp;	1974	tmp;
2113		1975
2114	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2116	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2117	* customized, changed states, etc.
2256	*/	2118	*/
2257		2119
2258	int	2120	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2122	{
2261	int	2123	int
2262	i,	2124	i,
2263	index = 0, flag;	2125	index = 0, flag;
2264	static int	2126	static int
…		…
2285	return -1;	2147	return -1;
2286	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2287	}	2149	}
2288		2150
2289	/*	2151	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2154	* 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.	2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2156	*/
2295		2157
2296	int	2158	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2160	{
2299	int	2161	int
2300	i;	2162	i;
2301		2163
2302	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2228	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2229	* there is capable of.
2368	*/	2230	*/
2369		2231
2370	int	2232	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2234	{
2373	int	2235	int
2374	i,	2236	i,
2375	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2376	sint16	2238
2377	nx,	2239	sint16 nx, ny;
2378	ny;
2379	object *	2240	object *
2380	tmp;	2241	tmp;
2381	mapstruct *	2242	maptile *
2382	mp;	2243	mp;
2383	MoveType	2244
2384	blocked,	2245	MoveType blocked, move_type;
2385	move_type;
2386		2246
2387	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
2388	{	2248	{
2389	exclude = exclude->head;	2249	exclude = exclude->head;
2390	move_type = exclude->move_type;	2250	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2596	*/	2456	*/
2597		2457
2598		2458
2599	int	2459	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2461	{
2602	sint16	2462	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2463	int
2606	mflags;	2464	mflags;
2607		2465
2608	if (dir < 0)	2466	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2467	return 0; /* exit condition: invalid direction */
…		…
2656	* create clone from object to another	2514	* create clone from object to another
2657	*/	2515	*/
2658	object *	2516	object *
2659	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2660	{	2518	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2520
2664	if (!asrc)	2521	if (!asrc)
2665	return NULL;	2522	return 0;
		2523
2666	src = asrc;	2524	src = asrc;
2667	if (src->head)	2525	if (src->head)
2668	src = src->head;	2526	src = src->head;
2669		2527
2670	prev = NULL;	2528	prev = 0;
2671	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2672	{	2530	{
2673	tmp = get_object ();	2531	tmp = part->clone ();
2674	copy_object (part, tmp);
2675	tmp->x -= src->x;	2532	tmp->x -= src->x;
2676	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2677	if (!part->head)	2535	if (!part->head)
2678	{	2536	{
2679	dst = tmp;	2537	dst = tmp;
2680	tmp->head = NULL;	2538	tmp->head = 0;
2681	}	2539	}
2682	else	2540	else
2683	{	2541	{
2684	tmp->head = dst;	2542	tmp->head = dst;
2685	}	2543	}
		2544
2686	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2687	if (prev)	2547	if (prev)
2688	prev->more = tmp;	2548	prev->more = tmp;
		2549
2689	prev = tmp;	2550	prev = tmp;
2690	}	2551	}
2691		2552
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2555
2698	return dst;	2556	return dst;
2699	}	2557	}
2700		2558
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. */	2559	/* 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 */	2560	/* 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, */	2561	/* 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. */	2562	/* 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. */	2563	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2721		2565
2722	object *	2566	object *
2723	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2724	{	2568	{
2725	object *	2569	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2729		2571
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2573
2732	FILE *
2733	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2734		2575
2735	if (tempfile == NULL)	2576	if (tempfile == NULL)
2736	{	2577	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2579	return NULL;
2739	};	2580	}
		2581
2740	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2583	fclose (tempfile);
2742		2584
2743	op = get_object ();	2585	op = object::create ();
2744		2586
2745	object_thawer	2587	object_thawer thawer (filename);
2746	thawer (filename);
2747		2588
2748	if (thawer)	2589	if (thawer)
2749	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
2750		2591
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2592	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2600	* returns NULL if no match.
2760	*/	2601	*/
2761	object *	2602	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2603	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2604	{
2764	object *	2605	object *tmp;
2765	tmp;
2766		2606
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2609	return tmp;
2770		2610
…		…
2778	* do the desired thing.	2618	* do the desired thing.
2779	*/	2619	*/
2780	key_value *	2620	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2782	{	2622	{
2783	key_value *	2623	key_value *link;
2784	link;
2785		2624
2786	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2626	if (link->key == key)
2789	{
2790	return link;	2627	return link;
2791	}
2792	}
2793		2628
2794	return NULL;	2629	return NULL;
2795	}	2630	}
2796		2631
2797	/*	2632	/*
…		…
2802	* The returned string is shared.	2637	* The returned string is shared.
2803	*/	2638	*/
2804	const char *	2639	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2640	get_ob_key_value (const object *op, const char *const key)
2806	{	2641	{
2807	key_value *	2642	key_value *link;
2808	link;	2643	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2644
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2645	if (!canonical_key)
2815	{	2646	{
2816	/* 1. There being a field named key on any object	2647	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2648	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2649	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2650	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2651	*/
2821	return NULL;	2652	return 0;
2822	}	2653	}
2823		2654
2824	/* This is copied from get_ob_key_link() above -	2655	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2656	* only 4 lines, and saves the function call overhead.
2826	*/	2657	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2658	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2659	if (link->key == canonical_key)
2830	{
2831	return link->value;	2660	return link->value;
2832	}	2661
2833	}
2834	return NULL;	2662	return 0;
2835	}	2663	}
2836		2664
2837		2665
2838	/*	2666	/*
2839	* Updates the canonical_key in op to value.	2667	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2703	if (last)
2876	last->next = field->next;	2704	last->next = field->next;
2877	else	2705	else
2878	op->key_values = field->next;	2706	op->key_values = field->next;
2879		2707
2880	delete
2881	field;	2708	delete field;
2882	}	2709	}
2883	}	2710	}
2884	return TRUE;	2711	return TRUE;
2885	}	2712	}
2886	/* IF we get here, key doesn't exist */	2713	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2748	* Returns TRUE on success.
2922	*/	2749	*/
2923	int	2750	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2751	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2752	{
2926	shstr
2927	key_ (key);	2753	shstr key_ (key);
2928		2754
2929	return set_ob_key_value_s (op, key_, value, add_key);	2755	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2756	}
		2757
		2758	object::depth_iterator::depth_iterator (object *container)
		2759	: iterator_base (container)
		2760	{
		2761	while (item->inv)
		2762	item = item->inv;
		2763	}
		2764
		2765	void
		2766	object::depth_iterator::next ()
		2767	{
		2768	if (item->below)
		2769	{
		2770	item = item->below;
		2771
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
		2775	else
		2776	item = item->env;
		2777	}
		2778
		2779	// return a suitable string describing an objetc in enough detail to find it
		2780	const char *
		2781	object::debug_desc (char *info) const
		2782	{
		2783	char info2[256 * 3];
		2784	char *p = info;
		2785
		2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2787	count,
		2788	&name,
		2789	title ? " " : "",
		2790	title ? (const char *)title : "");
		2791
		2792	if (env)
		2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2794
		2795	if (map)
		2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2797
		2798	return info;
		2799	}
		2800
		2801	const char *
		2802	object::debug_desc () const
		2803	{
		2804	static char info[256 * 3];
		2805	return debug_desc (info);
		2806	}
		2807

Diff Legend

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