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.56 by root, Sun Dec 3 02:04:57 2006 UTC vs.
Revision 1.122 by root, Wed Jan 24 22:42:48 2007 UTC

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

Diff Legend

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