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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.59 by root, Wed Dec 6 13:59:00 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
43	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
44		38
45	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
47		40
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	};	43	};
…		…
56	};	49	};
57	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
61		131
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	133	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	135	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	285	return 0;
216		286
217	switch (ob1->type)	287	switch (ob1->type)
218	{	288	{
219	case SCROLL:	289	case SCROLL:
220	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
221	return 0;	291	return 0;
222	break;	292	break;
223	}	293	}
224		294
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	296	{
227	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
249	/*	319	/*
250	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
253	*/	323	*/
254	signed long	324	long
255	sum_weight (object *op)	325	sum_weight (object *op)
256	{	326	{
257	signed long sum;	327	long sum;
258	object *inv;	328	object *inv;
259		329
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	331	{
262	if (inv->inv)	332	if (inv->inv)
263	sum_weight (inv);	333	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	335	}
		336
266	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
268	if (op->carrying != sum)	340	if (op->carrying != sum)
269	op->carrying = sum;	341	op->carrying = sum;
		342
270	return sum;	343	return sum;
271	}	344	}
272		345
273	/**	346	/**
274	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	375	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
304	*/	377	*/
305		378
306	void	379	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	380	dump_object (object *op)
362	{	381	{
363	if (op == NULL)	382	if (!op)
364	{	383	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		384
372	void	385	object_freezer freezer;
373	dump_all_objects (void)	386	save_object (freezer, op, 3);
374	{	387	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	388	}
383		389
384	/*	390	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
406	*/	412	*/
407		413
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	418	if (op->count == i)
415	break;	419	return op;
		420
416	return op;	421	return 0;
417	}	422	}
418		423
419	/*	424	/*
420	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
423	*/	428	*/
424		429
425	object *	430	object *
426	find_object_name (const char *str)	431	find_object_name (const char *str)
427	{	432	{
428	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
429	object *op;	434	object *op;
430		435
431	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	437	if (op->name == str_)
433	break;	438	break;
434		439
435	return op;	440	return op;
436	}	441	}
437		442
…		…
440	{	445	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	447	}
443		448
444	/*	449	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	451	* skill and experience objects.
485	*/	452	*/
486	void	453	void
487	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
488	{	455	{
489	if (owner == NULL || op == NULL)	456	if (!owner)
490	return;	457	return;
491		458
492	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	460	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	462	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	463	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	464	* didn't match, this check is valid and I believe that cause is valid.
498	*/	465	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
500	owner = owner->owner;	467	owner = owner->owner;
501		468
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	469	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	470	}
542		471
543	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	473	* refcounts and freeing the links.
545	*/	474	*/
…		…
561	{	490	{
562	attachable_base::clear ();	491	attachable_base::clear ();
563		492
564	free_key_values (this);	493	free_key_values (this);
565		494
566	clear_owner (this);	495	owner = 0;
567
568	name = 0;	496	name = 0;
569	name_pl = 0;	497	name_pl = 0;
570	title = 0;	498	title = 0;
571	race = 0;	499	race = 0;
572	slaying = 0;	500	slaying = 0;
573	skill = 0;	501	skill = 0;
574	msg = 0;	502	msg = 0;
575	lore = 0;	503	lore = 0;
576	custom_name = 0;	504	custom_name = 0;
577	materialname = 0;	505	materialname = 0;
		506	contr = 0;
		507	below = 0;
		508	above = 0;
		509	inv = 0;
		510	container = 0;
		511	env = 0;
		512	more = 0;
		513	head = 0;
		514	map = 0;
		515	active_next = 0;
		516	active_prev = 0;
578		517
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		519
581	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
		521
		522	/* What is not cleared is next, prev, and count */
		523
		524	expmul = 1.0;
		525	face = blank_face;
		526
		527	if (settings.casting_time)
		528	casting_time = -1;
582	}	529	}
583		530
584	void object::clone (object *destination)	531	void object::clone (object *destination)
585	{	532	{
586	*(object_copy *) destination = *this;	533	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	534	*(object_pod *)destination = *this;
588		535
589	if (self || cb)	536	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	538	}
624		539
625	/*	540	/*
626	* copy object first frees everything allocated by the second object,	541	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	542	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	543	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	545	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	546	* will point at garbage.
632	*/	547	*/
633
634	void	548	void
635	copy_object (object *op2, object *op)	549	copy_object (object *op2, object *op)
636	{	550	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
639		553
640	op2->clone (op);	554	op2->clone (op);
641		555
642	if (is_freed)	556	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	557	SET_FLAG (op, FLAG_FREED);
		558
644	if (is_removed)	559	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	560	SET_FLAG (op, FLAG_REMOVED);
646		561
647	if (op2->speed < 0)	562	if (op2->speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
…		…
698	/*	613	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	614	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	615	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	616	* This function needs to be called whenever the speed of an object changes.
702	*/	617	*/
703
704	void	618	void
705	update_ob_speed (object *op)	619	update_ob_speed (object *op)
706	{	620	{
707	extern int arch_init;	621	extern int arch_init;
708		622
…		…
717	abort ();	631	abort ();
718	#else	632	#else
719	op->speed = 0;	633	op->speed = 0;
720	#endif	634	#endif
721	}	635	}
		636
722	if (arch_init)	637	if (arch_init)
723	{
724	return;	638	return;
725	}	639
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	641	{
728	/* If already on active list, don't do anything */	642	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	643	if (op->active_next || op->active_prev || op == active_objects)
730	return;	644	return;
731		645
732	/* process_events() expects us to insert the object at the beginning	646	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	647	* of the list. */
734	op->active_next = active_objects;	648	op->active_next = active_objects;
		649
735	if (op->active_next != NULL)	650	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	651	op->active_next->active_prev = op;
		652
737	active_objects = op;	653	active_objects = op;
738	}	654	}
739	else	655	else
740	{	656	{
741	/* If not on the active list, nothing needs to be done */	657	/* If not on the active list, nothing needs to be done */
…		…
743	return;	659	return;
744		660
745	if (op->active_prev == NULL)	661	if (op->active_prev == NULL)
746	{	662	{
747	active_objects = op->active_next;	663	active_objects = op->active_next;
		664
748	if (op->active_next != NULL)	665	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	666	op->active_next->active_prev = NULL;
750	}	667	}
751	else	668	else
752	{	669	{
753	op->active_prev->active_next = op->active_next;	670	op->active_prev->active_next = op->active_next;
		671
754	if (op->active_next)	672	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	673	op->active_next->active_prev = op->active_prev;
756	}	674	}
		675
757	op->active_next = NULL;	676	op->active_next = NULL;
758	op->active_prev = NULL;	677	op->active_prev = NULL;
759	}	678	}
760	}	679	}
761		680
…		…
886	update_now = 1;	805	update_now = 1;
887		806
888	if ((move_slow | op->move_slow) != move_slow)	807	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	808	update_now = 1;
890	}	809	}
		810
891	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	813	* that is being removed.
894	*/	814	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	816	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	818	/* Nothing to do for that case */ ;
902	}
903	else	819	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		821
908	if (update_now)	822	if (update_now)
909	{	823	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	825	update_position (op->map, op->x, op->y);
…		…
913		827
914	if (op->more != NULL)	828	if (op->more != NULL)
915	update_object (op->more, action);	829	update_object (op->more, action);
916	}	830	}
917		831
918	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
919	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
920		835
921	void object::free_mortals ()	836	void object::free_mortals ()
922	{	837	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
925	{	842	{
926	freed.push_back (*i);	843	delete *i;
927	mortals.erase (i);	844	mortals.erase (i);
928	}	845	}
929	else
930	++i;
931	}	846	}
932		847
933	object::object ()	848	object::object ()
934	{	849	{
935	SET_FLAG (this, FLAG_REMOVED);	850	SET_FLAG (this, FLAG_REMOVED);
936		851
937	expmul = 1.0;	852	expmul = 1.0;
938	face = blank_face;	853	face = blank_face;
939	attacked_by_count = -1;
940	}	854	}
941		855
942	object::~object ()	856	object::~object ()
943	{	857	{
944	free_key_values (this);	858	free_key_values (this);
945	}	859	}
946		860
947	void object::link ()	861	void object::link ()
948	{	862	{
949	count = ++ob_count;	863	count = ++ob_count;
		864	uuid = gen_uuid ();
950		865
951	prev = 0;	866	prev = 0;
952	next = objects;	867	next = object::first;
953		868
954	if (objects)	869	if (object::first)
955	objects->prev = this;	870	object::first->prev = this;
956		871
957	objects = this;	872	object::first = this;
958	}	873	}
959		874
960	void object::unlink ()	875	void object::unlink ()
961	{	876	{
962	count = 0;	877	if (this == object::first)
		878	object::first = next;
963		879
964	/* Remove this object from the list of used objects */	880	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	881	if (prev) prev->next = next;
		882	if (next) next->prev = prev;
		883
968	prev = 0;	884	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	885	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	886	}
980		887
981	object *object::create ()	888	object *object::create ()
982	{	889	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	890	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	891	op->link ();
996	return op;	892	return op;
997	}	893	}
998		894
999	/*	895	/*
…		…
1001	* 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
1002	* free objects. The IS_FREED() flag is set in the object.	898	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	899	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	900	* this function to succeed.
1005	*	901	*
1006	* 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
1007	* inventory to the ground.	903	* inventory to the ground.
1008	*/	904	*/
1009	void object::free (bool free_inventory)	905	void object::destroy (bool destroy_inventory)
1010	{	906	{
		907	if (QUERY_FLAG (this, FLAG_FREED))
		908	return;
		909
		910	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		911	remove_friendly_object (this);
		912
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	913	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	914	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		915
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	916	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		917
1033	if (more)	918	if (more)
1034	{	919	{
1035	more->free (free_inventory);	920	more->destroy (destroy_inventory);
1036	more = 0;	921	more = 0;
1037	}	922	}
1038		923
1039	if (inv)	924	if (inv)
1040	{	925	{
1041	/* Only if the space blocks everything do we not process -	926	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	927	* if some form of movement is allowed, let objects
1043	* drop on that space.	928	* drop on that space.
1044	*/	929	*/
1045	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)
1046	{	931	{
1047	object *	932	object *op = inv;
1048	op = inv;
1049		933
1050	while (op)	934	while (op)
1051	{	935	{
1052	object *
1053	tmp = op->below;	936	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	937	op->destroy (destroy_inventory);
1057	op = tmp;	938	op = tmp;
1058	}	939	}
1059	}	940	}
1060	else	941	else
1061	{ /* Put objects in inventory onto this space */	942	{ /* Put objects in inventory onto this space */
1062	object *	943	object *op = inv;
1063	op = inv;
1064		944
1065	while (op)	945	while (op)
1066	{	946	{
1067	object *
1068	tmp = op->below;	947	object *tmp = op->below;
1069		948
1070	remove_ob (op);	949	remove_ob (op);
1071		950
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| 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))
…		…
1082	op = tmp;	961	op = tmp;
1083	}	962	}
1084	}	963	}
1085	}	964	}
1086		965
1087	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;
1088		993
1089	/* Remove object from the active list */	994	/* Remove object from the active list */
1090	speed = 0;	995	speed = 0;
1091	update_ob_speed (this);	996	update_ob_speed (this);
1092		997
1093	unlink ();	998	unlink ();
1094		999
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1000	mortals.push_back (this);
1098	}	1001	}
1099		1002
1100	/*	1003	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1004	* sub_weight() recursively (outwards) subtracts a number from the
1102	* 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)).
1103	*/	1006	*/
1104
1105	void	1007	void
1106	sub_weight (object *op, signed long weight)	1008	sub_weight (object *op, signed long weight)
1107	{	1009	{
1108	while (op != NULL)	1010	while (op != NULL)
1109	{	1011	{
1110	if (op->type == CONTAINER)	1012	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1013	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1014
1114	op->carrying -= weight;	1015	op->carrying -= weight;
1115	op = op->env;	1016	op = op->env;
1116	}	1017	}
1117	}	1018	}
1118		1019
…		…
1122	* object will have no environment. If the object previously had an	1023	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1024	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1025	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1026	* Beware: This function is called from the editor as well!
1126	*/	1027	*/
1127
1128	void	1028	void
1129	remove_ob (object *op)	1029	object::remove ()
1130	{	1030	{
		1031	object *tmp, *last = 0;
1131	object *	1032	object *otmp;
1132	tmp, *	1033
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1034	int check_walk_off;
1140	mapstruct *
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1035
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1036	if (QUERY_FLAG (this, FLAG_REMOVED))
1148	{	1037	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1038
1152	/* Changed it to always dump core in this case. As has been learned
1153	* in the past, trying to recover from errors almost always
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)
1165	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);	1039	SET_FLAG (this, FLAG_REMOVED);
		1040
		1041	if (more)
		1042	more->remove ();
1168		1043
1169	/*	1044	/*
1170	* In this case, the object to be removed is in someones	1045	* In this case, the object to be removed is in someones
1171	* inventory.	1046	* inventory.
1172	*/	1047	*/
1173	if (op->env != NULL)	1048	if (env)
1174	{	1049	{
1175	if (op->nrof)	1050	if (nrof)
1176	sub_weight (op->env, op->weight * op->nrof);	1051	sub_weight (env, weight * nrof);
1177	else	1052	else
1178	sub_weight (op->env, op->weight + op->carrying);	1053	sub_weight (env, weight + carrying);
1179		1054
1180	/* 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
1181	* made to players inventory. If set, avoiding the call	1056	* made to players inventory. If set, avoiding the call
1182	* to save cpu time.	1057	* to save cpu time.
1183	*/	1058	*/
1184	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))
1185	fix_player (otmp);	1060	fix_player (otmp);
1186		1061
1187	if (op->above != NULL)	1062	if (above != NULL)
1188	op->above->below = op->below;	1063	above->below = below;
1189	else	1064	else
1190	op->env->inv = op->below;	1065	env->inv = below;
1191		1066
1192	if (op->below != NULL)	1067	if (below != NULL)
1193	op->below->above = op->above;	1068	below->above = above;
1194		1069
1195	/* we set up values so that it could be inserted into	1070	/* we set up values so that it could be inserted into
1196	* 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
1197	* to the caller to decide what we want to do.	1072	* to the caller to decide what we want to do.
1198	*/	1073	*/
1199	op->x = op->env->x, op->y = op->env->y;	1074	x = env->x, y = env->y;
1200	op->map = op->env->map;	1075	map = env->map;
1201	op->above = NULL, op->below = NULL;	1076	above = 0, below = 0;
1202	op->env = NULL;	1077	env = 0;
1203	return;
1204	}
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;
1211	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);
1213
1214	if (!m)
1215	{	1078	}
1216	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)
1217	op->map->path, op->x, op->y);	1080	{
1218	/* 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
1219	* it seems if we get into this case, something is probablye	1082	* lots of logic for things we no longer care about
1220	* screwed up and should be fixed.
1221	*/	1083	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1084
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1085	/* link the object above us */
1235	if (op->above)	1086	if (above)
1236	op->above->below = op->below;	1087	above->below = below;
1237	else	1088	else
1238	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 */
1239		1090
1240	/* Relink the object below us, if there is one */	1091	/* Relink the object below us, if there is one */
1241	if (op->below)	1092	if (below)
1242	{
1243	op->below->above = op->above;	1093	below->above = above;
1244	}
1245	else	1094	else
1246	{	1095	{
1247	/* 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
1248	* use translated coordinates in case some oddness with map tiling is	1097	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1098	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	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",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1099	*/
1281	if (tmp->container == op)	1100	if (GET_MAP_OB (map, x, y) != this)
1282	{	1101	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1102	char *dump = dump_object (this);
1284	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);
1285	}	1109	}
1286	tmp->contr->socket.update_look = 1;	1110
1287	}	1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1112	}
1291		1113
1292	move_apply (tmp, op, NULL);	1114	above = 0;
1293	if (was_destroyed (op, tag))	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)
1294	{	1129	{
1295	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;
1296	}	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 ());
1297	}	1152	}
1298		1153
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1155
1301	if (tmp->above == tmp)	1156	if (tmp->above == tmp)
1302	tmp->above = NULL;	1157	tmp->above = 0;
		1158
1303	last = tmp;	1159	last = tmp;
1304	}	1160	}
		1161
1305	/* last == NULL of there are no objects on this space */	1162	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1163	if (!last)
1307	{	1164	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* 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
1310	* 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
1311	* be correct anyways.	1168	* be correct anyways.
1312	*/	1169	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1171	update_position (map, x, y);
1315	}	1172	}
1316	else	1173	else
1317	update_object (last, UP_OBJ_REMOVE);	1174	update_object (last, UP_OBJ_REMOVE);
1318		1175
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1320	update_all_los (op->map, op->x, op->y);	1177	update_all_los (map, x, y);
1321		1178	}
1322	}	1179	}
1323		1180
1324	/*	1181	/*
1325	* merge_ob(op,top):	1182	* merge_ob(op,top):
1326	*	1183	*
1327	* This function goes through all objects below and including top, and	1184	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1185	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1186	* If top is NULL, it is calculated.
1330	* 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
1331	*/	1188	*/
1332
1333	object *	1189	object *
1334	merge_ob (object *op, object *top)	1190	merge_ob (object *op, object *top)
1335	{	1191	{
1336	if (!op->nrof)	1192	if (!op->nrof)
1337	return 0;	1193	return 0;
		1194
1338	if (top == NULL)	1195	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1196	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1197
1340	for (; top != NULL; top = top->below)	1198	for (; top != NULL; top = top->below)
1341	{	1199	{
1342	if (top == op)	1200	if (top == op)
1343	continue;	1201	continue;
1344	if (CAN_MERGE (op, top))	1202	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1208	remove_ob (op);
1351	free_object (op);	1209	free_object (op);
1352	return top;	1210	return top;
1353	}	1211	}
1354	}	1212	}
		1213
1355	return NULL;	1214	return 0;
1356	}	1215	}
1357		1216
1358	/*	1217	/*
1359	* 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
1360	* job preparing multi-part monsters	1219	* job preparing multi-part monsters
1361	*/	1220	*/
1362	object *	1221	object *
1363	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)
1364	{	1223	{
1365	object *	1224	object *tmp;
1366	tmp;
1367		1225
1368	if (op->head)	1226	if (op->head)
1369	op = op->head;	1227	op = op->head;
		1228
1370	for (tmp = op; tmp; tmp = tmp->more)	1229	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1230	{
1372	tmp->x = x + tmp->arch->clone.x;	1231	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1232	tmp->y = y + tmp->arch->clone.y;
1374	}	1233	}
		1234
1375	return insert_ob_in_map (op, m, originator, flag);	1235	return insert_ob_in_map (op, m, originator, flag);
1376	}	1236	}
1377		1237
1378	/*	1238	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1239	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1255	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1256	* just 'op' otherwise
1397	*/	1257	*/
1398		1258
1399	object *	1259	object *
1400	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)
1401	{	1261	{
1402	object *tmp, *top, *floor = NULL;	1262	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1263	sint16 x, y;
1404		1264
1405	if (QUERY_FLAG (op, FLAG_FREED))	1265	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1268	return NULL;
1409	}	1269	}
1410		1270
1411	if (m == NULL)	1271	if (m == NULL)
1412	{	1272	{
1413	dump_object (op);	1273	char *dump = dump_object (op);
1414	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);
1415	return op;	1276	return op;
1416	}	1277	}
1417		1278
1418	if (out_of_map (m, op->x, op->y))	1279	if (out_of_map (m, op->x, op->y))
1419	{	1280	{
1420	dump_object (op);	1281	char *dump = dump_object (op);
1421	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);
1422	#ifdef MANY_CORES	1283	#ifdef MANY_CORES
1423	/* 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
1424	* 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
1425	* improperly inserted.	1286	* improperly inserted.
1426	*/	1287	*/
1427	abort ();	1288	abort ();
1428	#endif	1289	#endif
		1290	free (dump);
1429	return op;	1291	return op;
1430	}	1292	}
1431		1293
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1294	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1295	{
1434	dump_object (op);	1296	char *dump = dump_object (op);
1435	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);
1436	return op;	1299	return op;
1437	}	1300	}
1438		1301
1439	if (op->more != NULL)	1302	if (op->more != NULL)
1440	{	1303	{
1441	/* The part may be on a different map. */	1304	/* The part may be on a different map. */
1442		1305
1443	object *
1444	more = op->more;	1306	object *more = op->more;
1445		1307
1446	/* We really need the caller to normalize coordinates - if	1308	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1309	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1310	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1311	* is clear wrong do we normalize it.
1450	*/	1312	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1313	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1314	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1315	else if (!more->map)
1456	{	1316	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1317	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1318	* more->map should always point to the parent.
1459	*/	1319	*/
…		…
1462		1322
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1323	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1324	{
1465	if (!op->head)	1325	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1326	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1327
1467	return NULL;	1328	return NULL;
1468	}	1329	}
1469	}	1330	}
1470		1331
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1332	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1397
1537	while (top != NULL)	1398	while (top != NULL)
1538	{	1399	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1401	floor = top;
		1402
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1404	{
1543	/* We insert above top, so we want this object below this */	1405	/* We insert above top, so we want this object below this */
1544	top = top->below;	1406	top = top->below;
1545	break;	1407	break;
1546	}	1408	}
		1409
1547	last = top;	1410	last = top;
1548	top = top->above;	1411	top = top->above;
1549	}	1412	}
		1413
1550	/* Don't want top to be NULL, so set it to the last valid object */	1414	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1415	top = last;
1552		1416
1553	/* We let update_position deal with figuring out what the space	1417	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1418	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1497	* of effect may be sufficient.
1634	*/	1498	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1500	update_all_los (op->map, op->x, op->y);
1637		1501
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1641
1642		1504
1643	/* Don't know if moving this to the end will break anything. However,	1505	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1506	* we want to have update_look set above before calling this.
1645	*	1507	*
1646	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
…		…
1671	* 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.
1672	*/	1534	*/
1673	void	1535	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1537	{
1676	object *tmp;	1538	object *
		1539	tmp;
1677	object *tmp1;	1540	object *
		1541	tmp1;
1678		1542
1679	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1680		1544
1681	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)
1682	{	1546	{
…		…
1685	remove_ob (tmp);	1549	remove_ob (tmp);
1686	free_object (tmp);	1550	free_object (tmp);
1687	}	1551	}
1688	}	1552	}
1689		1553
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1554	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1555
1692	tmp1->x = op->x;	1556	tmp1->x = op->x;
1693	tmp1->y = op->y;	1557	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1558	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1559	}
…		…
1713	if (orig_ob->nrof < nr)	1577	if (orig_ob->nrof < nr)
1714	{	1578	{
1715	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);
1716	return NULL;	1580	return NULL;
1717	}	1581	}
		1582
1718	newob = object_create_clone (orig_ob);	1583	newob = object_create_clone (orig_ob);
		1584
1719	if ((orig_ob->nrof -= nr) < 1)	1585	if ((orig_ob->nrof -= nr) < 1)
1720	{	1586	{
1721	if (!is_removed)	1587	if (!is_removed)
1722	remove_ob (orig_ob);	1588	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1589	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1597	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1598	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1599	return NULL;
1734	}	1600	}
1735	}	1601	}
		1602
1736	newob->nrof = nr;	1603	newob->nrof = nr;
1737		1604
1738	return newob;	1605	return newob;
1739	}	1606	}
1740		1607
…		…
1747	*/	1614	*/
1748		1615
1749	object *	1616	object *
1750	decrease_ob_nr (object *op, uint32 i)	1617	decrease_ob_nr (object *op, uint32 i)
1751	{	1618	{
1752	object *	1619	object *tmp;
1753	tmp;
1754	player *	1620	player *pl;
1755	pl;
1756		1621
1757	if (i == 0) /* objects with op->nrof require this check */	1622	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1623	return op;
1759		1624
1760	if (i > op->nrof)	1625	if (i > op->nrof)
1761	i = op->nrof;	1626	i = op->nrof;
1762		1627
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1628	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1629	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1630	else if (op->env != NULL)
1768	{	1631	{
1769	/* is this object in the players inventory, or sub container	1632	/* is this object in the players inventory, or sub container
1770	* therein?	1633	* therein?
1771	*/	1634	*/
…		…
1806	}	1669	}
1807	}	1670	}
1808	}	1671	}
1809	else	1672	else
1810	{	1673	{
1811	object *
1812	above = op->above;	1674	object *above = op->above;
1813		1675
1814	if (i < op->nrof)	1676	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1677	op->nrof -= i;
1817	}
1818	else	1678	else
1819	{	1679	{
1820	remove_ob (op);	1680	remove_ob (op);
1821	op->nrof = 0;	1681	op->nrof = 0;
1822	}	1682	}
		1683
1823	/* Since we just removed op, op->above is null */	1684	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1685	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1686	if (tmp->type == PLAYER)
1826	{	1687	{
1827	if (op->nrof)	1688	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1691	esrv_del_item (tmp->contr, op->count);
1831	}	1692	}
1832	}	1693	}
1833		1694
1834	if (op->nrof)	1695	if (op->nrof)
1835	{
1836	return op;	1696	return op;
1837	}
1838	else	1697	else
1839	{	1698	{
1840	free_object (op);	1699	free_object (op);
1841	return NULL;	1700	return NULL;
1842	}	1701	}
…		…
1851	add_weight (object *op, signed long weight)	1710	add_weight (object *op, signed long weight)
1852	{	1711	{
1853	while (op != NULL)	1712	while (op != NULL)
1854	{	1713	{
1855	if (op->type == CONTAINER)	1714	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1715	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1716
1859	op->carrying += weight;	1717	op->carrying += weight;
1860	op = op->env;	1718	op = op->env;
1861	}	1719	}
1862	}	1720	}
1863		1721
		1722	object *
		1723	insert_ob_in_ob (object *op, object *where)
		1724	{
		1725	if (!where)
		1726	{
		1727	char *dump = dump_object (op);
		1728	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1729	free (dump);
		1730	return op;
		1731	}
		1732
		1733	if (where->head)
		1734	{
		1735	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1736	where = where->head;
		1737	}
		1738
		1739	return where->insert (op);
		1740	}
		1741
1864	/*	1742	/*
1865	* insert_ob_in_ob(op,environment):	1743	* env->insert (op)
1866	* This function inserts the object op in the linked list	1744	* This function inserts the object op in the linked list
1867	* inside the object environment.	1745	* inside the object environment.
1868	*	1746	*
1869	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1870	* the inventory at the last position or next to other objects of the same
1871	* type.
1872	* Frank: Now sorted by type, archetype and magic!
1873	*
1874	* The function returns now pointer to inserted item, and return value can	1747	* The function returns now pointer to inserted item, and return value can
1875	* be != op, if items are merged. -Tero	1748	* be != op, if items are merged. -Tero
1876	*/	1749	*/
1877		1750
1878	object *	1751	object *
1879	insert_ob_in_ob (object *op, object *where)	1752	object::insert (object *op)
1880	{	1753	{
1881	object *	1754	object *tmp, *otmp;
1882	tmp, *
1883	otmp;
1884		1755
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1756	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1757	op->remove ();
1887	dump_object (op);	1758
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;
1890	}
1891	if (where == NULL)
1892	{
1893	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;
1896	}
1897	if (where->head)
1898	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;
1901	}
1902	if (op->more)	1759	if (op->more)
1903	{	1760	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1761	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1762	return op;
1906	}	1763	}
		1764
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1765	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1766	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1767	if (op->nrof)
1910	{	1768	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1769	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1912	if (CAN_MERGE (tmp, op))	1770	if (CAN_MERGE (tmp, op))
1913	{	1771	{
1914	/* return the original object and remove inserted object	1772	/* return the original object and remove inserted object
1915	(client needs the original object) */	1773	(client needs the original object) */
1916	tmp->nrof += op->nrof;	1774	tmp->nrof += op->nrof;
1917	/* Weight handling gets pretty funky. Since we are adding to	1775	/* Weight handling gets pretty funky. Since we are adding to
1918	* tmp->nrof, we need to increase the weight.	1776	* tmp->nrof, we need to increase the weight.
1919	*/	1777	*/
1920	add_weight (where, op->weight * op->nrof);	1778	add_weight (this, op->weight * op->nrof);
1921	SET_FLAG (op, FLAG_REMOVED);	1779	SET_FLAG (op, FLAG_REMOVED);
1922	free_object (op); /* free the inserted object */	1780	op->destroy (); /* free the inserted object */
1923	op = tmp;	1781	op = tmp;
1924	remove_ob (op); /* and fix old object's links */	1782	op->remove (); /* and fix old object's links */
1925	CLEAR_FLAG (op, FLAG_REMOVED);	1783	CLEAR_FLAG (op, FLAG_REMOVED);
1926	break;	1784	break;
1927	}	1785	}
1928		1786
1929	/* I assume combined objects have no inventory	1787	/* I assume combined objects have no inventory
1930	* We add the weight - this object could have just been removed	1788	* We add the weight - this object could have just been removed
1931	* (if it was possible to merge). calling remove_ob will subtract	1789	* (if it was possible to merge). calling remove_ob will subtract
1932	* the weight, so we need to add it in again, since we actually do	1790	* the weight, so we need to add it in again, since we actually do
1933	* the linking below	1791	* the linking below
1934	*/	1792	*/
1935	add_weight (where, op->weight * op->nrof);	1793	add_weight (this, op->weight * op->nrof);
1936	}	1794	}
1937	else	1795	else
1938	add_weight (where, (op->weight + op->carrying));	1796	add_weight (this, (op->weight + op->carrying));
1939		1797
1940	otmp = is_player_inv (where);	1798	otmp = is_player_inv (this);
1941	if (otmp && otmp->contr != NULL)	1799	if (otmp && otmp->contr)
1942	{
1943	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1800	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1944	fix_player (otmp);	1801	fix_player (otmp);
1945	}
1946		1802
1947	op->map = NULL;	1803	op->map = NULL;
1948	op->env = where;	1804	op->env = this;
1949	op->above = NULL;	1805	op->above = NULL;
1950	op->below = NULL;	1806	op->below = NULL;
1951	op->x = 0, op->y = 0;	1807	op->x = 0, op->y = 0;
1952		1808
1953	/* reset the light list and los of the players on the map */	1809	/* reset the light list and los of the players on the map */
1954	if ((op->glow_radius != 0) && where->map)	1810	if ((op->glow_radius != 0) && map)
1955	{	1811	{
1956	#ifdef DEBUG_LIGHTS	1812	#ifdef DEBUG_LIGHTS
1957	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1813	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1958	#endif /* DEBUG_LIGHTS */	1814	#endif /* DEBUG_LIGHTS */
1959	if (MAP_DARKNESS (where->map))	1815	if (MAP_DARKNESS (map))
1960	update_all_los (where->map, where->x, where->y);	1816	update_all_los (map, x, y);
1961	}	1817	}
1962		1818
1963	/* Client has no idea of ordering so lets not bother ordering it here.	1819	/* Client has no idea of ordering so lets not bother ordering it here.
1964	* It sure simplifies this function...	1820	* It sure simplifies this function...
1965	*/	1821	*/
1966	if (where->inv == NULL)	1822	if (!inv)
1967	where->inv = op;	1823	inv = op;
1968	else	1824	else
1969	{	1825	{
1970	op->below = where->inv;	1826	op->below = inv;
1971	op->below->above = op;	1827	op->below->above = op;
1972	where->inv = op;	1828	inv = op;
1973	}	1829	}
		1830
1974	return op;	1831	return op;
1975	}	1832	}
1976		1833
1977	/*	1834	/*
1978	* Checks if any objects has a move_type that matches objects	1835	* Checks if any objects has a move_type that matches objects
…		…
1996	*/	1853	*/
1997		1854
1998	int	1855	int
1999	check_move_on (object *op, object *originator)	1856	check_move_on (object *op, object *originator)
2000	{	1857	{
2001	object *	1858	object *tmp;
2002	tmp;	1859	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1860	int x = op->x, y = op->y;
2009	MoveType	1861
2010	move_on,	1862	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1863
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1864	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1865	return 0;
2016
2017	tag = op->count;
2018		1866
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1867	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1868	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1869	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1870
…		…
2047	* we don't need to check all of them.	1895	* we don't need to check all of them.
2048	*/	1896	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1897	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1898	break;
2051	}	1899	}
		1900
2052	for (; tmp != NULL; tmp = tmp->below)	1901	for (; tmp; tmp = tmp->below)
2053	{	1902	{
2054	if (tmp == op)	1903	if (tmp == op)
2055	continue; /* Can't apply yourself */	1904	continue; /* Can't apply yourself */
2056		1905
2057	/* Check to see if one of the movement types should be slowed down.	1906	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1914	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1915	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1916	{
2068		1917
2069	float	1918	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1919	diff = tmp->move_slow_penalty * FABS (op->speed);
		1920
2073	if (op->type == PLAYER)	1921	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1922	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1923	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1924	diff /= 4.0;
2079	}	1925
2080	}
2081	op->speed_left -= diff;	1926	op->speed_left -= diff;
2082	}	1927	}
2083	}	1928	}
2084		1929
2085	/* Basically same logic as above, except now for actual apply. */	1930	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1931	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1932	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1933	{
2089
2090	move_apply (tmp, op, originator);	1934	move_apply (tmp, op, originator);
		1935
2091	if (was_destroyed (op, tag))	1936	if (op->destroyed ())
2092	return 1;	1937	return 1;
2093		1938
2094	/* what the person/creature stepped onto has moved the object	1939	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1940	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1941	* have a feeling strange problems would result.
2097	*/	1942	*/
2098	if (op->map != m || op->x != x || op->y != y)	1943	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1944	return 0;
2100	}	1945	}
2101	}	1946	}
		1947
2102	return 0;	1948	return 0;
2103	}	1949	}
2104		1950
2105	/*	1951	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1952	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1953	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1954	* The first matching object is returned, or NULL if none.
2109	*/	1955	*/
2110		1956
2111	object *	1957	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1958	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1959	{
2114	object *	1960	object *
2115	tmp;	1961	tmp;
2116		1962
2117	if (m == NULL || out_of_map (m, x, y))	1963	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	1976	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	1977	* The first matching object is returned, or NULL if none.
2132	*/	1978	*/
2133		1979
2134	object *	1980	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	1981	present (unsigned char type, maptile *m, int x, int y)
2136	{	1982	{
2137	object *	1983	object *
2138	tmp;	1984	tmp;
2139		1985
2140	if (out_of_map (m, x, y))	1986	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2126	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2127	* customized, changed states, etc.
2282	*/	2128	*/
2283		2129
2284	int	2130	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2131	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2132	{
2287	int	2133	int
2288	i,	2134	i,
2289	index = 0, flag;	2135	index = 0, flag;
2290	static int	2136	static int
…		…
2311	return -1;	2157	return -1;
2312	return altern[RANDOM () % index];	2158	return altern[RANDOM () % index];
2313	}	2159	}
2314		2160
2315	/*	2161	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2162	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2163	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2164	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2165	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2166	*/
2321		2167
2322	int	2168	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2169	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2170	{
2325	int	2171	int
2326	i;	2172	i;
2327		2173
2328	for (i = 0; i < SIZEOFFREE; i++)	2174	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2238	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2239	* there is capable of.
2394	*/	2240	*/
2395		2241
2396	int	2242	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2243	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2244	{
2399	int	2245	int
2400	i,	2246	i,
2401	max = SIZEOFFREE, mflags;	2247	max = SIZEOFFREE, mflags;
2402	sint16	2248
2403	nx,	2249	sint16 nx, ny;
2404	ny;
2405	object *	2250	object *
2406	tmp;	2251	tmp;
2407	mapstruct *	2252	maptile *
2408	mp;	2253	mp;
2409	MoveType	2254
2410	blocked,	2255	MoveType blocked, move_type;
2411	move_type;
2412		2256
2413	if (exclude && exclude->head)	2257	if (exclude && exclude->head)
2414	{	2258	{
2415	exclude = exclude->head;	2259	exclude = exclude->head;
2416	move_type = exclude->move_type;	2260	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2465	* Modified to be map tile aware -.MSW
2622	*/	2466	*/
2623		2467
2624		2468
2625	int	2469	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2470	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2471	{
2628	sint16	2472	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2473	int
2632	mflags;	2474	mflags;
2633		2475
2634	if (dir < 0)	2476	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2477	return 0; /* exit condition: invalid direction */
…		…
2713	if (prev)	2555	if (prev)
2714	prev->more = tmp;	2556	prev->more = tmp;
2715	prev = tmp;	2557	prev = tmp;
2716	}	2558	}
2717		2559
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2560	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2561	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2562
2724	return dst;	2563	return dst;
2725	}	2564	}
2726		2565
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2566	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* 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 */
2739
2740	/* 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, */
2741
2742	/* 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. */
2743
2744	/* 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. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2571	/* Also remember that multiparts objects are not supported for now. */
2747		2572
2748	object *	2573	object *
2749	load_object_str (const char *obstr)	2574	load_object_str (const char *obstr)
2750	{	2575	{
2751	object *	2576	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2577	char filename[MAX_BUF];
2755		2578
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2579	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2580
2758	FILE *
2759	tempfile = fopen (filename, "w");	2581	FILE *tempfile = fopen (filename, "w");
2760		2582
2761	if (tempfile == NULL)	2583	if (tempfile == NULL)
2762	{	2584	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2585	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2586	return NULL;
2765	};	2587	}
		2588
2766	fprintf (tempfile, obstr);	2589	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2590	fclose (tempfile);
2768		2591
2769	op = get_object ();	2592	op = get_object ();
2770		2593
2771	object_thawer	2594	object_thawer thawer (filename);
2772	thawer (filename);
2773		2595
2774	if (thawer)	2596	if (thawer)
2775	load_object (thawer, op, 0);	2597	load_object (thawer, op, 0);
2776		2598
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2599	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2607	* returns NULL if no match.
2786	*/	2608	*/
2787	object *	2609	object *
2788	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)
2789	{	2611	{
2790	object *	2612	object *tmp;
2791	tmp;
2792		2613
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2614	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2615	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2616	return tmp;
2796		2617
…		…
2804	* do the desired thing.	2625	* do the desired thing.
2805	*/	2626	*/
2806	key_value *	2627	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2628	get_ob_key_link (const object *ob, const char *key)
2808	{	2629	{
2809	key_value *	2630	key_value *link;
2810	link;
2811		2631
2812	for (link = ob->key_values; link != NULL; link = link->next)	2632	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2633	if (link->key == key)
2815	{
2816	return link;	2634	return link;
2817	}
2818	}
2819		2635
2820	return NULL;	2636	return NULL;
2821	}	2637	}
2822		2638
2823	/*	2639	/*
…		…
2828	* The returned string is shared.	2644	* The returned string is shared.
2829	*/	2645	*/
2830	const char *	2646	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2647	get_ob_key_value (const object *op, const char *const key)
2832	{	2648	{
2833	key_value *	2649	key_value *link;
2834	link;	2650	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2651
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2652	if (!canonical_key)
2841	{	2653	{
2842	/* 1. There being a field named key on any object	2654	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2655	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2656	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2657	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2658	*/
2847	return NULL;	2659	return 0;
2848	}	2660	}
2849		2661
2850	/* This is copied from get_ob_key_link() above -	2662	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2663	* only 4 lines, and saves the function call overhead.
2852	*/	2664	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2665	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2666	if (link->key == canonical_key)
2856	{
2857	return link->value;	2667	return link->value;
2858	}	2668
2859	}
2860	return NULL;	2669	return 0;
2861	}	2670	}
2862		2671
2863		2672
2864	/*	2673	/*
2865	* Updates the canonical_key in op to value.	2674	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2710	if (last)
2902	last->next = field->next;	2711	last->next = field->next;
2903	else	2712	else
2904	op->key_values = field->next;	2713	op->key_values = field->next;
2905		2714
2906	delete
2907	field;	2715	delete field;
2908	}	2716	}
2909	}	2717	}
2910	return TRUE;	2718	return TRUE;
2911	}	2719	}
2912	/* IF we get here, key doesn't exist */	2720	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2755	* Returns TRUE on success.
2948	*/	2756	*/
2949	int	2757	int
2950	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)
2951	{	2759	{
2952	shstr
2953	key_ (key);	2760	shstr key_ (key);
2954		2761
2955	return set_ob_key_value_s (op, key_, value, add_key);	2762	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	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