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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.67 by root, Thu Dec 14 04:30:32 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 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	};
…		…
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	};
61		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	}
		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	{
66	key_value *wants_field;	136	key_value *wants_field;
…		…
113	*	183	*
114	* Note that this function appears a lot longer than the macro it	184	* Note that this function appears a lot longer than the macro it
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	185	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	186	* reduce this to the same efficiency.
117	*	187	*
118	* Check nrof variable *before* calling CAN_MERGE()	188	* Check nrof variable *before* calling can_merge()
119	*	189	*
120	* Improvements made with merge: Better checking on potion, and also	190	* Improvements made with merge: Better checking on potion, and also
121	* check weight	191	* check weight
122	*/	192	*/
123		193
124	bool object::can_merge (object *ob1, object *ob2)	194	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	195	{
126	/* A couple quicksanity checks */	196	/* A couple quicksanity checks */
127	if ((ob1 == ob2) || (ob1->type != ob2->type))	197	if (ob1 == ob2
		198	|| ob1->type != ob2->type
		199	|| ob1->speed != ob2->speed
		200	|| ob1->value != ob2->value
		201	|| ob1->name != ob2->name)
128	return 0;	202	return 0;
129		203
130	if (ob1->speed != ob2->speed)	204	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	205	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
134	* value could not be stored in a sint32 (which unfortunately sometimes is	206	* value could not be stored in a sint32 (which unfortunately sometimes is
135	* used to store nrof).	207	* used to store nrof).
136	*/	208	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	209	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
190	/* if one object has inventory but the other doesn't, not equiv */	262	/* if one object has inventory but the other doesn't, not equiv */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	263	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	264	return 0;
193		265
194	/* Now check to see if the two inventory objects could merge */	266	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	267	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	268	return 0;
197		269
198	/* inventory ok - still need to check rest of this object to see	270	/* inventory ok - still need to check rest of this object to see
199	* if it is valid.	271	* if it is valid.
200	*/	272	*/
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	286	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	287	return 0;
216		288
217	switch (ob1->type)	289	switch (ob1->type)
218	{	290	{
219	case SCROLL:	291	case SCROLL:
220	if (ob1->level != ob2->level)	292	if (ob1->level != ob2->level)
221	return 0;	293	return 0;
222	break;	294	break;
223	}	295	}
224		296
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	297	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	298	{
227	/* At least one of these has key_values. */	299	/* At least one of these has key_values. */
…		…
249	/*	321	/*
250	* sum_weight() is a recursive function which calculates the weight	322	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	323	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	324	* containers are carrying, and sums it up.
253	*/	325	*/
254	signed long	326	long
255	sum_weight (object *op)	327	sum_weight (object *op)
256	{	328	{
257	signed long sum;	329	long sum;
258	object *inv;	330	object *inv;
259		331
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	332	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	333	{
262	if (inv->inv)	334	if (inv->inv)
263	sum_weight (inv);	335	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	337	}
		338
266	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
268	if (op->carrying != sum)	342	if (op->carrying != sum)
269	op->carrying = sum;	343	op->carrying = sum;
		344
270	return sum;	345	return sum;
271	}	346	}
272		347
273	/**	348	/**
274	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	377	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	378	* The result of the dump is stored in the static global errmsg array.
304	*/	379	*/
305		380
306	void	381	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)	382	dump_object (object *op)
362	{	383	{
363	if (op == NULL)	384	if (!op)
364	{	385	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		386
372	void	387	object_freezer freezer;
373	dump_all_objects (void)	388	save_object (freezer, op, 3);
374	{	389	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	}	390	}
383		391
384	/*	392	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
…		…
406	*/	414	*/
407		415
408	object *	416	object *
409	find_object (tag_t i)	417	find_object (tag_t i)
410	{	418	{
411	object *op;	419	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	420	if (op->count == i)
415	break;	421	return op;
		422
416	return op;	423	return 0;
417	}	424	}
418		425
419	/*	426	/*
420	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	428	* Used only by the patch command, but not all that useful.
…		…
423	*/	430	*/
424		431
425	object *	432	object *
426	find_object_name (const char *str)	433	find_object_name (const char *str)
427	{	434	{
428	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
429	object *op;	436	object *op;
430		437
431	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	439	if (op->name == str_)
433	break;	440	break;
434		441
435	return op;	442	return op;
436	}	443	}
437		444
…		…
440	{	447	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	449	}
443		450
444	/*	451	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	453	* skill and experience objects.
485	*/	454	*/
486	void	455	void
487	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
488	{	457	{
489	if (owner == NULL || op == NULL)	458	if (!owner)
490	return;	459	return;
491		460
492	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	463	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	465	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	466	* didn't match, this check is valid and I believe that cause is valid.
498	*/	467	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
500	owner = owner->owner;	469	owner = owner->owner;
501		470
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	471	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* 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	}	472	}
542		473
543	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	475	* refcounts and freeing the links.
545	*/	476	*/
…		…
561	{	492	{
562	attachable_base::clear ();	493	attachable_base::clear ();
563		494
564	free_key_values (this);	495	free_key_values (this);
565		496
566	clear_owner (this);	497	owner = 0;
567
568	name = 0;	498	name = 0;
569	name_pl = 0;	499	name_pl = 0;
570	title = 0;	500	title = 0;
571	race = 0;	501	race = 0;
572	slaying = 0;	502	slaying = 0;
573	skill = 0;	503	skill = 0;
574	msg = 0;	504	msg = 0;
575	lore = 0;	505	lore = 0;
576	custom_name = 0;	506	custom_name = 0;
577	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
578		519
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		521
581	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
582	}
583		523
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	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 */	524	/* What is not cleared is next, prev, and count */
616		525
617	op->expmul = 1.0;	526	expmul = 1.0;
618	op->face = blank_face;	527	face = blank_face;
619	op->attacked_by_count = -1;
620		528
621	if (settings.casting_time)	529	if (settings.casting_time)
622	op->casting_time = -1;	530	casting_time = -1;
623	}	531	}
624		532
625	/*	533	/*
626	* copy object first frees everything allocated by the second object,	534	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	535	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	536	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	537	* 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	538	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	539	* will point at garbage.
632	*/	540	*/
633
634	void	541	void
635	copy_object (object *op2, object *op)	542	object::copy_to (object *dst)
636	{	543	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	544	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	545	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		546
640	op2->clone (op);	547	*(object_copy *)dst = *this;
		548	*(object_pod *)dst = *this;
		549
		550	if (self || cb)
		551	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
641		552
642	if (is_freed)	553	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	554	SET_FLAG (dst, FLAG_FREED);
		555
644	if (is_removed)	556	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	557	SET_FLAG (dst, FLAG_REMOVED);
646		558
647	if (op2->speed < 0)	559	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	560	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		561
650	/* Copy over key_values, if any. */	562	/* Copy over key_values, if any. */
651	if (op2->key_values)	563	if (key_values)
652	{	564	{
653	key_value *tail = 0;	565	key_value *tail = 0;
654	key_value *i;	566	key_value *i;
655		567
656	op->key_values = 0;	568	dst->key_values = 0;
657		569
658	for (i = op2->key_values; i; i = i->next)	570	for (i = key_values; i; i = i->next)
659	{	571	{
660	key_value *new_link = new key_value;	572	key_value *new_link = new key_value;
661		573
662	new_link->next = 0;	574	new_link->next = 0;
663	new_link->key = i->key;	575	new_link->key = i->key;
664	new_link->value = i->value;	576	new_link->value = i->value;
665		577
666	/* Try and be clever here, too. */	578	/* Try and be clever here, too. */
667	if (!op->key_values)	579	if (!dst->key_values)
668	{	580	{
669	op->key_values = new_link;	581	dst->key_values = new_link;
670	tail = new_link;	582	tail = new_link;
671	}	583	}
672	else	584	else
673	{	585	{
674	tail->next = new_link;	586	tail->next = new_link;
675	tail = new_link;	587	tail = new_link;
676	}	588	}
677	}	589	}
678	}	590	}
679		591
680	update_ob_speed (op);	592	update_ob_speed (dst);
		593	}
		594
		595	object *
		596	object::clone ()
		597	{
		598	object *neu = create ();
		599	copy_to (neu);
		600	return neu;
681	}	601	}
682		602
683	/*	603	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	604	* If an object with the IS_TURNABLE() flag needs to be turned due
685	* to the closest player being on the other side, this function can	605	* to the closest player being on the other side, this function can
…		…
698	/*	618	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	619	* 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.	620	* 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.	621	* This function needs to be called whenever the speed of an object changes.
702	*/	622	*/
703
704	void	623	void
705	update_ob_speed (object *op)	624	update_ob_speed (object *op)
706	{	625	{
707	extern int arch_init;	626	extern int arch_init;
708		627
…		…
717	abort ();	636	abort ();
718	#else	637	#else
719	op->speed = 0;	638	op->speed = 0;
720	#endif	639	#endif
721	}	640	}
		641
722	if (arch_init)	642	if (arch_init)
723	{
724	return;	643	return;
725	}	644
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	645	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	646	{
728	/* If already on active list, don't do anything */	647	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	648	if (op->active_next || op->active_prev || op == active_objects)
730	return;	649	return;
731		650
732	/* process_events() expects us to insert the object at the beginning	651	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	652	* of the list. */
734	op->active_next = active_objects;	653	op->active_next = active_objects;
		654
735	if (op->active_next != NULL)	655	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	656	op->active_next->active_prev = op;
		657
737	active_objects = op;	658	active_objects = op;
738	}	659	}
739	else	660	else
740	{	661	{
741	/* If not on the active list, nothing needs to be done */	662	/* If not on the active list, nothing needs to be done */
…		…
743	return;	664	return;
744		665
745	if (op->active_prev == NULL)	666	if (op->active_prev == NULL)
746	{	667	{
747	active_objects = op->active_next;	668	active_objects = op->active_next;
		669
748	if (op->active_next != NULL)	670	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	671	op->active_next->active_prev = NULL;
750	}	672	}
751	else	673	else
752	{	674	{
753	op->active_prev->active_next = op->active_next;	675	op->active_prev->active_next = op->active_next;
		676
754	if (op->active_next)	677	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	678	op->active_next->active_prev = op->active_prev;
756	}	679	}
		680
757	op->active_next = NULL;	681	op->active_next = NULL;
758	op->active_prev = NULL;	682	op->active_prev = NULL;
759	}	683	}
760	}	684	}
761		685
…		…
886	update_now = 1;	810	update_now = 1;
887		811
888	if ((move_slow | op->move_slow) != move_slow)	812	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	813	update_now = 1;
890	}	814	}
		815
891	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	818	* that is being removed.
894	*/	819	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	821	update_now = 1;
897	else if (action == UP_OBJ_FACE)	822	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	823	/* Nothing to do for that case */ ;
899	else	824	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	825	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		826
902	if (update_now)	827	if (update_now)
903	{	828	{
…		…
907		832
908	if (op->more != NULL)	833	if (op->more != NULL)
909	update_object (op->more, action);	834	update_object (op->more, action);
910	}	835	}
911		836
912	static unordered_vector<object *> mortals;	837	object::vector object::mortals;
913	static std::vector<object *> freed;	838	object::vector object::objects; // not yet used
		839	object *object::first;
914		840
915	void object::free_mortals ()	841	void object::free_mortals ()
916	{	842	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	843	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	844	if ((*i)->refcnt)
		845	++i; // further delay freeing
		846	else
919	{	847	{
920	freed.push_back (*i);	848	delete *i;
921	mortals.erase (i);	849	mortals.erase (i);
922	}	850	}
923	else
924	++i;
925	}	851	}
926		852
927	object::object ()	853	object::object ()
928	{	854	{
929	SET_FLAG (this, FLAG_REMOVED);	855	SET_FLAG (this, FLAG_REMOVED);
930		856
931	expmul = 1.0;	857	expmul = 1.0;
932	face = blank_face;	858	face = blank_face;
933	attacked_by_count = -1;
934	}	859	}
935		860
936	object::~object ()	861	object::~object ()
937	{	862	{
938	free_key_values (this);	863	free_key_values (this);
939	}	864	}
940		865
941	void object::link ()	866	void object::link ()
942	{	867	{
943	count = ++ob_count;	868	count = ++ob_count;
		869	uuid = gen_uuid ();
944		870
945	prev = 0;	871	prev = 0;
946	next = objects;	872	next = object::first;
947		873
948	if (objects)	874	if (object::first)
949	objects->prev = this;	875	object::first->prev = this;
950		876
951	objects = this;	877	object::first = this;
952	}	878	}
953		879
954	void object::unlink ()	880	void object::unlink ()
955	{	881	{
956	count = 0;	882	if (this == object::first)
		883	object::first = next;
957		884
958	/* Remove this object from the list of used objects */	885	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	886	if (prev) prev->next = next;
		887	if (next) next->prev = prev;
		888
962	prev = 0;	889	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	890	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	891	}
974		892
975	object *object::create ()	893	object *object::create ()
976	{	894	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	895	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	896	op->link ();
990	return op;	897	return op;
991	}	898	}
992		899
993	/*	900	/*
…		…
995	* it from the list of used objects, and puts it on the list of	902	* it from the list of used objects, and puts it on the list of
996	* free objects. The IS_FREED() flag is set in the object.	903	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	904	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	905	* this function to succeed.
999	*	906	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	907	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	908	* inventory to the ground.
1002	*/	909	*/
1003	void object::free (bool free_inventory)	910	void object::destroy (bool destroy_inventory)
1004	{	911	{
		912	if (QUERY_FLAG (this, FLAG_FREED))
		913	return;
		914
		915	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		916	remove_friendly_object (this);
		917
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	918	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	919	remove ();
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		920
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);
1018	}
1019
1020	if (QUERY_FLAG (this, FLAG_FREED))	921	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		922
1027	if (more)	923	if (more)
1028	{	924	{
1029	more->free (free_inventory);	925	more->destroy (destroy_inventory);
1030	more = 0;	926	more = 0;
1031	}	927	}
1032		928
1033	if (inv)	929	if (inv)
1034	{	930	{
1035	/* Only if the space blocks everything do we not process -	931	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	932	* if some form of movement is allowed, let objects
1037	* drop on that space.	933	* drop on that space.
1038	*/	934	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	935	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	936	{
1041	object *	937	object *op = inv;
1042	op = inv;
1043		938
1044	while (op)	939	while (op)
1045	{	940	{
1046	object *
1047	tmp = op->below;	941	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	942	op->destroy (destroy_inventory);
1051	op = tmp;	943	op = tmp;
1052	}	944	}
1053	}	945	}
1054	else	946	else
1055	{ /* Put objects in inventory onto this space */	947	{ /* Put objects in inventory onto this space */
1056	object *	948	object *op = inv;
1057	op = inv;
1058		949
1059	while (op)	950	while (op)
1060	{	951	{
1061	object *
1062	tmp = op->below;	952	object *tmp = op->below;
1063		953
1064	remove_ob (op);	954	op->remove ();
1065		955
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	956	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	957	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1068	free_object (op);	958	op->destroy ();
1069	else	959	else
1070	{	960	{
1071	op->x = x;	961	op->x = x;
1072	op->y = y;	962	op->y = y;
1073	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	963	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1076	op = tmp;	966	op = tmp;
1077	}	967	}
1078	}	968	}
1079	}	969	}
1080		970
1081	clear_owner (this);	971	// hack to ensure that freed objects still have a valid map
		972	{
		973	static maptile *freed_map; // freed objects are moved here to avoid crashes
		974
		975	if (!freed_map)
		976	{
		977	freed_map = new maptile;
		978
		979	freed_map->name = "/internal/freed_objects_map";
		980	freed_map->width = 3;
		981	freed_map->height = 3;
		982
		983	freed_map->allocate ();
		984	}
		985
		986	map = freed_map;
		987	x = 1;
		988	y = 1;
		989	}
		990
		991	// clear those pointers that likely might have circular references to us
		992	owner = 0;
		993	enemy = 0;
		994	attacked_by = 0;
		995
		996	// only relevant for players(?), but make sure of it anyways
		997	contr = 0;
1082		998
1083	/* Remove object from the active list */	999	/* Remove object from the active list */
1084	speed = 0;	1000	speed = 0;
1085	update_ob_speed (this);	1001	update_ob_speed (this);
1086		1002
1087	unlink ();	1003	unlink ();
1088		1004
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1005	mortals.push_back (this);
1092	}	1006	}
1093		1007
1094	/*	1008	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1009	* sub_weight() recursively (outwards) subtracts a number from the
1096	* weight of an object (and what is carried by it's environment(s)).	1010	* weight of an object (and what is carried by it's environment(s)).
1097	*/	1011	*/
1098
1099	void	1012	void
1100	sub_weight (object *op, signed long weight)	1013	sub_weight (object *op, signed long weight)
1101	{	1014	{
1102	while (op != NULL)	1015	while (op != NULL)
1103	{	1016	{
1104	if (op->type == CONTAINER)	1017	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1019
1108	op->carrying -= weight;	1020	op->carrying -= weight;
1109	op = op->env;	1021	op = op->env;
1110	}	1022	}
1111	}	1023	}
1112		1024
1113	/* remove_ob(op):	1025	/* op->remove ():
1114	* This function removes the object op from the linked list of objects	1026	* This function removes the object op from the linked list of objects
1115	* which it is currently tied to. When this function is done, the	1027	* which it is currently tied to. When this function is done, the
1116	* object will have no environment. If the object previously had an	1028	* object will have no environment. If the object previously had an
1117	* environment, the x and y coordinates will be updated to	1029	* environment, the x and y coordinates will be updated to
1118	* the previous environment.	1030	* the previous environment.
1119	* Beware: This function is called from the editor as well!	1031	* Beware: This function is called from the editor as well!
1120	*/	1032	*/
1121
1122	void	1033	void
1123	remove_ob (object *op)	1034	object::remove ()
1124	{	1035	{
1125	object *tmp, *last = NULL;	1036	object *tmp, *last = 0;
1126	object *otmp;	1037	object *otmp;
1127		1038
1128	tag_t tag;
1129	int check_walk_off;	1039	int check_walk_off;
1130	mapstruct *m;
1131		1040
1132	sint16 x, y;
1133
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1041	if (QUERY_FLAG (this, FLAG_REMOVED))
1135	{	1042	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1043
1139	/* Changed it to always dump core in this case. As has been learned
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151
1152	if (op->more != NULL)
1153	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);	1044	SET_FLAG (this, FLAG_REMOVED);
		1045
		1046	if (more)
		1047	more->remove ();
1156		1048
1157	/*	1049	/*
1158	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1159	* inventory.	1051	* inventory.
1160	*/	1052	*/
1161	if (op->env != NULL)	1053	if (env)
1162	{	1054	{
1163	if (op->nrof)	1055	if (nrof)
1164	sub_weight (op->env, op->weight * op->nrof);	1056	sub_weight (env, weight * nrof);
1165	else	1057	else
1166	sub_weight (op->env, op->weight + op->carrying);	1058	sub_weight (env, weight + carrying);
1167		1059
1168	/* NO_FIX_PLAYER is set when a great many changes are being	1060	/* NO_FIX_PLAYER is set when a great many changes are being
1169	* made to players inventory. If set, avoiding the call	1061	* made to players inventory. If set, avoiding the call
1170	* to save cpu time.	1062	* to save cpu time.
1171	*/	1063	*/
1172	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1064	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1173	fix_player (otmp);	1065	fix_player (otmp);
1174		1066
1175	if (op->above != NULL)	1067	if (above != NULL)
1176	op->above->below = op->below;	1068	above->below = below;
1177	else	1069	else
1178	op->env->inv = op->below;	1070	env->inv = below;
1179		1071
1180	if (op->below != NULL)	1072	if (below != NULL)
1181	op->below->above = op->above;	1073	below->above = above;
1182		1074
1183	/* we set up values so that it could be inserted into	1075	/* we set up values so that it could be inserted into
1184	* the map, but we don't actually do that - it is up	1076	* the map, but we don't actually do that - it is up
1185	* to the caller to decide what we want to do.	1077	* to the caller to decide what we want to do.
1186	*/	1078	*/
1187	op->x = op->env->x, op->y = op->env->y;	1079	x = env->x, y = env->y;
1188	op->map = op->env->map;	1080	map = env->map;
1189	op->above = NULL, op->below = NULL;	1081	above = 0, below = 0;
1190	op->env = NULL;	1082	env = 0;
1191	return;
1192	}
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;
1199	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);
1201
1202	if (!m)
1203	{	1083	}
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1084	else if (map)
1205	op->map->path, op->x, op->y);	1085	{
1206	/* in old days, we used to set x and y to 0 and continue.	1086	/* Re did the following section of code - it looks like it had
1207	* it seems if we get into this case, something is probablye	1087	* lots of logic for things we no longer care about
1208	* screwed up and should be fixed.
1209	*/	1088	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1089
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1090	/* link the object above us */
1223	if (op->above)	1091	if (above)
1224	op->above->below = op->below;	1092	above->below = below;
1225	else	1093	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1094	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1227		1095
1228	/* Relink the object below us, if there is one */	1096	/* Relink the object below us, if there is one */
1229	if (op->below)	1097	if (below)
1230	op->below->above = op->above;	1098	below->above = above;
1231	else	1099	else
1232	{	1100	{
1233	/* Nothing below, which means we need to relink map object for this space	1101	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1102	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1103	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	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",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1104	*/
1270	if (tmp->container == op)	1105	if (GET_MAP_OB (map, x, y) != this)
1271	{	1106	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1107	char *dump = dump_object (this);
1273	tmp->container = NULL;	1108	LOG (llevError,
		1109	"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);
		1110	free (dump);
		1111	dump = dump_object (GET_MAP_OB (map, x, y));
		1112	LOG (llevError, "%s\n", dump);
		1113	free (dump);
1274	}	1114	}
1275		1115
1276	tmp->contr->socket.update_look = 1;	1116	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1117	}
1281	move_apply (tmp, op, NULL);
1282		1118
1283	if (was_destroyed (op, tag))	1119	above = 0;
		1120	below = 0;
		1121
		1122	if (map->in_memory == MAP_SAVING)
		1123	return;
		1124
		1125	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1126
		1127	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1128	{
		1129	/* No point updating the players look faces if he is the object
		1130	* being removed.
		1131	*/
		1132
		1133	if (tmp->type == PLAYER && tmp != this)
1284	{	1134	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1135	/* If a container that the player is currently using somehow gets
		1136	* removed (most likely destroyed), update the player view
		1137	* appropriately.
		1138	*/
		1139	if (tmp->container == this)
		1140	{
		1141	CLEAR_FLAG (this, FLAG_APPLIED);
		1142	tmp->container = 0;
		1143	}
		1144
		1145	tmp->contr->socket->update_look = 1;
1286	}	1146	}
		1147
		1148	/* See if player moving off should effect something */
		1149	if (check_walk_off
		1150	&& ((move_type & tmp->move_off)
		1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1152	{
		1153	move_apply (tmp, this, 0);
		1154
		1155	if (destroyed ())
		1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1157	}
1288		1158
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1159	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1160
1291	if (tmp->above == tmp)	1161	if (tmp->above == tmp)
1292	tmp->above = NULL;	1162	tmp->above = 0;
1293		1163
1294	last = tmp;	1164	last = tmp;
1295	}	1165	}
1296		1166
1297	/* last == NULL of there are no objects on this space */	1167	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1168	if (!last)
1299	{	1169	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1170	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1171	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1172	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1173	* be correct anyways.
1304	*/	1174	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1175	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1176	update_position (map, x, y);
1307	}	1177	}
1308	else	1178	else
1309	update_object (last, UP_OBJ_REMOVE);	1179	update_object (last, UP_OBJ_REMOVE);
1310		1180
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1181	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1312	update_all_los (op->map, op->x, op->y);	1182	update_all_los (map, x, y);
		1183	}
1313	}	1184	}
1314		1185
1315	/*	1186	/*
1316	* merge_ob(op,top):	1187	* merge_ob(op,top):
1317	*	1188	*
1318	* This function goes through all objects below and including top, and	1189	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1190	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1191	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1192	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1193	*/
1323
1324	object *	1194	object *
1325	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1326	{	1196	{
1327	if (!op->nrof)	1197	if (!op->nrof)
1328	return 0;	1198	return 0;
		1199
1329	if (top == NULL)	1200	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1201	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1202
1331	for (; top != NULL; top = top->below)	1203	for (; top != NULL; top = top->below)
1332	{	1204	{
1333	if (top == op)	1205	if (top == op)
1334	continue;	1206	continue;
1335	if (CAN_MERGE (op, top))	1207
		1208	if (object::can_merge (op, top))
1336	{	1209	{
1337	top->nrof += op->nrof;	1210	top->nrof += op->nrof;
1338		1211
1339	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1212	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1340	op->weight = 0; /* Don't want any adjustements now */	1213	op->weight = 0; /* Don't want any adjustements now */
1341	remove_ob (op);	1214	op->destroy ();
1342	free_object (op);
1343	return top;	1215	return top;
1344	}	1216	}
1345	}	1217	}
		1218
1346	return NULL;	1219	return 0;
1347	}	1220	}
1348		1221
1349	/*	1222	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1223	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1224	* job preparing multi-part monsters
1352	*/	1225	*/
1353	object *	1226	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1227	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1228	{
1356	object *	1229	object *tmp;
1357	tmp;
1358		1230
1359	if (op->head)	1231	if (op->head)
1360	op = op->head;	1232	op = op->head;
		1233
1361	for (tmp = op; tmp; tmp = tmp->more)	1234	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1235	{
1363	tmp->x = x + tmp->arch->clone.x;	1236	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1237	tmp->y = y + tmp->arch->clone.y;
1365	}	1238	}
		1239
1366	return insert_ob_in_map (op, m, originator, flag);	1240	return insert_ob_in_map (op, m, originator, flag);
1367	}	1241	}
1368		1242
1369	/*	1243	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1244	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1260	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1261	* just 'op' otherwise
1388	*/	1262	*/
1389		1263
1390	object *	1264	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1265	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1266	{
1393	object *tmp, *top, *floor = NULL;	1267	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1268	sint16 x, y;
1395		1269
1396	if (QUERY_FLAG (op, FLAG_FREED))	1270	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1273	return NULL;
1400	}	1274	}
1401		1275
1402	if (m == NULL)	1276	if (m == NULL)
1403	{	1277	{
1404	dump_object (op);	1278	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1279	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1280	free (dump);
1406	return op;	1281	return op;
1407	}	1282	}
1408		1283
1409	if (out_of_map (m, op->x, op->y))	1284	if (out_of_map (m, op->x, op->y))
1410	{	1285	{
1411	dump_object (op);	1286	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1287	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1288	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1289	/* Better to catch this here, as otherwise the next use of this object
1415	* is likely to cause a crash. Better to find out where it is getting	1290	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1291	* improperly inserted.
1417	*/	1292	*/
1418	abort ();	1293	abort ();
1419	#endif	1294	#endif
		1295	free (dump);
1420	return op;	1296	return op;
1421	}	1297	}
1422		1298
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1299	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1300	{
1425	dump_object (op);	1301	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1302	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1303	free (dump);
1427	return op;	1304	return op;
1428	}	1305	}
1429		1306
1430	if (op->more != NULL)	1307	if (op->more != NULL)
1431	{	1308	{
…		…
1469		1346
1470	/* this has to be done after we translate the coordinates.	1347	/* this has to be done after we translate the coordinates.
1471	*/	1348	*/
1472	if (op->nrof && !(flag & INS_NO_MERGE))	1349	if (op->nrof && !(flag & INS_NO_MERGE))
1473	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1350	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1474	if (CAN_MERGE (op, tmp))	1351	if (object::can_merge (op, tmp))
1475	{	1352	{
1476	op->nrof += tmp->nrof;	1353	op->nrof += tmp->nrof;
1477	remove_ob (tmp);	1354	tmp->destroy ();
1478	free_object (tmp);
1479	}	1355	}
1480		1356
1481	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1357	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1482	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1358	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1483		1359
…		…
1611	* it, so save a few ticks and start from there.	1487	* it, so save a few ticks and start from there.
1612	*/	1488	*/
1613	if (!(flag & INS_MAP_LOAD))	1489	if (!(flag & INS_MAP_LOAD))
1614	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1490	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1615	if (tmp->type == PLAYER)	1491	if (tmp->type == PLAYER)
1616	tmp->contr->socket.update_look = 1;	1492	tmp->contr->socket->update_look = 1;
1617		1493
1618	/* If this object glows, it may affect lighting conditions that are	1494	/* If this object glows, it may affect lighting conditions that are
1619	* visible to others on this map. But update_all_los is really	1495	* visible to others on this map. But update_all_los is really
1620	* an inefficient way to do this, as it means los for all players	1496	* an inefficient way to do this, as it means los for all players
1621	* on the map will get recalculated. The players could very well	1497	* on the map will get recalculated. The players could very well
…		…
1661	* op is the object to insert it under: supplies x and the map.	1537	* op is the object to insert it under: supplies x and the map.
1662	*/	1538	*/
1663	void	1539	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1540	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1541	{
1666	object *tmp;	1542	object *
		1543	tmp;
1667	object *tmp1;	1544	object *
		1545	tmp1;
1668		1546
1669	/* first search for itself and remove any old instances */	1547	/* first search for itself and remove any old instances */
1670		1548
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1549	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{
1673	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1550	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1674	{	1551	tmp->destroy ();
1675	remove_ob (tmp);
1676	free_object (tmp);
1677	}
1678	}
1679		1552
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1553	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1554
1682	tmp1->x = op->x;	1555	tmp1->x = op->x;
1683	tmp1->y = op->y;	1556	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1557	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1558	}
…		…
1693	*/	1566	*/
1694		1567
1695	object *	1568	object *
1696	get_split_ob (object *orig_ob, uint32 nr)	1569	get_split_ob (object *orig_ob, uint32 nr)
1697	{	1570	{
1698	object *	1571	object *newob;
1699	newob;
1700	int
1701	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1572	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1702		1573
1703	if (orig_ob->nrof < nr)	1574	if (orig_ob->nrof < nr)
1704	{	1575	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1576	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1577	return NULL;
1707	}	1578	}
		1579
1708	newob = object_create_clone (orig_ob);	1580	newob = object_create_clone (orig_ob);
		1581
1709	if ((orig_ob->nrof -= nr) < 1)	1582	if ((orig_ob->nrof -= nr) < 1)
1710	{	1583	orig_ob->destroy (1);
1711	if (!is_removed)
1712	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);
1714	}
1715	else if (!is_removed)	1584	else if (!is_removed)
1716	{	1585	{
1717	if (orig_ob->env != NULL)	1586	if (orig_ob->env != NULL)
1718	sub_weight (orig_ob->env, orig_ob->weight * nr);	1587	sub_weight (orig_ob->env, orig_ob->weight * nr);
1719	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1588	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1590	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1591	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1592	return NULL;
1724	}	1593	}
1725	}	1594	}
		1595
1726	newob->nrof = nr;	1596	newob->nrof = nr;
1727		1597
1728	return newob;	1598	return newob;
1729	}	1599	}
1730		1600
…		…
1737	*/	1607	*/
1738		1608
1739	object *	1609	object *
1740	decrease_ob_nr (object *op, uint32 i)	1610	decrease_ob_nr (object *op, uint32 i)
1741	{	1611	{
1742	object *	1612	object *tmp;
1743	tmp;
1744	player *	1613	player *pl;
1745	pl;
1746		1614
1747	if (i == 0) /* objects with op->nrof require this check */	1615	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1616	return op;
1749		1617
1750	if (i > op->nrof)	1618	if (i > op->nrof)
1751	i = op->nrof;	1619	i = op->nrof;
1752		1620
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1621	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1622	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1623	else if (op->env != NULL)
1758	{	1624	{
1759	/* is this object in the players inventory, or sub container	1625	/* is this object in the players inventory, or sub container
1760	* therein?	1626	* therein?
1761	*/	1627	*/
…		…
1786	esrv_send_item (tmp, op);	1652	esrv_send_item (tmp, op);
1787	}	1653	}
1788	}	1654	}
1789	else	1655	else
1790	{	1656	{
1791	remove_ob (op);	1657	op->remove ();
1792	op->nrof = 0;	1658	op->nrof = 0;
1793	if (tmp)	1659	if (tmp)
1794	{	1660	{
1795	esrv_del_item (tmp->contr, op->count);	1661	esrv_del_item (tmp->contr, op->count);
1796	}	1662	}
1797	}	1663	}
1798	}	1664	}
1799	else	1665	else
1800	{	1666	{
1801	object *
1802	above = op->above;	1667	object *above = op->above;
1803		1668
1804	if (i < op->nrof)	1669	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1670	op->nrof -= i;
1807	}
1808	else	1671	else
1809	{	1672	{
1810	remove_ob (op);	1673	op->remove ();
1811	op->nrof = 0;	1674	op->nrof = 0;
1812	}	1675	}
		1676
1813	/* Since we just removed op, op->above is null */	1677	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1678	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1679	if (tmp->type == PLAYER)
1816	{	1680	{
1817	if (op->nrof)	1681	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1684	esrv_del_item (tmp->contr, op->count);
1821	}	1685	}
1822	}	1686	}
1823		1687
1824	if (op->nrof)	1688	if (op->nrof)
1825	{
1826	return op;	1689	return op;
1827	}
1828	else	1690	else
1829	{	1691	{
1830	free_object (op);	1692	op->destroy ();
1831	return NULL;	1693	return NULL;
1832	}	1694	}
1833	}	1695	}
1834		1696
1835	/*	1697	/*
…		…
1841	add_weight (object *op, signed long weight)	1703	add_weight (object *op, signed long weight)
1842	{	1704	{
1843	while (op != NULL)	1705	while (op != NULL)
1844	{	1706	{
1845	if (op->type == CONTAINER)	1707	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1708	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1709
1849	op->carrying += weight;	1710	op->carrying += weight;
1850	op = op->env;	1711	op = op->env;
1851	}	1712	}
1852	}	1713	}
1853		1714
		1715	object *
		1716	insert_ob_in_ob (object *op, object *where)
		1717	{
		1718	if (!where)
		1719	{
		1720	char *dump = dump_object (op);
		1721	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1722	free (dump);
		1723	return op;
		1724	}
		1725
		1726	if (where->head)
		1727	{
		1728	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1729	where = where->head;
		1730	}
		1731
		1732	return where->insert (op);
		1733	}
		1734
1854	/*	1735	/*
1855	* insert_ob_in_ob(op,environment):	1736	* env->insert (op)
1856	* This function inserts the object op in the linked list	1737	* This function inserts the object op in the linked list
1857	* inside the object environment.	1738	* inside the object environment.
1858	*	1739	*
1859	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1860	* the inventory at the last position or next to other objects of the same
1861	* type.
1862	* Frank: Now sorted by type, archetype and magic!
1863	*
1864	* The function returns now pointer to inserted item, and return value can	1740	* The function returns now pointer to inserted item, and return value can
1865	* be != op, if items are merged. -Tero	1741	* be != op, if items are merged. -Tero
1866	*/	1742	*/
1867		1743
1868	object *	1744	object *
1869	insert_ob_in_ob (object *op, object *where)	1745	object::insert (object *op)
1870	{	1746	{
1871	object *	1747	object *tmp, *otmp;
1872	tmp, *
1873	otmp;
1874		1748
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1749	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1750	op->remove ();
1877	dump_object (op);	1751
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;
1880	}
1881	if (where == NULL)
1882	{
1883	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where->head)
1888	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;
1891	}
1892	if (op->more)	1752	if (op->more)
1893	{	1753	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1754	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1755	return op;
1896	}	1756	}
		1757
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1758	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1759	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1760	if (op->nrof)
1900	{	1761	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1762	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1902	if (CAN_MERGE (tmp, op))	1763	if (object::can_merge (tmp, op))
1903	{	1764	{
1904	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1905	(client needs the original object) */	1766	(client needs the original object) */
1906	tmp->nrof += op->nrof;	1767	tmp->nrof += op->nrof;
1907	/* Weight handling gets pretty funky. Since we are adding to	1768	/* Weight handling gets pretty funky. Since we are adding to
1908	* tmp->nrof, we need to increase the weight.	1769	* tmp->nrof, we need to increase the weight.
1909	*/	1770	*/
1910	add_weight (where, op->weight * op->nrof);	1771	add_weight (this, op->weight * op->nrof);
1911	SET_FLAG (op, FLAG_REMOVED);	1772	SET_FLAG (op, FLAG_REMOVED);
1912	free_object (op); /* free the inserted object */	1773	op->destroy (); /* free the inserted object */
1913	op = tmp;	1774	op = tmp;
1914	remove_ob (op); /* and fix old object's links */	1775	op->remove (); /* and fix old object's links */
1915	CLEAR_FLAG (op, FLAG_REMOVED);	1776	CLEAR_FLAG (op, FLAG_REMOVED);
1916	break;	1777	break;
1917	}	1778	}
1918		1779
1919	/* I assume combined objects have no inventory	1780	/* I assume combined objects have no inventory
1920	* We add the weight - this object could have just been removed	1781	* We add the weight - this object could have just been removed
1921	* (if it was possible to merge). calling remove_ob will subtract	1782	* (if it was possible to merge). calling remove_ob will subtract
1922	* the weight, so we need to add it in again, since we actually do	1783	* the weight, so we need to add it in again, since we actually do
1923	* the linking below	1784	* the linking below
1924	*/	1785	*/
1925	add_weight (where, op->weight * op->nrof);	1786	add_weight (this, op->weight * op->nrof);
1926	}	1787	}
1927	else	1788	else
1928	add_weight (where, (op->weight + op->carrying));	1789	add_weight (this, (op->weight + op->carrying));
1929		1790
1930	otmp = is_player_inv (where);	1791	otmp = is_player_inv (this);
1931	if (otmp && otmp->contr != NULL)	1792	if (otmp && otmp->contr)
1932	{
1933	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1793	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1934	fix_player (otmp);	1794	fix_player (otmp);
1935	}
1936		1795
1937	op->map = NULL;	1796	op->map = NULL;
1938	op->env = where;	1797	op->env = this;
1939	op->above = NULL;	1798	op->above = NULL;
1940	op->below = NULL;	1799	op->below = NULL;
1941	op->x = 0, op->y = 0;	1800	op->x = 0, op->y = 0;
1942		1801
1943	/* reset the light list and los of the players on the map */	1802	/* reset the light list and los of the players on the map */
1944	if ((op->glow_radius != 0) && where->map)	1803	if ((op->glow_radius != 0) && map)
1945	{	1804	{
1946	#ifdef DEBUG_LIGHTS	1805	#ifdef DEBUG_LIGHTS
1947	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1806	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1948	#endif /* DEBUG_LIGHTS */	1807	#endif /* DEBUG_LIGHTS */
1949	if (MAP_DARKNESS (where->map))	1808	if (MAP_DARKNESS (map))
1950	update_all_los (where->map, where->x, where->y);	1809	update_all_los (map, x, y);
1951	}	1810	}
1952		1811
1953	/* Client has no idea of ordering so lets not bother ordering it here.	1812	/* Client has no idea of ordering so lets not bother ordering it here.
1954	* It sure simplifies this function...	1813	* It sure simplifies this function...
1955	*/	1814	*/
1956	if (where->inv == NULL)	1815	if (!inv)
1957	where->inv = op;	1816	inv = op;
1958	else	1817	else
1959	{	1818	{
1960	op->below = where->inv;	1819	op->below = inv;
1961	op->below->above = op;	1820	op->below->above = op;
1962	where->inv = op;	1821	inv = op;
1963	}	1822	}
		1823
1964	return op;	1824	return op;
1965	}	1825	}
1966		1826
1967	/*	1827	/*
1968	* Checks if any objects has a move_type that matches objects	1828	* Checks if any objects has a move_type that matches objects
…		…
1987		1847
1988	int	1848	int
1989	check_move_on (object *op, object *originator)	1849	check_move_on (object *op, object *originator)
1990	{	1850	{
1991	object *tmp;	1851	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1852	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1853	int x = op->x, y = op->y;
1995		1854
1996	MoveType move_on, move_slow, move_block;	1855	MoveType move_on, move_slow, move_block;
1997		1856
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1857	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1858	return 0;
2000
2001	tag = op->count;
2002		1859
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1860	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2004	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1861	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2005	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1862	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1863
…		…
2049	{	1906	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1909	{
2053		1910
		1911	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1912	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1913
2056	if (op->type == PLAYER)	1914	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1915	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1916	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1917	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1924	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2067	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1925	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1926	{
2069	move_apply (tmp, op, originator);	1927	move_apply (tmp, op, originator);
2070		1928
2071	if (was_destroyed (op, tag))	1929	if (op->destroyed ())
2072	return 1;	1930	return 1;
2073		1931
2074	/* what the person/creature stepped onto has moved the object	1932	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1933	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1934	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1946	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1947	* The first matching object is returned, or NULL if none.
2090	*/	1948	*/
2091		1949
2092	object *	1950	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1951	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1952	{
2095	object *	1953	object *
2096	tmp;	1954	tmp;
2097		1955
2098	if (m == NULL || out_of_map (m, x, y))	1956	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	1969	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	1970	* The first matching object is returned, or NULL if none.
2113	*/	1971	*/
2114		1972
2115	object *	1973	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	1974	present (unsigned char type, maptile *m, int x, int y)
2117	{	1975	{
2118	object *	1976	object *
2119	tmp;	1977	tmp;
2120		1978
2121	if (out_of_map (m, x, y))	1979	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2119	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2120	* customized, changed states, etc.
2263	*/	2121	*/
2264		2122
2265	int	2123	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2124	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2125	{
2268	int	2126	int
2269	i,	2127	i,
2270	index = 0, flag;	2128	index = 0, flag;
2271	static int	2129	static int
…		…
2292	return -1;	2150	return -1;
2293	return altern[RANDOM () % index];	2151	return altern[RANDOM () % index];
2294	}	2152	}
2295		2153
2296	/*	2154	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2155	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2156	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2157	* But it will return the first available spot, not a random choice.
2300	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2158	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2159	*/
2302		2160
2303	int	2161	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2162	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2163	{
2306	int	2164	int
2307	i;	2165	i;
2308		2166
2309	for (i = 0; i < SIZEOFFREE; i++)	2167	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2231	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2232	* there is capable of.
2375	*/	2233	*/
2376		2234
2377	int	2235	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2236	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2237	{
2380	int	2238	int
2381	i,	2239	i,
2382	max = SIZEOFFREE, mflags;	2240	max = SIZEOFFREE, mflags;
2383	sint16	2241
2384	nx,	2242	sint16 nx, ny;
2385	ny;
2386	object *	2243	object *
2387	tmp;	2244	tmp;
2388	mapstruct *	2245	maptile *
2389	mp;	2246	mp;
2390	MoveType	2247
2391	blocked,	2248	MoveType blocked, move_type;
2392	move_type;
2393		2249
2394	if (exclude && exclude->head)	2250	if (exclude && exclude->head)
2395	{	2251	{
2396	exclude = exclude->head;	2252	exclude = exclude->head;
2397	move_type = exclude->move_type;	2253	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2458	* Modified to be map tile aware -.MSW
2603	*/	2459	*/
2604		2460
2605		2461
2606	int	2462	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2463	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2464	{
2609	sint16	2465	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2466	int
2613	mflags;	2467	mflags;
2614		2468
2615	if (dir < 0)	2469	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2470	return 0; /* exit condition: invalid direction */
…		…
2663	* create clone from object to another	2517	* create clone from object to another
2664	*/	2518	*/
2665	object *	2519	object *
2666	object_create_clone (object *asrc)	2520	object_create_clone (object *asrc)
2667	{	2521	{
2668	object *
2669	dst = NULL, *tmp, *src, *part, *prev, *item;	2522	object *dst = 0, *tmp, *src, *part, *prev, *item;
2670		2523
2671	if (!asrc)	2524	if (!asrc)
2672	return NULL;	2525	return 0;
		2526
2673	src = asrc;	2527	src = asrc;
2674	if (src->head)	2528	if (src->head)
2675	src = src->head;	2529	src = src->head;
2676		2530
2677	prev = NULL;	2531	prev = 0;
2678	for (part = src; part; part = part->more)	2532	for (part = src; part; part = part->more)
2679	{	2533	{
2680	tmp = get_object ();	2534	tmp = part->clone ();
2681	copy_object (part, tmp);
2682	tmp->x -= src->x;	2535	tmp->x -= src->x;
2683	tmp->y -= src->y;	2536	tmp->y -= src->y;
		2537
2684	if (!part->head)	2538	if (!part->head)
2685	{	2539	{
2686	dst = tmp;	2540	dst = tmp;
2687	tmp->head = NULL;	2541	tmp->head = 0;
2688	}	2542	}
2689	else	2543	else
2690	{	2544	{
2691	tmp->head = dst;	2545	tmp->head = dst;
2692	}	2546	}
		2547
2693	tmp->more = NULL;	2548	tmp->more = 0;
		2549
2694	if (prev)	2550	if (prev)
2695	prev->more = tmp;	2551	prev->more = tmp;
		2552
2696	prev = tmp;	2553	prev = tmp;
2697	}	2554	}
2698		2555
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2556	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2557	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2558
2705	return dst;	2559	return dst;
2706	}	2560	}
2707		2561
2708	/* return true if the object was destroyed, 0 otherwise */
2709	int
2710	was_destroyed (const object *op, tag_t old_tag)
2711	{
2712	/* checking for FLAG_FREED isn't necessary, but makes this function more
2713	* robust */
2714	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2715	}
2716
2717	/* GROS - Creates an object using a string representing its content. */	2562	/* GROS - Creates an object using a string representing its content. */
2718
2719	/* Basically, we save the content of the string to a temp file, then call */	2563	/* Basically, we save the content of the string to a temp file, then call */
2720
2721	/* load_object on it. I admit it is a highly inefficient way to make things, */	2564	/* load_object on it. I admit it is a highly inefficient way to make things, */
2722
2723	/* but it was simple to make and allows reusing the load_object function. */	2565	/* but it was simple to make and allows reusing the load_object function. */
2724
2725	/* Remember not to use load_object_str in a time-critical situation. */	2566	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2567	/* Also remember that multiparts objects are not supported for now. */
2728		2568
2729	object *	2569	object *
2730	load_object_str (const char *obstr)	2570	load_object_str (const char *obstr)
2731	{	2571	{
2732	object *	2572	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2573	char filename[MAX_BUF];
2736		2574
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2575	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2576
2739	FILE *
2740	tempfile = fopen (filename, "w");	2577	FILE *tempfile = fopen (filename, "w");
2741		2578
2742	if (tempfile == NULL)	2579	if (tempfile == NULL)
2743	{	2580	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2581	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2582	return NULL;
2746	};	2583	}
		2584
2747	fprintf (tempfile, obstr);	2585	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2586	fclose (tempfile);
2749		2587
2750	op = get_object ();	2588	op = object::create ();
2751		2589
2752	object_thawer	2590	object_thawer thawer (filename);
2753	thawer (filename);
2754		2591
2755	if (thawer)	2592	if (thawer)
2756	load_object (thawer, op, 0);	2593	load_object (thawer, op, 0);
2757		2594
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2595	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2603	* returns NULL if no match.
2767	*/	2604	*/
2768	object *	2605	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2606	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2607	{
2771	object *	2608	object *tmp;
2772	tmp;
2773		2609
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2610	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2611	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2612	return tmp;
2777		2613
…		…
2785	* do the desired thing.	2621	* do the desired thing.
2786	*/	2622	*/
2787	key_value *	2623	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2624	get_ob_key_link (const object *ob, const char *key)
2789	{	2625	{
2790	key_value *	2626	key_value *link;
2791	link;
2792		2627
2793	for (link = ob->key_values; link != NULL; link = link->next)	2628	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2629	if (link->key == key)
2796	{
2797	return link;	2630	return link;
2798	}
2799	}
2800		2631
2801	return NULL;	2632	return NULL;
2802	}	2633	}
2803		2634
2804	/*	2635	/*
…		…
2809	* The returned string is shared.	2640	* The returned string is shared.
2810	*/	2641	*/
2811	const char *	2642	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2643	get_ob_key_value (const object *op, const char *const key)
2813	{	2644	{
2814	key_value *	2645	key_value *link;
2815	link;	2646	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2647
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2648	if (!canonical_key)
2822	{	2649	{
2823	/* 1. There being a field named key on any object	2650	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2651	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2652	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2653	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2654	*/
2828	return NULL;	2655	return 0;
2829	}	2656	}
2830		2657
2831	/* This is copied from get_ob_key_link() above -	2658	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2659	* only 4 lines, and saves the function call overhead.
2833	*/	2660	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2661	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2662	if (link->key == canonical_key)
2837	{
2838	return link->value;	2663	return link->value;
2839	}	2664
2840	}
2841	return NULL;	2665	return 0;
2842	}	2666	}
2843		2667
2844		2668
2845	/*	2669	/*
2846	* Updates the canonical_key in op to value.	2670	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2706	if (last)
2883	last->next = field->next;	2707	last->next = field->next;
2884	else	2708	else
2885	op->key_values = field->next;	2709	op->key_values = field->next;
2886		2710
2887	delete
2888	field;	2711	delete field;
2889	}	2712	}
2890	}	2713	}
2891	return TRUE;	2714	return TRUE;
2892	}	2715	}
2893	/* IF we get here, key doesn't exist */	2716	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2751	* Returns TRUE on success.
2929	*/	2752	*/
2930	int	2753	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2754	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2755	{
2933	shstr
2934	key_ (key);	2756	shstr key_ (key);
2935		2757
2936	return set_ob_key_value_s (op, key_, value, add_key);	2758	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2759	}
		2760
		2761	object::depth_iterator::depth_iterator (object *container)
		2762	: iterator_base (container)
		2763	{
		2764	while (item->inv)
		2765	item = item->inv;
		2766	}
		2767
		2768	void
		2769	object::depth_iterator::next ()
		2770	{
		2771	if (item->below)
		2772	{
		2773	item = item->below;
		2774
		2775	while (item->inv)
		2776	item = item->inv;
		2777	}
		2778	else
		2779	item = item->env;
		2780	}
		2781
		2782	// return a suitable string describing an objetc in enough detail to find it
		2783	const char *
		2784	object::debug_desc (char *info) const
		2785	{
		2786	char info2[256 * 3];
		2787	char *p = info;
		2788
		2789	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2790	count,
		2791	&name,
		2792	title ? " " : "",
		2793	title ? (const char *)title : "");
		2794
		2795	if (env)
		2796	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2797
		2798	if (map)
		2799	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2800
		2801	return info;
		2802	}
		2803
		2804	const char *
		2805	object::debug_desc () const
		2806	{
		2807	static char info[256 * 3];
		2808	return debug_desc (info);
		2809	}
		2810

Diff Legend

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