ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.67 by root, Thu Dec 14 04:30:32 2006 UTC

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