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.45 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.99 by root, Sun Dec 31 18:10:40 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	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
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
35		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
37	static UUID uuid;	38	static UUID uuid;
38	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
39		40
…		…
105	_exit (1);	106	_exit (1);
106	}	107	}
107		108
108	uuid.seq = uid;	109	uuid.seq = uid;
109	write_uuid ();	110	write_uuid ();
110	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
111	fclose (fp);	112	fclose (fp);
112	}	113	}
113		114
114	UUID	115	UUID
115	gen_uuid ()	116	gen_uuid ()
…		…
140	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
141	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
142	*/	143	*/
143		144
144	/* For each field in wants, */	145	/* For each field in wants, */
145	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
146	{	147	{
147	key_value *has_field;	148	key_value *has_field;
148		149
149	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
150	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
184	*	185	*
185	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
186	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
187	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
188	*	189	*
189	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
190	*	191	*
191	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
192	* check weight	193	* check weight
193	*/	194	*/
194
195	bool object::can_merge (object *ob1, object *ob2)	195	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	196	{
197	/* A couple quicksanity checks */	197	/* A couple quicksanity checks */
198	if ((ob1 == ob2) || (ob1->type != ob2->type))	198	if (ob1 == ob2
		199	|| ob1->type != ob2->type
		200	|| ob1->speed != ob2->speed
		201	|| ob1->value != ob2->value
		202	|| ob1->name != ob2->name)
199	return 0;	203	return 0;
200		204
201	if (ob1->speed != ob2->speed)	205	//TODO: this ain't working well, use nicer and correct overflow check
202	return 0;
203
204	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
205	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* value could not be stored in a sint32 (which unfortunately sometimes is
206	* used to store nrof).	208	* used to store nrof).
207	*/	209	*/
208	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
218	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
219		221
220	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
221	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
222		224
223		225	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	226	|| ob1->arch != ob2->arch
225	* being locked in inventory should prevent merging.
226	* 0x4 in flags3 is CLIENT_SENT
227	*/
228	if ((ob1->arch != ob2->arch) ||
229	(ob1->flags[0] != ob2->flags[0]) ||
230	(ob1->flags[1] != ob2->flags[1]) ||
231	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
232	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
233	(ob1->name != ob2->name) ||	227	|| ob1->name != ob2->name
234	(ob1->title != ob2->title) ||	228	|| ob1->title != ob2->title
235	(ob1->msg != ob2->msg) ||	229	|| ob1->msg != ob2->msg
236	(ob1->weight != ob2->weight) ||	230	|| ob1->weight != ob2->weight
237	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
238	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
239	(ob1->attacktype != ob2->attacktype) ||	233	|| ob1->attacktype != ob2->attacktype
240	(ob1->magic != ob2->magic) ||	234	|| ob1->magic != ob2->magic
241	(ob1->slaying != ob2->slaying) ||	235	|| ob1->slaying != ob2->slaying
242	(ob1->skill != ob2->skill) ||	236	|| ob1->skill != ob2->skill
243	(ob1->value != ob2->value) ||	237	|| ob1->value != ob2->value
244	(ob1->animation_id != ob2->animation_id) ||	238	|| ob1->animation_id != ob2->animation_id
245	(ob1->client_type != ob2->client_type) ||	239	|| ob1->client_type != ob2->client_type
246	(ob1->materialname != ob2->materialname) ||	240	|| ob1->materialname != ob2->materialname
247	(ob1->lore != ob2->lore) ||	241	|| ob1->lore != ob2->lore
248	(ob1->subtype != ob2->subtype) ||	242	|| ob1->subtype != ob2->subtype
249	(ob1->move_type != ob2->move_type) ||	243	|| ob1->move_type != ob2->move_type
250	(ob1->move_block != ob2->move_block) ||	244	|| ob1->move_block != ob2->move_block
251	(ob1->move_allow != ob2->move_allow) ||	245	|| ob1->move_allow != ob2->move_allow
252	(ob1->move_on != ob2->move_on) ||	246	|| ob1->move_on != ob2->move_on
253	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	247	|| ob1->move_off != ob2->move_off
		248	|| ob1->move_slow != ob2->move_slow
		249	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
254	return 0;	250	return 0;
255		251
256	/* This is really a spellbook check - really, we should	252	/* This is really a spellbook check - really, we should
257	* check all objects in the inventory.	253	* check all objects in the inventory.
258	*/	254	*/
…		…
261	/* if one object has inventory but the other doesn't, not equiv */	257	/* if one object has inventory but the other doesn't, not equiv */
262	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
263	return 0;	259	return 0;
264		260
265	/* Now check to see if the two inventory objects could merge */	261	/* Now check to see if the two inventory objects could merge */
266	if (!CAN_MERGE (ob1->inv, ob2->inv))	262	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0;	263	return 0;
268		264
269	/* inventory ok - still need to check rest of this object to see	265	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	266	* if it is valid.
271	*/	267	*/
…		…
280		276
281	/* Note sure why the following is the case - either the object has to	277	/* Note sure why the following is the case - either the object has to
282	* be animated or have a very low speed. Is this an attempted monster	278	* be animated or have a very low speed. Is this an attempted monster
283	* check?	279	* check?
284	*/	280	*/
285	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	281	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
286	return 0;	282	return 0;
287		283
288	switch (ob1->type)	284	switch (ob1->type)
289	{	285	{
290	case SCROLL:	286	case SCROLL:
…		…
355	op = op->env;	351	op = op->env;
356	return op;	352	return op;
357	}	353	}
358		354
359	/*	355	/*
360	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
361	* a better check. We basically keeping traversing up until we can't
362	* or find a player.
363	*/
364
365	object *
366	is_player_inv (object *op)
367	{
368	for (; op != NULL && op->type != PLAYER; op = op->env)
369	if (op->env == op)
370	op->env = NULL;
371	return op;
372	}
373
374	/*
375	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
376	* Some error messages.	357	* Some error messages.
377	* The result of the dump is stored in the static global errmsg array.	358	* The result of the dump is stored in the static global errmsg array.
378	*/	359	*/
379		360
380	void	361	char *
381	dump_object2 (object *op)
382	{
383	errmsg[0] = 0;
384	return;
385	//TODO//D#d#
386	#if 0
387	char *cp;
388
389	/* object *tmp;*/
390
391	if (op->arch != NULL)
392	{
393	strcat (errmsg, "arch ");
394	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
395	strcat (errmsg, "\n");
396	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
397	strcat (errmsg, cp);
398	# if 0
399	/* Don't dump player diffs - they are too long, mostly meaningless, and
400	* will overflow the buffer.
401	* Changed so that we don't dump inventory either. This may
402	* also overflow the buffer.
403	*/
404	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
405	strcat (errmsg, cp);
406	for (tmp = op->inv; tmp; tmp = tmp->below)
407	dump_object2 (tmp);
408	# endif
409	strcat (errmsg, "end\n");
410	}
411	else
412	{
413	strcat (errmsg, "Object ");
414	if (op->name == NULL)
415	strcat (errmsg, "(null)");
416	else
417	strcat (errmsg, op->name);
418	strcat (errmsg, "\n");
419	# if 0
420	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
421	strcat (errmsg, cp);
422	for (tmp = op->inv; tmp; tmp = tmp->below)
423	dump_object2 (tmp);
424	# endif
425	strcat (errmsg, "end\n");
426	}
427	#endif
428	}
429
430	/*
431	* Dumps an object. Returns output in the static global errmsg array.
432	*/
433
434	void
435	dump_object (object *op)	362	dump_object (object *op)
436	{	363	{
437	if (op == NULL)	364	if (!op)
438	{	365	return strdup ("[NULLOBJ]");
439	strcpy (errmsg, "[NULL pointer]");
440	return;
441	}
442	errmsg[0] = '\0';
443	dump_object2 (op);
444	}
445		366
446	void	367	object_freezer freezer;
447	dump_all_objects (void)	368	save_object (freezer, op, 1);
448	{	369	return freezer.as_string ();
449	object *op;
450
451	for (op = object::first; op != NULL; op = op->next)
452	{
453	dump_object (op);
454	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
455	}
456	}	370	}
457		371
458	/*	372	/*
459	* get_nearest_part(multi-object, object 2) returns the part of the	373	* get_nearest_part(multi-object, object 2) returns the part of the
460	* multi-object 1 which is closest to the second object.	374	* multi-object 1 which is closest to the second object.
…		…
480	*/	394	*/
481		395
482	object *	396	object *
483	find_object (tag_t i)	397	find_object (tag_t i)
484	{	398	{
485	object *op;
486
487	for (op = object::first; op != NULL; op = op->next)	399	for (object *op = object::first; op; op = op->next)
488	if (op->count == i)	400	if (op->count == i)
489	break;	401	return op;
		402
490	return op;	403	return 0;
491	}	404	}
492		405
493	/*	406	/*
494	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
495	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
…		…
553	}	466	}
554		467
555	op->key_values = 0;	468	op->key_values = 0;
556	}	469	}
557		470
558	void object::clear ()
559	{
560	attachable_base::clear ();
561
562	free_key_values (this);
563
564	owner = 0;
565	name = 0;
566	name_pl = 0;
567	title = 0;
568	race = 0;
569	slaying = 0;
570	skill = 0;
571	msg = 0;
572	lore = 0;
573	custom_name = 0;
574	materialname = 0;
575	contr = 0;
576	below = 0;
577	above = 0;
578	inv = 0;
579	container = 0;
580	env = 0;
581	more = 0;
582	head = 0;
583	map = 0;
584	active_next = 0;
585	active_prev = 0;
586
587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
588
589	SET_FLAG (this, FLAG_REMOVED);
590
591	/* What is not cleared is next, prev, and count */
592
593	expmul = 1.0;
594	face = blank_face;
595
596	if (settings.casting_time)
597	casting_time = -1;
598	}
599
600	void object::clone (object *destination)
601	{
602	*(object_copy *)destination = *this;
603	*(object_pod *)destination = *this;
604
605	if (self || cb)
606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607	}
608
609	/*	471	/*
610	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
611	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
612	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
613	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
614	* if the first object is freed, the pointers in the new object	476	* if the first object is freed, the pointers in the new object
615	* will point at garbage.	477	* will point at garbage.
616	*/	478	*/
617	void	479	void
618	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
619	{	481	{
620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622		484
623	op2->clone (op);	485	*(object_copy *)dst = *this;
624		486
625	if (is_freed)	487	if (is_freed)
626	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
		489
627	if (is_removed)	490	if (is_removed)
628	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
629		492
630	if (op2->speed < 0)	493	if (speed < 0)
631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632		495
633	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
634	if (op2->key_values)	497	if (key_values)
635	{	498	{
636	key_value *tail = 0;	499	key_value *tail = 0;
637	key_value *i;	500	key_value *i;
638		501
639	op->key_values = 0;	502	dst->key_values = 0;
640		503
641	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
642	{	505	{
643	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
644		507
645	new_link->next = 0;	508	new_link->next = 0;
646	new_link->key = i->key;	509	new_link->key = i->key;
647	new_link->value = i->value;	510	new_link->value = i->value;
648		511
649	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
650	if (!op->key_values)	513	if (!dst->key_values)
651	{	514	{
652	op->key_values = new_link;	515	dst->key_values = new_link;
653	tail = new_link;	516	tail = new_link;
654	}	517	}
655	else	518	else
656	{	519	{
657	tail->next = new_link;	520	tail->next = new_link;
658	tail = new_link;	521	tail = new_link;
659	}	522	}
660	}	523	}
661	}	524	}
662		525
663	update_ob_speed (op);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	object *
		530	object::clone ()
		531	{
		532	object *neu = create ();
		533	copy_to (neu);
		534	return neu;
664	}	535	}
665		536
666	/*	537	/*
667	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
668	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
669	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
670	*/	541	*/
671
672	void	542	void
673	update_turn_face (object *op)	543	update_turn_face (object *op)
674	{	544	{
675	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
676	return;	546	return;
		547
677	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
678	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
679	}	550	}
680		551
681	/*	552	/*
682	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
683	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
684	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
685	*/	556	*/
686	void	557	void
687	update_ob_speed (object *op)	558	object::set_speed (float speed)
688	{	559	{
689	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
690
691	/* No reason putting the archetypes objects on the speed list,
692	* since they never really need to be updated.
693	*/
694
695	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
696	{	561	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	#ifdef MANY_CORES
699	abort ();
700	#else
701	op->speed = 0;	563	speed = 0;
702	#endif
703	}
704
705	if (arch_init)
706	return;
707
708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
709	{	564	}
710	/* If already on active list, don't do anything */
711	if (op->active_next || op->active_prev || op == active_objects)
712	return;
713		565
714	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
715	* of the list. */
716	op->active_next = active_objects;
717		567
718	if (op->active_next != NULL)	568	if (has_active_speed ())
719	op->active_next->active_prev = op;	569	activate ();
720
721	active_objects = op;
722	}
723	else	570	else
724	{	571	deactivate ();
725	/* If not on the active list, nothing needs to be done */
726	if (!op->active_next && !op->active_prev && op != active_objects)
727	return;
728
729	if (op->active_prev == NULL)
730	{
731	active_objects = op->active_next;
732
733	if (op->active_next != NULL)
734	op->active_next->active_prev = NULL;
735	}
736	else
737	{
738	op->active_prev->active_next = op->active_next;
739
740	if (op->active_next)
741	op->active_next->active_prev = op->active_prev;
742	}
743
744	op->active_next = NULL;
745	op->active_prev = NULL;
746	}
747	}	572	}
748		573
749	/* This function removes object 'op' from the list of active
750	* objects.
751	* This should only be used for style maps or other such
752	* reference maps where you don't want an object that isn't
753	* in play chewing up cpu time getting processed.
754	* The reverse of this is to call update_ob_speed, which
755	* will do the right thing based on the speed of the object.
756	*/
757	void
758	remove_from_active_list (object *op)
759	{
760	/* If not on the active list, nothing needs to be done */
761	if (!op->active_next && !op->active_prev && op != active_objects)
762	return;
763
764	if (op->active_prev == NULL)
765	{
766	active_objects = op->active_next;
767	if (op->active_next != NULL)
768	op->active_next->active_prev = NULL;
769	}
770	else
771	{
772	op->active_prev->active_next = op->active_next;
773	if (op->active_next)
774	op->active_next->active_prev = op->active_prev;
775	}
776	op->active_next = NULL;
777	op->active_prev = NULL;
778	}
779
780	/*	574	/*
781	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
782	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
783	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
784	* invisible object, etc...)	578	* invisible object, etc...)
785	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
786	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
787	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
788	*	582	*
789	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
790	* For example, if the only thing that has changed is the face (due to
791	* an animation), we don't need to call update_position until that actually
792	* comes into view of a player. OTOH, many other things, like addition/removal
793	* of walls or living creatures may need us to update the flags now.
794	* current action are:	584	* current action are:
795	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
796	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
798	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
799	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
800	*/	590	*/
801
802	void	591	void
803	update_object (object *op, int action)	592	update_object (object *op, int action)
804	{	593	{
805	int update_now = 0, flags;
806	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
807		595
808	if (op == NULL)	596	if (op == NULL)
809	{	597	{
810	/* this should never happen */	598	/* this should never happen */
811	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
812	return;	600	return;
813	}	601	}
814		602
815	if (op->env != NULL)	603	if (op->env)
816	{	604	{
817	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
818	* to do in this case.	606	* to do in this case.
819	*/	607	*/
820	return;	608	return;
…		…
825	*/	613	*/
826	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
827	return;	615	return;
828		616
829	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
830	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
831	{	619	{
832	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
833	#ifdef MANY_CORES	621	#ifdef MANY_CORES
834	abort ();	622	abort ();
835	#endif	623	#endif
836	return;	624	return;
837	}	625	}
838		626
839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
840	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
841	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
842	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
843	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
844	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
845		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
846	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
847	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
849	update_now = 1;
850
851	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
858	update_now = 1;
859
860	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
861	update_now = 1;
862
863	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
864	update_now = 1;
865
866	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
867	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
868
869	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
870	* to have move_allow right now.	644	* to have move_allow right now.
871	*/	645	*/
872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874		648	m.flags_ = 0;
875	if ((move_slow | op->move_slow) != move_slow)
876	update_now = 1;
877	}	649	}
878	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
879	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
880	* that is being removed.	652	* that is being removed.
881	*/	653	*/
882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883	update_now = 1;	655	m.flags_ = 0;
884	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
885	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
886	else	658	else
887	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
888		660
889	if (update_now)
890	{
891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
892	update_position (op->map, op->x, op->y);
893	}
894
895	if (op->more != NULL)	661	if (op->more)
896	update_object (op->more, action);	662	update_object (op->more, action);
897	}	663	}
898		664
899	object::vector object::mortals;
900	object::vector object::objects; // not yet used
901	object *object::first;	665	object *object::first;
902
903	void object::free_mortals ()
904	{
905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
906	if ((*i)->refcnt)
907	++i; // further delay freeing
908	else
909	{
910	delete *i;
911	mortals.erase (i);
912	}
913
914	static int lastmortals = 0;//D
915
916	if (mortals.size() != lastmortals)//D
917	{
918	lastmortals = mortals.size ();//D
919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920	}
921	}
922		666
923	object::object ()	667	object::object ()
924	{	668	{
925	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
926		670
…		…
947	object::first = this;	691	object::first = this;
948	}	692	}
949		693
950	void object::unlink ()	694	void object::unlink ()
951	{	695	{
952	//count = 0;//D
953	if (!prev && !next) return;//D
954
955	if (this == object::first)	696	if (this == object::first)
956	object::first = next;	697	object::first = next;
957		698
958	/* Remove this object from the list of used objects */	699	/* Remove this object from the list of used objects */
959	if (prev) prev->next = next;	700	if (prev) prev->next = next;
…		…
961		702
962	prev = 0;	703	prev = 0;
963	next = 0;	704	next = 0;
964	}	705	}
965		706
		707	bool
		708	object::active () const
		709	{
		710	return active_next || active_prev || this == active_objects;
		711	}
		712
		713	void
		714	object::activate ()
		715	{
		716	/* If already on active list, don't do anything */
		717	if (active ())
		718	return;
		719
		720	if (has_active_speed ())
		721	{
		722	/* process_events() expects us to insert the object at the beginning
		723	* of the list. */
		724	active_next = active_objects;
		725
		726	if (active_next)
		727	active_next->active_prev = this;
		728
		729	active_objects = this;
		730	}
		731	}
		732
		733	void
		734	object::activate_recursive ()
		735	{
		736	activate ();
		737
		738	for (object *op = inv; op; op = op->above)
		739	op->activate_recursive ();
		740	}
		741
		742	/* This function removes object 'op' from the list of active
		743	* objects.
		744	* This should only be used for style maps or other such
		745	* reference maps where you don't want an object that isn't
		746	* in play chewing up cpu time getting processed.
		747	* The reverse of this is to call update_ob_speed, which
		748	* will do the right thing based on the speed of the object.
		749	*/
		750	void
		751	object::deactivate ()
		752	{
		753	/* If not on the active list, nothing needs to be done */
		754	if (!active ())
		755	return;
		756
		757	if (active_prev == 0)
		758	{
		759	active_objects = active_next;
		760	if (active_next)
		761	active_next->active_prev = 0;
		762	}
		763	else
		764	{
		765	active_prev->active_next = active_next;
		766	if (active_next)
		767	active_next->active_prev = active_prev;
		768	}
		769
		770	active_next = 0;
		771	active_prev = 0;
		772	}
		773
		774	void
		775	object::deactivate_recursive ()
		776	{
		777	for (object *op = inv; op; op = op->above)
		778	op->deactivate_recursive ();
		779
		780	deactivate ();
		781	}
		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	// need to check first, because the checks below might segfault
		791	// as we might be on an invalid mapspace and crossfire code
		792	// is too buggy to ensure that the inventory is empty.
		793	// corollary: if you create arrows etc. with stuff in tis inventory,
		794	// cf will crash below with off-map x and y
		795	if (!inv)
		796	return;
		797
		798	/* Only if the space blocks everything do we not process -
		799	* if some form of movement is allowed, let objects
		800	* drop on that space.
		801	*/
		802	if (!drop_to_ground
		803	|| !map
		804	|| map->in_memory != MAP_IN_MEMORY
		805	|| ms ().move_block == MOVE_ALL)
		806	{
		807	while (inv)
		808	{
		809	inv->destroy_inv (drop_to_ground);
		810	inv->destroy ();
		811	}
		812	}
		813	else
		814	{ /* Put objects in inventory onto this space */
		815	while (inv)
		816	{
		817	object *op = inv;
		818
		819	if (op->flag [FLAG_STARTEQUIP]
		820	|| op->flag [FLAG_NO_DROP]
		821	|| op->type == RUNE
		822	|| op->type == TRAP
		823	|| op->flag [FLAG_IS_A_TEMPLATE])
		824	op->destroy ();
		825	else
		826	map->insert (op, x, y);
		827	}
		828	}
		829	}
		830
966	object *object::create ()	831	object *object::create ()
967	{	832	{
968	object *op = new object;	833	object *op = new object;
969	op->link ();	834	op->link ();
970	return op;	835	return op;
971	}	836	}
972		837
973	/*	838	void
974	* free_object() frees everything allocated by an object, removes	839	object::do_destroy ()
975	* it from the list of used objects, and puts it on the list of
976	* free objects. The IS_FREED() flag is set in the object.
977	* The object must have been removed by remove_ob() first for
978	* this function to succeed.
979	*
980	* If free_inventory is set, free inventory as well. Else drop items in
981	* inventory to the ground.
982	*/
983	void object::free (bool free_inventory)
984	{	840	{
985	if (QUERY_FLAG (this, FLAG_FREED))	841	if (flag [FLAG_IS_LINKED])
		842	remove_button_link (this);
		843
		844	if (flag [FLAG_FRIENDLY])
		845	remove_friendly_object (this);
		846
		847	if (!flag [FLAG_REMOVED])
		848	remove ();
		849
		850	if (flag [FLAG_FREED])
986	return;	851	return;
987		852
988	if (QUERY_FLAG (this, FLAG_FRIENDLY))	853	set_speed (0);
989	remove_friendly_object (this);
990		854
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	855	flag [FLAG_FREED] = 1;
992	remove_ob (this);
993		856
994	SET_FLAG (this, FLAG_FREED);	857	attachable::do_destroy ();
		858
		859	destroy_inv (true);
		860	unlink ();
		861
		862	// hack to ensure that freed objects still have a valid map
		863	{
		864	static maptile *freed_map; // freed objects are moved here to avoid crashes
		865
		866	if (!freed_map)
		867	{
		868	freed_map = new maptile;
		869
		870	freed_map->name = "/internal/freed_objects_map";
		871	freed_map->width = 3;
		872	freed_map->height = 3;
		873
		874	freed_map->alloc ();
		875	}
		876
		877	map = freed_map;
		878	x = 1;
		879	y = 1;
		880	}
		881
		882	head = 0;
995		883
996	if (more)	884	if (more)
997	{	885	{
998	more->free (free_inventory);	886	more->destroy ();
999	more = 0;	887	more = 0;
1000	}
1001
1002	if (inv)
1003	{
1004	/* Only if the space blocks everything do we not process -
1005	* if some form of movement is allowed, let objects
1006	* drop on that space.
1007	*/
1008	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1009	{
1010	object *op = inv;
1011
1012	while (op)
1013	{
1014	object *tmp = op->below;
1015	op->free (free_inventory);
1016	op = tmp;
1017	}
1018	}
1019	else
1020	{ /* Put objects in inventory onto this space */
1021	object *op = inv;
1022
1023	while (op)
1024	{
1025	object *tmp = op->below;
1026
1027	remove_ob (op);
1028
1029	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1030	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1031	free_object (op);
1032	else
1033	{
1034	op->x = x;
1035	op->y = y;
1036	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1037	}
1038
1039	op = tmp;
1040	}
1041	}
1042	}	888	}
1043		889
1044	// clear those pointers that likely might have circular references to us	890	// clear those pointers that likely might have circular references to us
1045	owner = 0;	891	owner = 0;
1046	enemy = 0;	892	enemy = 0;
1047	attacked_by = 0;	893	attacked_by = 0;
1048		894
1049	/* Remove object from the active list */	895	// only relevant for players(?), but make sure of it anyways
1050	speed = 0;	896	contr = 0;
1051	update_ob_speed (this);	897	}
1052		898
1053	unlink ();	899	void
		900	object::destroy (bool destroy_inventory)
		901	{
		902	if (destroyed ())
		903	return;
1054		904
1055	mortals.push_back (this);	905	if (destroy_inventory)
		906	destroy_inv (false);
		907
		908	attachable::destroy ();
1056	}	909	}
1057		910
1058	/*	911	/*
1059	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
1060	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
1061	*/	914	*/
1062
1063	void	915	void
1064	sub_weight (object *op, signed long weight)	916	sub_weight (object *op, signed long weight)
1065	{	917	{
1066	while (op != NULL)	918	while (op != NULL)
1067	{	919	{
…		…
1071	op->carrying -= weight;	923	op->carrying -= weight;
1072	op = op->env;	924	op = op->env;
1073	}	925	}
1074	}	926	}
1075		927
1076	/* remove_ob(op):	928	/* op->remove ():
1077	* This function removes the object op from the linked list of objects	929	* This function removes the object op from the linked list of objects
1078	* which it is currently tied to. When this function is done, the	930	* which it is currently tied to. When this function is done, the
1079	* object will have no environment. If the object previously had an	931	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	932	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	933	* the previous environment.
1082	* Beware: This function is called from the editor as well!	934	* Beware: This function is called from the editor as well!
1083	*/	935	*/
1084
1085	void	936	void
1086	remove_ob (object *op)	937	object::remove ()
1087	{	938	{
1088	object *tmp, *last = 0;	939	object *tmp, *last = 0;
1089	object *otmp;	940	object *otmp;
1090		941
1091	tag_t tag;
1092	int check_walk_off;
1093	mapstruct *m;
1094
1095	sint16 x, y;
1096
1097	if (QUERY_FLAG (op, FLAG_REMOVED))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
1098	return;	943	return;
1099		944
1100	SET_FLAG (op, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
1101		947
1102	if (op->more != NULL)	948	if (more)
1103	remove_ob (op->more);	949	more->remove ();
1104		950
1105	/*	951	/*
1106	* In this case, the object to be removed is in someones	952	* In this case, the object to be removed is in someones
1107	* inventory.	953	* inventory.
1108	*/	954	*/
1109	if (op->env != NULL)	955	if (env)
1110	{	956	{
1111	if (op->nrof)	957	if (nrof)
1112	sub_weight (op->env, op->weight * op->nrof);	958	sub_weight (env, weight * nrof);
1113	else	959	else
1114	sub_weight (op->env, op->weight + op->carrying);	960	sub_weight (env, weight + carrying);
1115		961
1116	/* NO_FIX_PLAYER is set when a great many changes are being	962	/* NO_FIX_PLAYER is set when a great many changes are being
1117	* made to players inventory. If set, avoiding the call	963	* made to players inventory. If set, avoiding the call
1118	* to save cpu time.	964	* to save cpu time.
1119	*/	965	*/
1120	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1121	fix_player (otmp);	967	otmp->update_stats ();
1122		968
1123	if (op->above != NULL)	969	if (above)
1124	op->above->below = op->below;	970	above->below = below;
1125	else	971	else
1126	op->env->inv = op->below;	972	env->inv = below;
1127		973
1128	if (op->below != NULL)	974	if (below)
1129	op->below->above = op->above;	975	below->above = above;
1130		976
1131	/* we set up values so that it could be inserted into	977	/* we set up values so that it could be inserted into
1132	* the map, but we don't actually do that - it is up	978	* the map, but we don't actually do that - it is up
1133	* to the caller to decide what we want to do.	979	* to the caller to decide what we want to do.
1134	*/	980	*/
1135	op->x = op->env->x, op->y = op->env->y;	981	x = env->x, y = env->y;
1136	op->map = op->env->map;	982	map = env->map;
1137	op->above = NULL, op->below = NULL;	983	above = 0, below = 0;
1138	op->env = NULL;	984	env = 0;
1139	}	985	}
1140	else if (op->map)	986	else if (map)
1141	{	987	{
1142	x = op->x;	988	if (type == PLAYER)
1143	y = op->y;
1144	m = get_map_from_coord (op->map, &x, &y);
1145
1146	if (!m)
1147	{
1148	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1149	op->map->path, op->x, op->y);
1150	/* in old days, we used to set x and y to 0 and continue.
1151	* it seems if we get into this case, something is probablye
1152	* screwed up and should be fixed.
1153	*/
1154	abort ();
1155	}	989	{
1156		990	--map->players;
1157	if (op->map != m)	991	map->last_access = runtime;
1158	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1159	op->map->path, m->path, op->x, op->y, x, y);
1160
1161	/* Re did the following section of code - it looks like it had
1162	* lots of logic for things we no longer care about
1163	*/	992	}
		993
		994	map->dirty = true;
1164		995
1165	/* link the object above us */	996	/* link the object above us */
1166	if (op->above)	997	if (above)
1167	op->above->below = op->below;	998	above->below = below;
1168	else	999	else
1169	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1000	map->at (x, y).top = below; /* we were top, set new top */
1170		1001
1171	/* Relink the object below us, if there is one */	1002	/* Relink the object below us, if there is one */
1172	if (op->below)	1003	if (below)
1173	op->below->above = op->above;	1004	below->above = above;
1174	else	1005	else
1175	{	1006	{
1176	/* Nothing below, which means we need to relink map object for this space	1007	/* Nothing below, which means we need to relink map object for this space
1177	* use translated coordinates in case some oddness with map tiling is	1008	* use translated coordinates in case some oddness with map tiling is
1178	* evident	1009	* evident
1179	*/	1010	*/
1180	if (GET_MAP_OB (m, x, y) != op)	1011	if (GET_MAP_OB (map, x, y) != this)
1181	{	1012	{
1182	dump_object (op);	1013	char *dump = dump_object (this);
1183	LOG (llevError,	1014	LOG (llevError,
1184	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1015	"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);
		1016	free (dump);
1185	dump_object (GET_MAP_OB (m, x, y));	1017	dump = dump_object (GET_MAP_OB (map, x, y));
1186	LOG (llevError, "%s\n", errmsg);	1018	LOG (llevError, "%s\n", dump);
		1019	free (dump);
1187	}	1020	}
1188		1021
1189	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1022	map->at (x, y).bot = above; /* goes on above it. */
1190	}	1023	}
1191		1024
1192	op->above = 0;	1025	above = 0;
1193	op->below = 0;	1026	below = 0;
1194		1027
1195	if (op->map->in_memory == MAP_SAVING)	1028	if (map->in_memory == MAP_SAVING)
1196	return;	1029	return;
1197		1030
1198	tag = op->count;	1031	int check_walk_off = !flag [FLAG_NO_APPLY];
1199	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1200		1032
1201	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1033	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1202	{	1034	{
1203	/* No point updating the players look faces if he is the object	1035	/* No point updating the players look faces if he is the object
1204	* being removed.	1036	* being removed.
1205	*/	1037	*/
1206		1038
1207	if (tmp->type == PLAYER && tmp != op)	1039	if (tmp->type == PLAYER && tmp != this)
1208	{	1040	{
1209	/* If a container that the player is currently using somehow gets	1041	/* If a container that the player is currently using somehow gets
1210	* removed (most likely destroyed), update the player view	1042	* removed (most likely destroyed), update the player view
1211	* appropriately.	1043	* appropriately.
1212	*/	1044	*/
1213	if (tmp->container == op)	1045	if (tmp->container == this)
1214	{	1046	{
1215	CLEAR_FLAG (op, FLAG_APPLIED);	1047	flag [FLAG_APPLIED] = 0;
1216	tmp->container = NULL;	1048	tmp->container = 0;
1217	}	1049	}
1218		1050
1219	tmp->contr->socket.update_look = 1;	1051	if (tmp->contr->ns)
		1052	tmp->contr->ns->floorbox_update ();
1220	}	1053	}
1221		1054
1222	/* See if player moving off should effect something */	1055	/* See if object moving off should effect something */
1223	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1056	if (check_walk_off
		1057	&& ((move_type & tmp->move_off)
		1058	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224	{	1059	{
1225	move_apply (tmp, op, NULL);	1060	move_apply (tmp, this, 0);
1226		1061
1227	if (was_destroyed (op, tag))	1062	if (destroyed ())
1228	{
1229	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1063	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1230	}
1231	}	1064	}
1232		1065
1233	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1066	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1234		1067	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1235	if (tmp->above == tmp)	1068	if (tmp->above == tmp)
1236	tmp->above = NULL;	1069	tmp->above = 0;
1237		1070
1238	last = tmp;	1071	last = tmp;
1239	}	1072	}
1240		1073
1241	/* last == NULL of there are no objects on this space */	1074	/* last == NULL if there are no objects on this space */
		1075	//TODO: this makes little sense, why only update the topmost object?
1242	if (last == NULL)	1076	if (!last)
1243	{	1077	map->at (x, y).flags_ = 0;
1244	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1245	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1246	* those out anyways, and if there are any flags set right now, they won't
1247	* be correct anyways.
1248	*/
1249	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1250	update_position (op->map, op->x, op->y);
1251	}
1252	else	1078	else
1253	update_object (last, UP_OBJ_REMOVE);	1079	update_object (last, UP_OBJ_REMOVE);
1254		1080
1255	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1081	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1256	update_all_los (op->map, op->x, op->y);	1082	update_all_los (map, x, y);
1257	}	1083	}
1258	}	1084	}
1259		1085
1260	/*	1086	/*
1261	* merge_ob(op,top):	1087	* merge_ob(op,top):
…		…
1269	merge_ob (object *op, object *top)	1095	merge_ob (object *op, object *top)
1270	{	1096	{
1271	if (!op->nrof)	1097	if (!op->nrof)
1272	return 0;	1098	return 0;
1273		1099
1274	if (top == NULL)	1100	if (top)
1275	for (top = op; top != NULL && top->above != NULL; top = top->above);	1101	for (top = op; top && top->above; top = top->above)
		1102	;
1276		1103
1277	for (; top != NULL; top = top->below)	1104	for (; top; top = top->below)
1278	{	1105	{
1279	if (top == op)	1106	if (top == op)
1280	continue;	1107	continue;
1281	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1282	{	1110	{
1283	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1284		1112
1285	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1286	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1287	remove_ob (op);	1115	op->destroy ();
1288	free_object (op);
1289	return top;	1116	return top;
1290	}	1117	}
1291	}	1118	}
1292		1119
1293	return 0;	1120	return 0;
…		…
1296	/*	1123	/*
1297	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1298	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1299	*/	1126	*/
1300	object *	1127	object *
1301	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1302	{	1129	{
1303	object *tmp;
1304
1305	if (op->head)
1306	op = op->head;
1307
1308	for (tmp = op; tmp; tmp = tmp->more)	1130	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1309	{	1131	{
1310	tmp->x = x + tmp->arch->clone.x;	1132	tmp->x = x + tmp->arch->clone.x;
1311	tmp->y = y + tmp->arch->clone.y;	1133	tmp->y = y + tmp->arch->clone.y;
1312	}	1134	}
1313		1135
…		…
1332	* Return value:	1154	* Return value:
1333	* new object if 'op' was merged with other object	1155	* new object if 'op' was merged with other object
1334	* NULL if 'op' was destroyed	1156	* NULL if 'op' was destroyed
1335	* just 'op' otherwise	1157	* just 'op' otherwise
1336	*/	1158	*/
1337
1338	object *	1159	object *
1339	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1160	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1340	{	1161	{
1341	object *tmp, *top, *floor = NULL;	1162	object *tmp, *top, *floor = NULL;
1342	sint16 x, y;	1163	sint16 x, y;
1343		1164
1344	if (QUERY_FLAG (op, FLAG_FREED))	1165	if (QUERY_FLAG (op, FLAG_FREED))
1345	{	1166	{
1346	LOG (llevError, "Trying to insert freed object!\n");	1167	LOG (llevError, "Trying to insert freed object!\n");
1347	return NULL;	1168	return NULL;
1348	}	1169	}
1349		1170
1350	if (m == NULL)	1171	if (!m)
1351	{	1172	{
1352	dump_object (op);	1173	char *dump = dump_object (op);
1353	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1175	free (dump);
1354	return op;	1176	return op;
1355	}	1177	}
1356		1178
1357	if (out_of_map (m, op->x, op->y))	1179	if (out_of_map (m, op->x, op->y))
1358	{	1180	{
1359	dump_object (op);	1181	char *dump = dump_object (op);
1360	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1182	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1361	#ifdef MANY_CORES	1183	#ifdef MANY_CORES
1362	/* Better to catch this here, as otherwise the next use of this object	1184	/* Better to catch this here, as otherwise the next use of this object
1363	* is likely to cause a crash. Better to find out where it is getting	1185	* is likely to cause a crash. Better to find out where it is getting
1364	* improperly inserted.	1186	* improperly inserted.
1365	*/	1187	*/
1366	abort ();	1188	abort ();
1367	#endif	1189	#endif
		1190	free (dump);
1368	return op;	1191	return op;
1369	}	1192	}
1370		1193
1371	if (!QUERY_FLAG (op, FLAG_REMOVED))	1194	if (!QUERY_FLAG (op, FLAG_REMOVED))
1372	{	1195	{
1373	dump_object (op);	1196	char *dump = dump_object (op);
1374	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1198	free (dump);
1375	return op;	1199	return op;
1376	}	1200	}
1377		1201
1378	if (op->more != NULL)	1202	if (op->more)
1379	{	1203	{
1380	/* The part may be on a different map. */	1204	/* The part may be on a different map. */
1381		1205
1382	object *more = op->more;	1206	object *more = op->more;
1383		1207
…		…
1399	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1400	{	1224	{
1401	if (!op->head)	1225	if (!op->head)
1402	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1403		1227
1404	return NULL;	1228	return 0;
1405	}	1229	}
1406	}	1230	}
1407		1231
1408	CLEAR_FLAG (op, FLAG_REMOVED);	1232	CLEAR_FLAG (op, FLAG_REMOVED);
1409		1233
…		…
1416	y = op->y;	1240	y = op->y;
1417		1241
1418	/* this has to be done after we translate the coordinates.	1242	/* this has to be done after we translate the coordinates.
1419	*/	1243	*/
1420	if (op->nrof && !(flag & INS_NO_MERGE))	1244	if (op->nrof && !(flag & INS_NO_MERGE))
1421	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1422	if (CAN_MERGE (op, tmp))	1246	if (object::can_merge (op, tmp))
1423	{	1247	{
1424	op->nrof += tmp->nrof;	1248	op->nrof += tmp->nrof;
1425	remove_ob (tmp);	1249	tmp->destroy ();
1426	free_object (tmp);
1427	}	1250	}
1428		1251
1429	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1252	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1430	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1253	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1431		1254
…		…
1444	op->below = originator->below;	1267	op->below = originator->below;
1445		1268
1446	if (op->below)	1269	if (op->below)
1447	op->below->above = op;	1270	op->below->above = op;
1448	else	1271	else
1449	SET_MAP_OB (op->map, op->x, op->y, op);	1272	op->ms ().bot = op;
1450		1273
1451	/* since *below* originator, no need to update top */	1274	/* since *below* originator, no need to update top */
1452	originator->below = op;	1275	originator->below = op;
1453	}	1276	}
1454	else	1277	else
1455	{	1278	{
1456	/* If there are other objects, then */	1279	/* If there are other objects, then */
1457	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1280	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1458	{	1281	{
1459	object *last = NULL;	1282	object *last = 0;
1460		1283
1461	/*	1284	/*
1462	* If there are multiple objects on this space, we do some trickier handling.	1285	* If there are multiple objects on this space, we do some trickier handling.
1463	* We've already dealt with merging if appropriate.	1286	* We've already dealt with merging if appropriate.
1464	* Generally, we want to put the new object on top. But if	1287	* Generally, we want to put the new object on top. But if
…		…
1468	* once we get to them. This reduces the need to traverse over all of	1291	* once we get to them. This reduces the need to traverse over all of
1469	* them when adding another one - this saves quite a bit of cpu time	1292	* them when adding another one - this saves quite a bit of cpu time
1470	* when lots of spells are cast in one area. Currently, it is presumed	1293	* when lots of spells are cast in one area. Currently, it is presumed
1471	* that flying non pickable objects are spell objects.	1294	* that flying non pickable objects are spell objects.
1472	*/	1295	*/
1473
1474	while (top != NULL)	1296	while (top)
1475	{	1297	{
1476	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1298	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1477	floor = top;	1299	floor = top;
1478		1300
1479	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1301	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1500	* If INS_ON_TOP is used, don't do this processing	1322	* If INS_ON_TOP is used, don't do this processing
1501	* Need to find the object that in fact blocks view, otherwise	1323	* Need to find the object that in fact blocks view, otherwise
1502	* stacking is a bit odd.	1324	* stacking is a bit odd.
1503	*/	1325	*/
1504	if (!(flag & INS_ON_TOP) &&	1326	if (!(flag & INS_ON_TOP) &&
1505	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1327	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1506	{	1328	{
1507	for (last = top; last != floor; last = last->below)	1329	for (last = top; last != floor; last = last->below)
1508	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1330	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1509	break;	1331	break;
1510	/* Check to see if we found the object that blocks view,	1332	/* Check to see if we found the object that blocks view,
…		…
1532	op->above = GET_MAP_OB (op->map, op->x, op->y);	1354	op->above = GET_MAP_OB (op->map, op->x, op->y);
1533		1355
1534	if (op->above)	1356	if (op->above)
1535	op->above->below = op;	1357	op->above->below = op;
1536		1358
1537	op->below = NULL;	1359	op->below = 0;
1538	SET_MAP_OB (op->map, op->x, op->y, op);	1360	op->ms ().bot = op;
1539	}	1361	}
1540	else	1362	else
1541	{ /* get inserted into the stack above top */	1363	{ /* get inserted into the stack above top */
1542	op->above = top->above;	1364	op->above = top->above;
1543		1365
…		…
1546		1368
1547	op->below = top;	1369	op->below = top;
1548	top->above = op;	1370	top->above = op;
1549	}	1371	}
1550		1372
1551	if (op->above == NULL)	1373	if (!op->above)
1552	SET_MAP_TOP (op->map, op->x, op->y, op);	1374	op->ms ().top = op;
1553	} /* else not INS_BELOW_ORIGINATOR */	1375	} /* else not INS_BELOW_ORIGINATOR */
1554		1376
1555	if (op->type == PLAYER)	1377	if (op->type == PLAYER)
		1378	{
1556	op->contr->do_los = 1;	1379	op->contr->do_los = 1;
		1380	++op->map->players;
		1381	op->map->last_access = runtime;
		1382	}
		1383
		1384	op->map->dirty = true;
1557		1385
1558	/* If we have a floor, we know the player, if any, will be above	1386	/* If we have a floor, we know the player, if any, will be above
1559	* it, so save a few ticks and start from there.	1387	* it, so save a few ticks and start from there.
1560	*/	1388	*/
1561	if (!(flag & INS_MAP_LOAD))	1389	if (!(flag & INS_MAP_LOAD))
1562	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1390	if (object *pl = op->ms ().player ())
1563	if (tmp->type == PLAYER)	1391	if (pl->contr->ns)
1564	tmp->contr->socket.update_look = 1;	1392	pl->contr->ns->floorbox_update ();
1565		1393
1566	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1567	* visible to others on this map. But update_all_los is really	1395	* visible to others on this map. But update_all_los is really
1568	* an inefficient way to do this, as it means los for all players	1396	* an inefficient way to do this, as it means los for all players
1569	* on the map will get recalculated. The players could very well	1397	* on the map will get recalculated. The players could very well
1570	* be far away from this change and not affected in any way -	1398	* be far away from this change and not affected in any way -
1571	* this should get redone to only look for players within range,	1399	* this should get redone to only look for players within range,
1572	* or just updating the P_NEED_UPDATE for spaces within this area	1400	* or just updating the P_UPTODATE for spaces within this area
1573	* of effect may be sufficient.	1401	* of effect may be sufficient.
1574	*/	1402	*/
1575	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1403	if (op->map->darkness && (op->glow_radius != 0))
1576	update_all_los (op->map, op->x, op->y);	1404	update_all_los (op->map, op->x, op->y);
1577		1405
1578	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1579	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1580		1408
		1409	INVOKE_OBJECT (INSERT, op);
		1410
1581	/* Don't know if moving this to the end will break anything. However,	1411	/* Don't know if moving this to the end will break anything. However,
1582	* we want to have update_look set above before calling this.	1412	* we want to have floorbox_update called before calling this.
1583	*	1413	*
1584	* check_move_on() must be after this because code called from	1414	* check_move_on() must be after this because code called from
1585	* check_move_on() depends on correct map flags (so functions like	1415	* check_move_on() depends on correct map flags (so functions like
1586	* blocked() and wall() work properly), and these flags are updated by	1416	* blocked() and wall() work properly), and these flags are updated by
1587	* update_object().	1417	* update_object().
…		…
1589		1419
1590	/* if this is not the head or flag has been passed, don't check walk on status */	1420	/* if this is not the head or flag has been passed, don't check walk on status */
1591	if (!(flag & INS_NO_WALK_ON) && !op->head)	1421	if (!(flag & INS_NO_WALK_ON) && !op->head)
1592	{	1422	{
1593	if (check_move_on (op, originator))	1423	if (check_move_on (op, originator))
1594	return NULL;	1424	return 0;
1595		1425
1596	/* If we are a multi part object, lets work our way through the check	1426	/* If we are a multi part object, lets work our way through the check
1597	* walk on's.	1427	* walk on's.
1598	*/	1428	*/
1599	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1429	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1600	if (check_move_on (tmp, originator))	1430	if (check_move_on (tmp, originator))
1601	return NULL;	1431	return 0;
1602	}	1432	}
1603		1433
1604	return op;	1434	return op;
1605	}	1435	}
1606		1436
1607	/* this function inserts an object in the map, but if it	1437	/* this function inserts an object in the map, but if it
1608	* finds an object of its own type, it'll remove that one first.	1438	* finds an object of its own type, it'll remove that one first.
1609	* op is the object to insert it under: supplies x and the map.	1439	* op is the object to insert it under: supplies x and the map.
1610	*/	1440	*/
1611	void	1441	void
1612	replace_insert_ob_in_map (const char *arch_string, object *op)	1442	replace_insert_ob_in_map (const char *arch_string, object *op)
1613	{	1443	{
1614	object *	1444	object *tmp, *tmp1;
1615	tmp;
1616	object *
1617	tmp1;
1618		1445
1619	/* first search for itself and remove any old instances */	1446	/* first search for itself and remove any old instances */
1620		1447
1621	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1448	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1622	{
1623	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1449	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1624	{	1450	tmp->destroy ();
1625	remove_ob (tmp);
1626	free_object (tmp);
1627	}
1628	}
1629		1451
1630	tmp1 = arch_to_object (find_archetype (arch_string));	1452	tmp1 = arch_to_object (archetype::find (arch_string));
1631		1453
1632	tmp1->x = op->x;	1454	tmp1->x = op->x;
1633	tmp1->y = op->y;	1455	tmp1->y = op->y;
1634	insert_ob_in_map (tmp1, op->map, op, 0);	1456	insert_ob_in_map (tmp1, op->map, op, 0);
		1457	}
		1458
		1459	object *
		1460	object::insert_at (object *where, object *originator, int flags)
		1461	{
		1462	where->map->insert (this, where->x, where->y, originator, flags);
1635	}	1463	}
1636		1464
1637	/*	1465	/*
1638	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1466	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1639	* is returned contains nr objects, and the remaining parts contains	1467	* is returned contains nr objects, and the remaining parts contains
1640	* the rest (or is removed and freed if that number is 0).	1468	* the rest (or is removed and freed if that number is 0).
1641	* On failure, NULL is returned, and the reason put into the	1469	* On failure, NULL is returned, and the reason put into the
1642	* global static errmsg array.	1470	* global static errmsg array.
1643	*/	1471	*/
1644
1645	object *	1472	object *
1646	get_split_ob (object *orig_ob, uint32 nr)	1473	get_split_ob (object *orig_ob, uint32 nr)
1647	{	1474	{
1648	object *	1475	object *newob;
1649	newob;
1650	int
1651	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1476	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1652		1477
1653	if (orig_ob->nrof < nr)	1478	if (orig_ob->nrof < nr)
1654	{	1479	{
1655	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1480	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1656	return NULL;	1481	return NULL;
1657	}	1482	}
1658		1483
1659	newob = object_create_clone (orig_ob);	1484	newob = object_create_clone (orig_ob);
1660		1485
1661	if ((orig_ob->nrof -= nr) < 1)	1486	if ((orig_ob->nrof -= nr) < 1)
1662	{	1487	orig_ob->destroy (1);
1663	if (!is_removed)
1664	remove_ob (orig_ob);
1665	free_object2 (orig_ob, 1);
1666	}
1667	else if (!is_removed)	1488	else if (!is_removed)
1668	{	1489	{
1669	if (orig_ob->env != NULL)	1490	if (orig_ob->env != NULL)
1670	sub_weight (orig_ob->env, orig_ob->weight * nr);	1491	sub_weight (orig_ob->env, orig_ob->weight * nr);
1671	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1492	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1691		1512
1692	object *	1513	object *
1693	decrease_ob_nr (object *op, uint32 i)	1514	decrease_ob_nr (object *op, uint32 i)
1694	{	1515	{
1695	object *tmp;	1516	object *tmp;
1696	player *pl;
1697		1517
1698	if (i == 0) /* objects with op->nrof require this check */	1518	if (i == 0) /* objects with op->nrof require this check */
1699	return op;	1519	return op;
1700		1520
1701	if (i > op->nrof)	1521	if (i > op->nrof)
1702	i = op->nrof;	1522	i = op->nrof;
1703		1523
1704	if (QUERY_FLAG (op, FLAG_REMOVED))	1524	if (QUERY_FLAG (op, FLAG_REMOVED))
1705	op->nrof -= i;	1525	op->nrof -= i;
1706	else if (op->env != NULL)	1526	else if (op->env)
1707	{	1527	{
1708	/* is this object in the players inventory, or sub container	1528	/* is this object in the players inventory, or sub container
1709	* therein?	1529	* therein?
1710	*/	1530	*/
1711	tmp = is_player_inv (op->env);	1531	tmp = op->in_player ();
1712	/* nope. Is this a container the player has opened?	1532	/* nope. Is this a container the player has opened?
1713	* If so, set tmp to that player.	1533	* If so, set tmp to that player.
1714	* IMO, searching through all the players will mostly	1534	* IMO, searching through all the players will mostly
1715	* likely be quicker than following op->env to the map,	1535	* likely be quicker than following op->env to the map,
1716	* and then searching the map for a player.	1536	* and then searching the map for a player.
1717	*/	1537	*/
1718	if (!tmp)	1538	if (!tmp)
1719	{	1539	for_all_players (pl)
1720	for (pl = first_player; pl; pl = pl->next)
1721	if (pl->ob->container == op->env)	1540	if (pl->ob->container == op->env)
		1541	{
		1542	tmp = pl->ob;
1722	break;	1543	break;
1723	if (pl)
1724	tmp = pl->ob;
1725	else
1726	tmp = NULL;
1727	}	1544	}
1728		1545
1729	if (i < op->nrof)	1546	if (i < op->nrof)
1730	{	1547	{
1731	sub_weight (op->env, op->weight * i);	1548	sub_weight (op->env, op->weight * i);
1732	op->nrof -= i;	1549	op->nrof -= i;
1733	if (tmp)	1550	if (tmp)
1734	{
1735	esrv_send_item (tmp, op);	1551	esrv_send_item (tmp, op);
1736	}
1737	}	1552	}
1738	else	1553	else
1739	{	1554	{
1740	remove_ob (op);	1555	op->remove ();
1741	op->nrof = 0;	1556	op->nrof = 0;
1742	if (tmp)	1557	if (tmp)
1743	{
1744	esrv_del_item (tmp->contr, op->count);	1558	esrv_del_item (tmp->contr, op->count);
1745	}
1746	}	1559	}
1747	}	1560	}
1748	else	1561	else
1749	{	1562	{
1750	object *above = op->above;	1563	object *above = op->above;
1751		1564
1752	if (i < op->nrof)	1565	if (i < op->nrof)
1753	op->nrof -= i;	1566	op->nrof -= i;
1754	else	1567	else
1755	{	1568	{
1756	remove_ob (op);	1569	op->remove ();
1757	op->nrof = 0;	1570	op->nrof = 0;
1758	}	1571	}
1759		1572
1760	/* Since we just removed op, op->above is null */	1573	/* Since we just removed op, op->above is null */
1761	for (tmp = above; tmp != NULL; tmp = tmp->above)	1574	for (tmp = above; tmp; tmp = tmp->above)
1762	if (tmp->type == PLAYER)	1575	if (tmp->type == PLAYER)
1763	{	1576	{
1764	if (op->nrof)	1577	if (op->nrof)
1765	esrv_send_item (tmp, op);	1578	esrv_send_item (tmp, op);
1766	else	1579	else
…		…
1770		1583
1771	if (op->nrof)	1584	if (op->nrof)
1772	return op;	1585	return op;
1773	else	1586	else
1774	{	1587	{
1775	free_object (op);	1588	op->destroy ();
1776	return NULL;	1589	return 0;
1777	}	1590	}
1778	}	1591	}
1779		1592
1780	/*	1593	/*
1781	* add_weight(object, weight) adds the specified weight to an object,	1594	* add_weight(object, weight) adds the specified weight to an object,
…		…
1793	op->carrying += weight;	1606	op->carrying += weight;
1794	op = op->env;	1607	op = op->env;
1795	}	1608	}
1796	}	1609	}
1797		1610
		1611	object *
		1612	insert_ob_in_ob (object *op, object *where)
		1613	{
		1614	if (!where)
		1615	{
		1616	char *dump = dump_object (op);
		1617	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1618	free (dump);
		1619	return op;
		1620	}
		1621
		1622	if (where->head)
		1623	{
		1624	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1625	where = where->head;
		1626	}
		1627
		1628	return where->insert (op);
		1629	}
		1630
1798	/*	1631	/*
1799	* insert_ob_in_ob(op,environment):	1632	* env->insert (op)
1800	* This function inserts the object op in the linked list	1633	* This function inserts the object op in the linked list
1801	* inside the object environment.	1634	* inside the object environment.
1802	*	1635	*
1803	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1804	* the inventory at the last position or next to other objects of the same
1805	* type.
1806	* Frank: Now sorted by type, archetype and magic!
1807	*
1808	* The function returns now pointer to inserted item, and return value can	1636	* The function returns now pointer to inserted item, and return value can
1809	* be != op, if items are merged. -Tero	1637	* be != op, if items are merged. -Tero
1810	*/	1638	*/
1811		1639
1812	object *	1640	object *
1813	insert_ob_in_ob (object *op, object *where)	1641	object::insert (object *op)
1814	{	1642	{
1815	object *	1643	object *tmp, *otmp;
1816	tmp, *
1817	otmp;
1818		1644
1819	if (!QUERY_FLAG (op, FLAG_REMOVED))	1645	if (!QUERY_FLAG (op, FLAG_REMOVED))
1820	{	1646	op->remove ();
1821	dump_object (op);
1822	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1823	return op;
1824	}
1825
1826	if (where == NULL)
1827	{
1828	dump_object (op);
1829	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1830	return op;
1831	}
1832
1833	if (where->head)
1834	{
1835	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1836	where = where->head;
1837	}
1838		1647
1839	if (op->more)	1648	if (op->more)
1840	{	1649	{
1841	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1650	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1842	return op;	1651	return op;
…		…
1844		1653
1845	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1654	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1846	CLEAR_FLAG (op, FLAG_REMOVED);	1655	CLEAR_FLAG (op, FLAG_REMOVED);
1847	if (op->nrof)	1656	if (op->nrof)
1848	{	1657	{
1849	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1658	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1850	if (CAN_MERGE (tmp, op))	1659	if (object::can_merge (tmp, op))
1851	{	1660	{
1852	/* return the original object and remove inserted object	1661	/* return the original object and remove inserted object
1853	(client needs the original object) */	1662	(client needs the original object) */
1854	tmp->nrof += op->nrof;	1663	tmp->nrof += op->nrof;
1855	/* Weight handling gets pretty funky. Since we are adding to	1664	/* Weight handling gets pretty funky. Since we are adding to
1856	* tmp->nrof, we need to increase the weight.	1665	* tmp->nrof, we need to increase the weight.
1857	*/	1666	*/
1858	add_weight (where, op->weight * op->nrof);	1667	add_weight (this, op->weight * op->nrof);
1859	SET_FLAG (op, FLAG_REMOVED);	1668	SET_FLAG (op, FLAG_REMOVED);
1860	free_object (op); /* free the inserted object */	1669	op->destroy (); /* free the inserted object */
1861	op = tmp;	1670	op = tmp;
1862	remove_ob (op); /* and fix old object's links */	1671	op->remove (); /* and fix old object's links */
1863	CLEAR_FLAG (op, FLAG_REMOVED);	1672	CLEAR_FLAG (op, FLAG_REMOVED);
1864	break;	1673	break;
1865	}	1674	}
1866		1675
1867	/* I assume combined objects have no inventory	1676	/* I assume combined objects have no inventory
1868	* We add the weight - this object could have just been removed	1677	* We add the weight - this object could have just been removed
1869	* (if it was possible to merge). calling remove_ob will subtract	1678	* (if it was possible to merge). calling remove_ob will subtract
1870	* the weight, so we need to add it in again, since we actually do	1679	* the weight, so we need to add it in again, since we actually do
1871	* the linking below	1680	* the linking below
1872	*/	1681	*/
1873	add_weight (where, op->weight * op->nrof);	1682	add_weight (this, op->weight * op->nrof);
1874	}	1683	}
1875	else	1684	else
1876	add_weight (where, (op->weight + op->carrying));	1685	add_weight (this, (op->weight + op->carrying));
1877		1686
1878	otmp = is_player_inv (where);	1687	otmp = this->in_player ();
1879	if (otmp && otmp->contr != NULL)	1688	if (otmp && otmp->contr)
1880	{
1881	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1689	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1882	fix_player (otmp);	1690	otmp->update_stats ();
1883	}
1884		1691
1885	op->map = NULL;	1692	op->map = 0;
1886	op->env = where;	1693	op->env = this;
1887	op->above = NULL;	1694	op->above = 0;
1888	op->below = NULL;	1695	op->below = 0;
1889	op->x = 0, op->y = 0;	1696	op->x = 0, op->y = 0;
1890		1697
1891	/* reset the light list and los of the players on the map */	1698	/* reset the light list and los of the players on the map */
1892	if ((op->glow_radius != 0) && where->map)	1699	if ((op->glow_radius != 0) && map)
1893	{	1700	{
1894	#ifdef DEBUG_LIGHTS	1701	#ifdef DEBUG_LIGHTS
1895	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1702	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1896	#endif /* DEBUG_LIGHTS */	1703	#endif /* DEBUG_LIGHTS */
1897	if (MAP_DARKNESS (where->map))	1704	if (map->darkness)
1898	update_all_los (where->map, where->x, where->y);	1705	update_all_los (map, x, y);
1899	}	1706	}
1900		1707
1901	/* Client has no idea of ordering so lets not bother ordering it here.	1708	/* Client has no idea of ordering so lets not bother ordering it here.
1902	* It sure simplifies this function...	1709	* It sure simplifies this function...
1903	*/	1710	*/
1904	if (where->inv == NULL)	1711	if (!inv)
1905	where->inv = op;	1712	inv = op;
1906	else	1713	else
1907	{	1714	{
1908	op->below = where->inv;	1715	op->below = inv;
1909	op->below->above = op;	1716	op->below->above = op;
1910	where->inv = op;	1717	inv = op;
1911	}	1718	}
		1719
		1720	INVOKE_OBJECT (INSERT, this);
		1721
1912	return op;	1722	return op;
1913	}	1723	}
1914		1724
1915	/*	1725	/*
1916	* Checks if any objects has a move_type that matches objects	1726	* Checks if any objects has a move_type that matches objects
…		…
1930	*	1740	*
1931	* MSW 2001-07-08: Check all objects on space, not just those below	1741	* MSW 2001-07-08: Check all objects on space, not just those below
1932	* object being inserted. insert_ob_in_map may not put new objects	1742	* object being inserted. insert_ob_in_map may not put new objects
1933	* on top.	1743	* on top.
1934	*/	1744	*/
1935
1936	int	1745	int
1937	check_move_on (object *op, object *originator)	1746	check_move_on (object *op, object *originator)
1938	{	1747	{
1939	object *	1748	object *tmp;
1940	tmp;	1749	maptile *m = op->map;
1941	tag_t
1942	tag;
1943	mapstruct *
1944	m = op->map;
1945	int
1946	x = op->x, y = op->y;	1750	int x = op->x, y = op->y;
1947		1751
1948	MoveType	1752	MoveType move_on, move_slow, move_block;
1949	move_on,
1950	move_slow,
1951	move_block;
1952		1753
1953	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1754	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1954	return 0;	1755	return 0;
1955
1956	tag = op->count;
1957		1756
1958	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1757	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1959	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1758	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1960	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1759	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1961		1760
…		…
1977		1776
1978	/* The objects have to be checked from top to bottom.	1777	/* The objects have to be checked from top to bottom.
1979	* Hence, we first go to the top:	1778	* Hence, we first go to the top:
1980	*/	1779	*/
1981		1780
1982	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1983	{	1782	{
1984	/* Trim the search when we find the first other spell effect	1783	/* Trim the search when we find the first other spell effect
1985	* this helps performance so that if a space has 50 spell objects,	1784	* this helps performance so that if a space has 50 spell objects,
1986	* we don't need to check all of them.	1785	* we don't need to check all of them.
1987	*/	1786	*/
…		…
2022	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1821	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2023	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1822	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2024	{	1823	{
2025	move_apply (tmp, op, originator);	1824	move_apply (tmp, op, originator);
2026		1825
2027	if (was_destroyed (op, tag))	1826	if (op->destroyed ())
2028	return 1;	1827	return 1;
2029		1828
2030	/* what the person/creature stepped onto has moved the object	1829	/* what the person/creature stepped onto has moved the object
2031	* someplace new. Don't process any further - if we did,	1830	* someplace new. Don't process any further - if we did,
2032	* have a feeling strange problems would result.	1831	* have a feeling strange problems would result.
…		…
2042	/*	1841	/*
2043	* present_arch(arch, map, x, y) searches for any objects with	1842	* present_arch(arch, map, x, y) searches for any objects with
2044	* a matching archetype at the given map and coordinates.	1843	* a matching archetype at the given map and coordinates.
2045	* The first matching object is returned, or NULL if none.	1844	* The first matching object is returned, or NULL if none.
2046	*/	1845	*/
2047
2048	object *	1846	object *
2049	present_arch (const archetype *at, mapstruct *m, int x, int y)	1847	present_arch (const archetype *at, maptile *m, int x, int y)
2050	{	1848	{
2051	object *
2052	tmp;
2053
2054	if (m == NULL || out_of_map (m, x, y))	1849	if (m == NULL || out_of_map (m, x, y))
2055	{	1850	{
2056	LOG (llevError, "Present_arch called outside map.\n");	1851	LOG (llevError, "Present_arch called outside map.\n");
2057	return NULL;	1852	return NULL;
2058	}	1853	}
		1854
2059	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2060	if (tmp->arch == at)	1856	if (tmp->arch == at)
2061	return tmp;	1857	return tmp;
		1858
2062	return NULL;	1859	return NULL;
2063	}	1860	}
2064		1861
2065	/*	1862	/*
2066	* present(type, map, x, y) searches for any objects with	1863	* present(type, map, x, y) searches for any objects with
2067	* a matching type variable at the given map and coordinates.	1864	* a matching type variable at the given map and coordinates.
2068	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
2069	*/	1866	*/
2070
2071	object *	1867	object *
2072	present (unsigned char type, mapstruct *m, int x, int y)	1868	present (unsigned char type, maptile *m, int x, int y)
2073	{	1869	{
2074	object *
2075	tmp;
2076
2077	if (out_of_map (m, x, y))	1870	if (out_of_map (m, x, y))
2078	{	1871	{
2079	LOG (llevError, "Present called outside map.\n");	1872	LOG (llevError, "Present called outside map.\n");
2080	return NULL;	1873	return NULL;
2081	}	1874	}
		1875
2082	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2083	if (tmp->type == type)	1877	if (tmp->type == type)
2084	return tmp;	1878	return tmp;
		1879
2085	return NULL;	1880	return NULL;
2086	}	1881	}
2087		1882
2088	/*	1883	/*
2089	* present_in_ob(type, object) searches for any objects with	1884	* present_in_ob(type, object) searches for any objects with
2090	* a matching type variable in the inventory of the given object.	1885	* a matching type variable in the inventory of the given object.
2091	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
2092	*/	1887	*/
2093
2094	object *	1888	object *
2095	present_in_ob (unsigned char type, const object *op)	1889	present_in_ob (unsigned char type, const object *op)
2096	{	1890	{
2097	object *
2098	tmp;
2099
2100	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1891	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2101	if (tmp->type == type)	1892	if (tmp->type == type)
2102	return tmp;	1893	return tmp;
		1894
2103	return NULL;	1895	return NULL;
2104	}	1896	}
2105		1897
2106	/*	1898	/*
2107	* present_in_ob (type, str, object) searches for any objects with	1899	* present_in_ob (type, str, object) searches for any objects with
…		…
2115	* str is the string to match against. Note that we match against	1907	* str is the string to match against. Note that we match against
2116	* the object name, not the archetype name. this is so that the	1908	* the object name, not the archetype name. this is so that the
2117	* spell code can use one object type (force), but change it's name	1909	* spell code can use one object type (force), but change it's name
2118	* to be unique.	1910	* to be unique.
2119	*/	1911	*/
2120
2121	object *	1912	object *
2122	present_in_ob_by_name (int type, const char *str, const object *op)	1913	present_in_ob_by_name (int type, const char *str, const object *op)
2123	{	1914	{
2124	object *
2125	tmp;
2126
2127	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1915	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2128	{
2129	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1916	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2130	return tmp;	1917	return tmp;
2131	}	1918
2132	return NULL;	1919	return 0;
2133	}	1920	}
2134		1921
2135	/*	1922	/*
2136	* present_arch_in_ob(archetype, object) searches for any objects with	1923	* present_arch_in_ob(archetype, object) searches for any objects with
2137	* a matching archetype in the inventory of the given object.	1924	* a matching archetype in the inventory of the given object.
2138	* The first matching object is returned, or NULL if none.	1925	* The first matching object is returned, or NULL if none.
2139	*/	1926	*/
2140
2141	object *	1927	object *
2142	present_arch_in_ob (const archetype *at, const object *op)	1928	present_arch_in_ob (const archetype *at, const object *op)
2143	{	1929	{
2144	object *
2145	tmp;
2146
2147	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2148	if (tmp->arch == at)	1931	if (tmp->arch == at)
2149	return tmp;	1932	return tmp;
		1933
2150	return NULL;	1934	return NULL;
2151	}	1935	}
2152		1936
2153	/*	1937	/*
2154	* activate recursively a flag on an object inventory	1938	* activate recursively a flag on an object inventory
2155	*/	1939	*/
2156	void	1940	void
2157	flag_inv (object *op, int flag)	1941	flag_inv (object *op, int flag)
2158	{	1942	{
2159	object *
2160	tmp;
2161
2162	if (op->inv)	1943	if (op->inv)
2163	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2164	{	1945	{
2165	SET_FLAG (tmp, flag);	1946	SET_FLAG (tmp, flag);
2166	flag_inv (tmp, flag);	1947	flag_inv (tmp, flag);
2167	}	1948	}
2168	} /*	1949	}
		1950
		1951	/*
2169	* desactivate recursively a flag on an object inventory	1952	* deactivate recursively a flag on an object inventory
2170	*/	1953	*/
2171	void	1954	void
2172	unflag_inv (object *op, int flag)	1955	unflag_inv (object *op, int flag)
2173	{	1956	{
2174	object *
2175	tmp;
2176
2177	if (op->inv)	1957	if (op->inv)
2178	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2179	{	1959	{
2180	CLEAR_FLAG (tmp, flag);	1960	CLEAR_FLAG (tmp, flag);
2181	unflag_inv (tmp, flag);	1961	unflag_inv (tmp, flag);
2182	}	1962	}
2183	}	1963	}
…		…
2186	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1966	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2187	* all it's inventory (recursively).	1967	* all it's inventory (recursively).
2188	* If checksums are used, a player will get set_cheat called for	1968	* If checksums are used, a player will get set_cheat called for
2189	* him/her-self and all object carried by a call to this function.	1969	* him/her-self and all object carried by a call to this function.
2190	*/	1970	*/
2191
2192	void	1971	void
2193	set_cheat (object *op)	1972	set_cheat (object *op)
2194	{	1973	{
2195	SET_FLAG (op, FLAG_WAS_WIZ);	1974	SET_FLAG (op, FLAG_WAS_WIZ);
2196	flag_inv (op, FLAG_WAS_WIZ);	1975	flag_inv (op, FLAG_WAS_WIZ);
…		…
2215	* because arch_blocked (now ob_blocked) needs to know the movement type	1994	* because arch_blocked (now ob_blocked) needs to know the movement type
2216	* to know if the space in question will block the object. We can't use	1995	* to know if the space in question will block the object. We can't use
2217	* the archetype because that isn't correct if the monster has been	1996	* the archetype because that isn't correct if the monster has been
2218	* customized, changed states, etc.	1997	* customized, changed states, etc.
2219	*/	1998	*/
2220
2221	int	1999	int
2222	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2000	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2223	{	2001	{
2224	int
2225	i,
2226	index = 0, flag;	2002	int index = 0, flag;
2227	static int
2228	altern[SIZEOFFREE];	2003	int altern[SIZEOFFREE];
2229		2004
2230	for (i = start; i < stop; i++)	2005	for (int i = start; i < stop; i++)
2231	{	2006	{
2232	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2007	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2233	if (!flag)	2008	if (!flag)
2234	altern[index++] = i;	2009	altern [index++] = i;
2235		2010
2236	/* Basically, if we find a wall on a space, we cut down the search size.	2011	/* Basically, if we find a wall on a space, we cut down the search size.
2237	* In this way, we won't return spaces that are on another side of a wall.	2012	* In this way, we won't return spaces that are on another side of a wall.
2238	* This mostly work, but it cuts down the search size in all directions -	2013	* This mostly work, but it cuts down the search size in all directions -
2239	* if the space being examined only has a wall to the north and empty	2014	* if the space being examined only has a wall to the north and empty
2240	* spaces in all the other directions, this will reduce the search space	2015	* spaces in all the other directions, this will reduce the search space
2241	* to only the spaces immediately surrounding the target area, and	2016	* to only the spaces immediately surrounding the target area, and
2242	* won't look 2 spaces south of the target space.	2017	* won't look 2 spaces south of the target space.
2243	*/	2018	*/
2244	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2019	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2245	stop = maxfree[i];	2020	stop = maxfree[i];
2246	}	2021	}
		2022
2247	if (!index)	2023	if (!index)
2248	return -1;	2024	return -1;
		2025
2249	return altern[RANDOM () % index];	2026	return altern[RANDOM () % index];
2250	}	2027	}
2251		2028
2252	/*	2029	/*
2253	* find_first_free_spot(archetype, mapstruct, x, y) works like	2030	* find_first_free_spot(archetype, maptile, x, y) works like
2254	* find_free_spot(), but it will search max number of squares.	2031	* find_free_spot(), but it will search max number of squares.
2255	* But it will return the first available spot, not a random choice.	2032	* But it will return the first available spot, not a random choice.
2256	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2033	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2257	*/	2034	*/
2258
2259	int	2035	int
2260	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2036	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2261	{	2037	{
2262	int
2263	i;
2264
2265	for (i = 0; i < SIZEOFFREE; i++)	2038	for (int i = 0; i < SIZEOFFREE; i++)
2266	{
2267	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2039	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2268	return i;	2040	return i;
2269	}	2041
2270	return -1;	2042	return -1;
2271	}	2043	}
2272		2044
2273	/*	2045	/*
2274	* The function permute(arr, begin, end) randomly reorders the array	2046	* The function permute(arr, begin, end) randomly reorders the array
2275	* arr[begin..end-1].	2047	* arr[begin..end-1].
		2048	* now uses a fisher-yates shuffle, old permute was broken
2276	*/	2049	*/
2277	static void	2050	static void
2278	permute (int *arr, int begin, int end)	2051	permute (int *arr, int begin, int end)
2279	{	2052	{
2280	int	2053	arr += begin;
2281	i,
2282	j,
2283	tmp,
2284	len;
2285
2286	len = end - begin;	2054	end -= begin;
2287	for (i = begin; i < end; i++)
2288	{
2289	j = begin + RANDOM () % len;
2290		2055
2291	tmp = arr[i];	2056	while (--end)
2292	arr[i] = arr[j];	2057	swap (arr [end], arr [RANDOM () % (end + 1)]);
2293	arr[j] = tmp;
2294	}
2295	}	2058	}
2296		2059
2297	/* new function to make monster searching more efficient, and effective!	2060	/* new function to make monster searching more efficient, and effective!
2298	* This basically returns a randomized array (in the passed pointer) of	2061	* This basically returns a randomized array (in the passed pointer) of
2299	* the spaces to find monsters. In this way, it won't always look for	2062	* the spaces to find monsters. In this way, it won't always look for
…		…
2302	* the 3x3 area will be searched, just not in a predictable order.	2065	* the 3x3 area will be searched, just not in a predictable order.
2303	*/	2066	*/
2304	void	2067	void
2305	get_search_arr (int *search_arr)	2068	get_search_arr (int *search_arr)
2306	{	2069	{
2307	int	2070	int i;
2308	i;
2309		2071
2310	for (i = 0; i < SIZEOFFREE; i++)	2072	for (i = 0; i < SIZEOFFREE; i++)
2311	{
2312	search_arr[i] = i;	2073	search_arr[i] = i;
2313	}
2314		2074
2315	permute (search_arr, 1, SIZEOFFREE1 + 1);	2075	permute (search_arr, 1, SIZEOFFREE1 + 1);
2316	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2076	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2317	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2077	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2318	}	2078	}
…		…
2327	* Perhaps incorrectly, but I'm making the assumption that exclude	2087	* Perhaps incorrectly, but I'm making the assumption that exclude
2328	* is actually want is going to try and move there. We need this info	2088	* is actually want is going to try and move there. We need this info
2329	* because we have to know what movement the thing looking to move	2089	* because we have to know what movement the thing looking to move
2330	* there is capable of.	2090	* there is capable of.
2331	*/	2091	*/
2332
2333	int	2092	int
2334	find_dir (mapstruct *m, int x, int y, object *exclude)	2093	find_dir (maptile *m, int x, int y, object *exclude)
2335	{	2094	{
2336	int
2337	i,
2338	max = SIZEOFFREE, mflags;	2095	int i, max = SIZEOFFREE, mflags;
2339		2096
2340	sint16 nx, ny;	2097	sint16 nx, ny;
2341	object *	2098	object *tmp;
2342	tmp;	2099	maptile *mp;
2343	mapstruct *
2344	mp;
2345		2100
2346	MoveType blocked, move_type;	2101	MoveType blocked, move_type;
2347		2102
2348	if (exclude && exclude->head)	2103	if (exclude && exclude->head)
2349	{	2104	{
…		…
2361	mp = m;	2116	mp = m;
2362	nx = x + freearr_x[i];	2117	nx = x + freearr_x[i];
2363	ny = y + freearr_y[i];	2118	ny = y + freearr_y[i];
2364		2119
2365	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2120	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2121
2366	if (mflags & P_OUT_OF_MAP)	2122	if (mflags & P_OUT_OF_MAP)
2367	{
2368	max = maxfree[i];	2123	max = maxfree[i];
2369	}
2370	else	2124	else
2371	{	2125	{
2372	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2126	mapspace &ms = mp->at (nx, ny);
		2127
		2128	blocked = ms.move_block;
2373		2129
2374	if ((move_type & blocked) == move_type)	2130	if ((move_type & blocked) == move_type)
2375	{
2376	max = maxfree[i];	2131	max = maxfree[i];
2377	}
2378	else if (mflags & P_IS_ALIVE)	2132	else if (mflags & P_IS_ALIVE)
2379	{	2133	{
2380	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2134	for (tmp = ms.bot; tmp; tmp = tmp->above)
2381	{	2135	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2382	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2136	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2383	{
2384	break;	2137	break;
2385	}	2138
2386	}
2387	if (tmp)	2139	if (tmp)
2388	{
2389	return freedir[i];	2140	return freedir[i];
2390	}
2391	}	2141	}
2392	}	2142	}
2393	}	2143	}
		2144
2394	return 0;	2145	return 0;
2395	}	2146	}
2396		2147
2397	/*	2148	/*
2398	* distance(object 1, object 2) will return the square of the	2149	* distance(object 1, object 2) will return the square of the
2399	* distance between the two given objects.	2150	* distance between the two given objects.
2400	*/	2151	*/
2401
2402	int	2152	int
2403	distance (const object *ob1, const object *ob2)	2153	distance (const object *ob1, const object *ob2)
2404	{	2154	{
2405	int
2406	i;
2407
2408	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2155	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2409	return i;
2410	}	2156	}
2411		2157
2412	/*	2158	/*
2413	* find_dir_2(delta-x,delta-y) will return a direction in which	2159	* find_dir_2(delta-x,delta-y) will return a direction in which
2414	* an object which has subtracted the x and y coordinates of another	2160	* an object which has subtracted the x and y coordinates of another
2415	* object, needs to travel toward it.	2161	* object, needs to travel toward it.
2416	*/	2162	*/
2417
2418	int	2163	int
2419	find_dir_2 (int x, int y)	2164	find_dir_2 (int x, int y)
2420	{	2165	{
2421	int	2166	int q;
2422	q;
2423		2167
2424	if (y)	2168	if (y)
2425	q = x * 100 / y;	2169	q = x * 100 / y;
2426	else if (x)	2170	else if (x)
2427	q = -300 * x;	2171	q = -300 * x;
…		…
2462	int	2206	int
2463	absdir (int d)	2207	absdir (int d)
2464	{	2208	{
2465	while (d < 1)	2209	while (d < 1)
2466	d += 8;	2210	d += 8;
		2211
2467	while (d > 8)	2212	while (d > 8)
2468	d -= 8;	2213	d -= 8;
		2214
2469	return d;	2215	return d;
2470	}	2216	}
2471		2217
2472	/*	2218	/*
2473	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2475	*/	2221	*/
2476		2222
2477	int	2223	int
2478	dirdiff (int dir1, int dir2)	2224	dirdiff (int dir1, int dir2)
2479	{	2225	{
2480	int	2226	int d;
2481	d;
2482		2227
2483	d = abs (dir1 - dir2);	2228	d = abs (dir1 - dir2);
2484	if (d > 4)	2229	if (d > 4)
2485	d = 8 - d;	2230	d = 8 - d;
		2231
2486	return d;	2232	return d;
2487	}	2233	}
2488		2234
2489	/* peterm:	2235	/* peterm:
2490	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2236	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2493	* This basically means that if direction is 15, then it could either go	2239	* This basically means that if direction is 15, then it could either go
2494	* direction 4, 14, or 16 to get back to where we are.	2240	* direction 4, 14, or 16 to get back to where we are.
2495	* Moved from spell_util.c to object.c with the other related direction	2241	* Moved from spell_util.c to object.c with the other related direction
2496	* functions.	2242	* functions.
2497	*/	2243	*/
2498
2499	int
2500	reduction_dir[SIZEOFFREE][3] = {	2244	int reduction_dir[SIZEOFFREE][3] = {
2501	{0, 0, 0}, /* 0 */	2245	{0, 0, 0}, /* 0 */
2502	{0, 0, 0}, /* 1 */	2246	{0, 0, 0}, /* 1 */
2503	{0, 0, 0}, /* 2 */	2247	{0, 0, 0}, /* 2 */
2504	{0, 0, 0}, /* 3 */	2248	{0, 0, 0}, /* 3 */
2505	{0, 0, 0}, /* 4 */	2249	{0, 0, 0}, /* 4 */
…		…
2553	* find a path to that monster that we found. If not,	2297	* find a path to that monster that we found. If not,
2554	* we don't bother going toward it. Returns 1 if we	2298	* we don't bother going toward it. Returns 1 if we
2555	* can see a direct way to get it	2299	* can see a direct way to get it
2556	* Modified to be map tile aware -.MSW	2300	* Modified to be map tile aware -.MSW
2557	*/	2301	*/
2558
2559
2560	int	2302	int
2561	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2303	can_see_monsterP (maptile *m, int x, int y, int dir)
2562	{	2304	{
2563	sint16 dx, dy;	2305	sint16 dx, dy;
2564	int
2565	mflags;	2306	int mflags;
2566		2307
2567	if (dir < 0)	2308	if (dir < 0)
2568	return 0; /* exit condition: invalid direction */	2309	return 0; /* exit condition: invalid direction */
2569		2310
2570	dx = x + freearr_x[dir];	2311	dx = x + freearr_x[dir];
…		…
2583	return 0;	2324	return 0;
2584		2325
2585	/* yes, can see. */	2326	/* yes, can see. */
2586	if (dir < 9)	2327	if (dir < 9)
2587	return 1;	2328	return 1;
		2329
2588	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2330	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2589	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2331	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2332	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2590	}	2333	}
2591
2592
2593		2334
2594	/*	2335	/*
2595	* can_pick(picker, item): finds out if an object is possible to be	2336	* can_pick(picker, item): finds out if an object is possible to be
2596	* picked up by the picker. Returnes 1 if it can be	2337	* picked up by the picker. Returnes 1 if it can be
2597	* picked up, otherwise 0.	2338	* picked up, otherwise 0.
…		…
2608	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2349	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2609	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2350	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2610	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2351	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2611	}	2352	}
2612		2353
2613
2614	/*	2354	/*
2615	* create clone from object to another	2355	* create clone from object to another
2616	*/	2356	*/
2617	object *	2357	object *
2618	object_create_clone (object *asrc)	2358	object_create_clone (object *asrc)
2619	{	2359	{
2620	object *
2621	dst = NULL, *tmp, *src, *part, *prev, *item;	2360	object *dst = 0, *tmp, *src, *part, *prev, *item;
2622		2361
2623	if (!asrc)	2362	if (!asrc)
2624	return NULL;	2363	return 0;
		2364
2625	src = asrc;	2365	src = asrc;
2626	if (src->head)	2366	if (src->head)
2627	src = src->head;	2367	src = src->head;
2628		2368
2629	prev = NULL;	2369	prev = 0;
2630	for (part = src; part; part = part->more)	2370	for (part = src; part; part = part->more)
2631	{	2371	{
2632	tmp = get_object ();	2372	tmp = part->clone ();
2633	copy_object (part, tmp);
2634	tmp->x -= src->x;	2373	tmp->x -= src->x;
2635	tmp->y -= src->y;	2374	tmp->y -= src->y;
		2375
2636	if (!part->head)	2376	if (!part->head)
2637	{	2377	{
2638	dst = tmp;	2378	dst = tmp;
2639	tmp->head = NULL;	2379	tmp->head = 0;
2640	}	2380	}
2641	else	2381	else
2642	{
2643	tmp->head = dst;	2382	tmp->head = dst;
2644	}	2383
2645	tmp->more = NULL;	2384	tmp->more = 0;
		2385
2646	if (prev)	2386	if (prev)
2647	prev->more = tmp;	2387	prev->more = tmp;
		2388
2648	prev = tmp;	2389	prev = tmp;
2649	}	2390	}
2650		2391
2651	/*** copy inventory ***/
2652	for (item = src->inv; item; item = item->below)	2392	for (item = src->inv; item; item = item->below)
2653	{
2654	(void) insert_ob_in_ob (object_create_clone (item), dst);	2393	insert_ob_in_ob (object_create_clone (item), dst);
2655	}
2656		2394
2657	return dst;	2395	return dst;
2658	}	2396	}
2659		2397
2660	/* return true if the object was destroyed, 0 otherwise */
2661	int
2662	was_destroyed (const object *op, tag_t old_tag)
2663	{
2664	/* checking for FLAG_FREED isn't necessary, but makes this function more
2665	* robust */
2666	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2667	}
2668
2669	/* GROS - Creates an object using a string representing its content. */	2398	/* GROS - Creates an object using a string representing its content. */
2670
2671	/* Basically, we save the content of the string to a temp file, then call */	2399	/* Basically, we save the content of the string to a temp file, then call */
2672
2673	/* load_object on it. I admit it is a highly inefficient way to make things, */	2400	/* load_object on it. I admit it is a highly inefficient way to make things, */
2674
2675	/* but it was simple to make and allows reusing the load_object function. */	2401	/* but it was simple to make and allows reusing the load_object function. */
2676
2677	/* Remember not to use load_object_str in a time-critical situation. */	2402	/* Remember not to use load_object_str in a time-critical situation. */
2678
2679	/* Also remember that multiparts objects are not supported for now. */	2403	/* Also remember that multiparts objects are not supported for now. */
2680
2681	object *	2404	object *
2682	load_object_str (const char *obstr)	2405	load_object_str (const char *obstr)
2683	{	2406	{
2684	object *	2407	object *op;
2685	op;
2686	char
2687	filename[MAX_BUF];	2408	char filename[MAX_BUF];
2688		2409
2689	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2410	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2690		2411
2691	FILE *
2692	tempfile = fopen (filename, "w");	2412	FILE *tempfile = fopen (filename, "w");
2693		2413
2694	if (tempfile == NULL)	2414	if (tempfile == NULL)
2695	{	2415	{
2696	LOG (llevError, "Error - Unable to access load object temp file\n");	2416	LOG (llevError, "Error - Unable to access load object temp file\n");
2697	return NULL;	2417	return NULL;
2698	}	2418	}
2699		2419
2700	fprintf (tempfile, obstr);	2420	fprintf (tempfile, obstr);
2701	fclose (tempfile);	2421	fclose (tempfile);
2702		2422
2703	op = get_object ();	2423	op = object::create ();
2704		2424
2705	object_thawer thawer (filename);	2425	object_thawer thawer (filename);
2706		2426
2707	if (thawer)	2427	if (thawer)
2708	load_object (thawer, op, 0);	2428	load_object (thawer, op, 0);
…		…
2718	* returns NULL if no match.	2438	* returns NULL if no match.
2719	*/	2439	*/
2720	object *	2440	object *
2721	find_obj_by_type_subtype (const object *who, int type, int subtype)	2441	find_obj_by_type_subtype (const object *who, int type, int subtype)
2722	{	2442	{
2723	object *
2724	tmp;
2725
2726	for (tmp = who->inv; tmp; tmp = tmp->below)	2443	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2727	if (tmp->type == type && tmp->subtype == subtype)	2444	if (tmp->type == type && tmp->subtype == subtype)
2728	return tmp;	2445	return tmp;
2729		2446
2730	return NULL;	2447	return 0;
2731	}	2448	}
2732		2449
2733	/* If ob has a field named key, return the link from the list,	2450	/* If ob has a field named key, return the link from the list,
2734	* otherwise return NULL.	2451	* otherwise return NULL.
2735	*	2452	*
…		…
2737	* do the desired thing.	2454	* do the desired thing.
2738	*/	2455	*/
2739	key_value *	2456	key_value *
2740	get_ob_key_link (const object *ob, const char *key)	2457	get_ob_key_link (const object *ob, const char *key)
2741	{	2458	{
2742	key_value *
2743	link;
2744
2745	for (link = ob->key_values; link != NULL; link = link->next)	2459	for (key_value *link = ob->key_values; link; link = link->next)
2746	{
2747	if (link->key == key)	2460	if (link->key == key)
2748	{
2749	return link;	2461	return link;
2750	}
2751	}
2752		2462
2753	return NULL;	2463	return 0;
2754	}	2464	}
2755		2465
2756	/*	2466	/*
2757	* Returns the value of op has an extra_field for key, or NULL.	2467	* Returns the value of op has an extra_field for key, or NULL.
2758	*	2468	*
…		…
2798	* Returns TRUE on success.	2508	* Returns TRUE on success.
2799	*/	2509	*/
2800	int	2510	int
2801	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2511	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2802	{	2512	{
2803	key_value *
2804	field = NULL, *last = NULL;	2513	key_value *field = NULL, *last = NULL;
2805		2514
2806	for (field = op->key_values; field != NULL; field = field->next)	2515	for (field = op->key_values; field != NULL; field = field->next)
2807	{	2516	{
2808	if (field->key != canonical_key)	2517	if (field->key != canonical_key)
2809	{	2518	{
…		…
2837	/* IF we get here, key doesn't exist */	2546	/* IF we get here, key doesn't exist */
2838		2547
2839	/* No field, we'll have to add it. */	2548	/* No field, we'll have to add it. */
2840		2549
2841	if (!add_key)	2550	if (!add_key)
2842	{
2843	return FALSE;	2551	return FALSE;
2844	}	2552
2845	/* There isn't any good reason to store a null	2553	/* There isn't any good reason to store a null
2846	* value in the key/value list. If the archetype has	2554	* value in the key/value list. If the archetype has
2847	* this key, then we should also have it, so shouldn't	2555	* this key, then we should also have it, so shouldn't
2848	* be here. If user wants to store empty strings,	2556	* be here. If user wants to store empty strings,
2849	* should pass in ""	2557	* should pass in ""
…		…
2898	}	2606	}
2899	else	2607	else
2900	item = item->env;	2608	item = item->env;
2901	}	2609	}
2902		2610
		2611
		2612	const char *
		2613	object::flag_desc (char *desc, int len) const
		2614	{
		2615	char *p = desc;
		2616	bool first = true;
		2617
		2618	for (int i = 0; i < NUM_FLAGS; i++)
		2619	{
		2620	if (len <= 10) // magic constant!
		2621	{
		2622	snprintf (p, len, ",...");
		2623	break;
		2624	}
		2625
		2626	if (flag[i])
		2627	{
		2628	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2629	len -= cnt;
		2630	p += cnt;
		2631	first = false;
		2632	}
		2633	}
		2634
		2635	return desc;
		2636	}
		2637
2903	// return a suitable string describing an objetc in enough detail to find it	2638	// return a suitable string describing an objetc in enough detail to find it
2904	const char *	2639	const char *
2905	object::debug_desc (char *info) const	2640	object::debug_desc (char *info) const
2906	{	2641	{
		2642	char flagdesc[512];
2907	char info2[256 * 3];	2643	char info2[256 * 4];
2908	char *p = info;	2644	char *p = info;
2909		2645
2910	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2646	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2911	count,	2647	count, uuid.seq,
2912	&name,	2648	&name,
2913	title ? " " : "",	2649	title ? "\",title:" : "",
2914	title ? (const char *)title : "");	2650	title ? (const char *)title : "",
		2651	flag_desc (flagdesc, 512), type);
2915		2652
2916	if (env)	2653	if (env)
2917	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2654	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2918		2655
2919	if (map)	2656	if (map)
2920	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2657	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2921		2658
2922	return info;	2659	return info;
2923	}	2660	}
2924		2661
2925	const char *	2662	const char *

Diff Legend

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