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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 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);
…		…
862	object::~object ()	673	object::~object ()
863	{	674	{
864	free_key_values (this);	675	free_key_values (this);
865	}	676	}
866		677
		678	static int object_count;
		679
867	void object::link ()	680	void object::link ()
868	{	681	{
869	count = ++ob_count;	682	assert (!index);//D
870	uuid = gen_uuid ();	683	uuid = gen_uuid ();
		684	count = ++object_count;
871		685
872	prev = 0;	686	refcnt_inc ();
873	next = object::first;	687	objects.insert (this);
874
875	if (object::first)
876	object::first->prev = this;
877
878	object::first = this;
879	}	688	}
880		689
881	void object::unlink ()	690	void object::unlink ()
882	{	691	{
883	if (this == object::first)	692	assert (index);//D
884	object::first = next;	693	objects.erase (this);
		694	refcnt_dec ();
		695	}
885		696
886	/* Remove this object from the list of used objects */	697	void
887	if (prev) prev->next = next;	698	object::activate ()
888	if (next) next->prev = prev;	699	{
		700	/* If already on active list, don't do anything */
		701	if (active)
		702	return;
889		703
890	prev = 0;	704	if (has_active_speed ())
891	next = 0;	705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
		748	{
		749	op->flag [flag] = value;
		750	op->set_flag_inv (flag, value);
		751	}
		752	}
		753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	|| !map
		775	|| map->in_memory != MAP_IN_MEMORY
		776	|| ms ().move_block == MOVE_ALL)
		777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
		789
		790	if (op->flag [FLAG_STARTEQUIP]
		791	|| op->flag [FLAG_NO_DROP]
		792	|| op->type == RUNE
		793	|| op->type == TRAP
		794	|| op->flag [FLAG_IS_A_TEMPLATE]
		795	|| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
892	}	801	}
893		802
894	object *object::create ()	803	object *object::create ()
895	{	804	{
896	object *op = new object;	805	object *op = new object;
897	op->link ();	806	op->link ();
898	return op;	807	return op;
899	}	808	}
900		809
901	/*	810	void
902	* free_object() frees everything allocated by an object, removes	811	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	{	812	{
913	if (QUERY_FLAG (this, FLAG_FREED))	813	attachable::do_destroy ();
914	return;
915		814
916	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
		816	remove_button_link (this);
		817
		818	if (flag [FLAG_FRIENDLY])
917	remove_friendly_object (this);	819	remove_friendly_object (this);
918		820
919	if (!QUERY_FLAG (this, FLAG_REMOVED))	821	if (!flag [FLAG_REMOVED])
920	remove_ob (this);	822	remove ();
921		823
922	SET_FLAG (this, FLAG_FREED);	824	destroy_inv (true);
		825
		826	deactivate ();
		827	unlink ();
		828
		829	flag [FLAG_FREED] = 1;
		830
		831	// hack to ensure that freed objects still have a valid map
		832	{
		833	static maptile *freed_map; // freed objects are moved here to avoid crashes
		834
		835	if (!freed_map)
		836	{
		837	freed_map = new maptile;
		838
		839	freed_map->name = "/internal/freed_objects_map";
		840	freed_map->width = 3;
		841	freed_map->height = 3;
		842
		843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
		845	}
		846
		847	map = freed_map;
		848	x = 1;
		849	y = 1;
		850	}
		851
		852	head = 0;
923		853
924	if (more)	854	if (more)
925	{	855	{
926	more->destroy (destroy_inventory);	856	more->destroy ();
927	more = 0;	857	more = 0;
928	}
929
930	if (inv)
931	{
932	/* Only if the space blocks everything do we not process -
933	* if some form of movement is allowed, let objects
934	* drop on that space.
935	*/
936	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
937	{
938	object *op = inv;
939
940	while (op)
941	{
942	object *tmp = op->below;
943	op->destroy (destroy_inventory);
944	op = tmp;
945	}
946	}
947	else
948	{ /* Put objects in inventory onto this space */
949	object *op = inv;
950
951	while (op)
952	{
953	object *tmp = op->below;
954
955	remove_ob (op);
956
957	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959	free_object (op);
960	else
961	{
962	op->x = x;
963	op->y = y;
964	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
965	}
966
967	op = tmp;
968	}
969	}
970	}	858	}
971		859
972	// clear those pointers that likely might have circular references to us	860	// clear those pointers that likely might have circular references to us
973	owner = 0;	861	owner = 0;
974	enemy = 0;	862	enemy = 0;
975	attacked_by = 0;	863	attacked_by = 0;
		864	}
976		865
977	// only relevant for players(?), but make sure of it anyways	866	void
978	contr = 0;	867	object::destroy (bool destroy_inventory)
		868	{
		869	if (destroyed ())
		870	return;
979		871
980	/* Remove object from the active list */	872	if (destroy_inventory)
981	speed = 0;	873	destroy_inv (false);
982	update_ob_speed (this);
983		874
984	unlink ();	875	attachable::destroy ();
985
986	mortals.push_back (this);
987	}	876	}
988		877
989	/*	878	/*
990	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
991	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
992	*/	881	*/
993
994	void	882	void
995	sub_weight (object *op, signed long weight)	883	sub_weight (object *op, signed long weight)
996	{	884	{
997	while (op != NULL)	885	while (op != NULL)
998	{	886	{
…		…
1002	op->carrying -= weight;	890	op->carrying -= weight;
1003	op = op->env;	891	op = op->env;
1004	}	892	}
1005	}	893	}
1006		894
1007	/* remove_ob(op):	895	/* op->remove ():
1008	* This function removes the object op from the linked list of objects	896	* This function removes the object op from the linked list of objects
1009	* which it is currently tied to. When this function is done, the	897	* which it is currently tied to. When this function is done, the
1010	* object will have no environment. If the object previously had an	898	* object will have no environment. If the object previously had an
1011	* environment, the x and y coordinates will be updated to	899	* environment, the x and y coordinates will be updated to
1012	* the previous environment.	900	* the previous environment.
1013	* Beware: This function is called from the editor as well!	901	* Beware: This function is called from the editor as well!
1014	*/	902	*/
1015
1016	void	903	void
1017	remove_ob (object *op)	904	object::remove_slow ()
1018	{	905	{
1019	object *tmp, *last = 0;	906	object *tmp, *last = 0;
1020	object *otmp;	907	object *otmp;
1021		908
1022	int check_walk_off;
1023	maptile *m;
1024
1025	sint16 x, y;
1026
1027	if (QUERY_FLAG (op, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1028	return;	910	return;
1029		911
1030	SET_FLAG (op, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
1031		914
1032	if (op->more != NULL)	915	if (more)
1033	remove_ob (op->more);	916	more->remove ();
1034		917
1035	/*	918	/*
1036	* In this case, the object to be removed is in someones	919	* In this case, the object to be removed is in someones
1037	* inventory.	920	* inventory.
1038	*/	921	*/
1039	if (op->env != NULL)	922	if (env)
1040	{	923	{
1041	if (op->nrof)	924	if (nrof)
1042	sub_weight (op->env, op->weight * op->nrof);	925	sub_weight (env, weight * nrof);
1043	else	926	else
1044	sub_weight (op->env, op->weight + op->carrying);	927	sub_weight (env, weight + carrying);
1045		928
1046	/* NO_FIX_PLAYER is set when a great many changes are being	929	/* NO_FIX_PLAYER is set when a great many changes are being
1047	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1048	* to save cpu time.	931	* to save cpu time.
1049	*/	932	*/
1050	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051	fix_player (otmp);	934	otmp->update_stats ();
1052		935
1053	if (op->above != NULL)	936	if (above)
1054	op->above->below = op->below;	937	above->below = below;
1055	else	938	else
1056	op->env->inv = op->below;	939	env->inv = below;
1057		940
1058	if (op->below != NULL)	941	if (below)
1059	op->below->above = op->above;	942	below->above = above;
1060		943
1061	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
1064	*/	947	*/
1065	op->x = op->env->x, op->y = op->env->y;	948	x = env->x, y = env->y;
1066	op->map = op->env->map;	949	map = env->map;
1067	op->above = NULL, op->below = NULL;	950	above = 0, below = 0;
1068	op->env = NULL;	951	env = 0;
1069	}	952	}
1070	else if (op->map)	953	else if (map)
1071	{	954	{
1072	x = op->x;	955	if (type == PLAYER)
1073	y = op->y;
1074	m = get_map_from_coord (op->map, &x, &y);
1075
1076	if (!m)
1077	{	956	{
1078	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	957	--map->players;
1079	op->map->path, op->x, op->y);	958	map->touch ();
1080	/* in old days, we used to set x and y to 0 and continue.
1081	* it seems if we get into this case, something is probablye
1082	* screwed up and should be fixed.
1083	*/
1084	abort ();
1085	}	959	}
1086		960
1087	if (op->map != m)	961	map->dirty = true;
1088	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	962	mapspace &ms = this->ms ();
1089	op->map->path, m->path, op->x, op->y, x, y);
1090
1091	/* Re did the following section of code - it looks like it had
1092	* lots of logic for things we no longer care about
1093	*/
1094		963
1095	/* link the object above us */	964	/* link the object above us */
1096	if (op->above)	965	if (above)
1097	op->above->below = op->below;	966	above->below = below;
1098	else	967	else
1099	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	968	ms.top = below; /* we were top, set new top */
1100		969
1101	/* Relink the object below us, if there is one */	970	/* Relink the object below us, if there is one */
1102	if (op->below)	971	if (below)
1103	op->below->above = op->above;	972	below->above = above;
1104	else	973	else
1105	{	974	{
1106	/* Nothing below, which means we need to relink map object for this space	975	/* Nothing below, which means we need to relink map object for this space
1107	* use translated coordinates in case some oddness with map tiling is	976	* use translated coordinates in case some oddness with map tiling is
1108	* evident	977	* evident
1109	*/	978	*/
1110	if (GET_MAP_OB (m, x, y) != op)	979	if (GET_MAP_OB (map, x, y) != this)
1111	{
1112	char *dump = dump_object (op);
1113	LOG (llevError,
1114	"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);	980	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 ());
1115	free (dump);
1116	dump = dump_object (GET_MAP_OB (m, x, y));
1117	LOG (llevError, "%s\n", dump);
1118	free (dump);
1119	}
1120		981
1121	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	982	ms.bot = above; /* goes on above it. */
1122	}	983	}
1123		984
1124	op->above = 0;	985	above = 0;
1125	op->below = 0;	986	below = 0;
1126		987
1127	if (op->map->in_memory == MAP_SAVING)	988	if (map->in_memory == MAP_SAVING)
1128	return;	989	return;
1129		990
1130	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	991	int check_walk_off = !flag [FLAG_NO_APPLY];
1131		992
1132	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	993	for (tmp = ms.bot; tmp; tmp = tmp->above)
1133	{	994	{
1134	/* No point updating the players look faces if he is the object	995	/* No point updating the players look faces if he is the object
1135	* being removed.	996	* being removed.
1136	*/	997	*/
1137		998
1138	if (tmp->type == PLAYER && tmp != op)	999	if (tmp->type == PLAYER && tmp != this)
1139	{	1000	{
1140	/* If a container that the player is currently using somehow gets	1001	/* If a container that the player is currently using somehow gets
1141	* removed (most likely destroyed), update the player view	1002	* removed (most likely destroyed), update the player view
1142	* appropriately.	1003	* appropriately.
1143	*/	1004	*/
1144	if (tmp->container == op)	1005	if (tmp->container == this)
1145	{	1006	{
1146	CLEAR_FLAG (op, FLAG_APPLIED);	1007	flag [FLAG_APPLIED] = 0;
1147	tmp->container = NULL;	1008	tmp->container = 0;
1148	}	1009	}
1149		1010
1150	tmp->contr->socket.update_look = 1;	1011	if (tmp->contr->ns)
		1012	tmp->contr->ns->floorbox_update ();
1151	}	1013	}
1152		1014
1153	/* See if player moving off should effect something */	1015	/* See if object moving off should effect something */
1154	if (check_walk_off	1016	if (check_walk_off
1155	&& ((op->move_type & tmp->move_off)	1017	&& ((move_type & tmp->move_off)
1156	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1018	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157	{	1019	{
1158	move_apply (tmp, op, NULL);	1020	move_apply (tmp, this, 0);
1159		1021
1160	if (op->destroyed ())	1022	if (destroyed ())
1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1023	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162	}	1024	}
1163		1025
1164	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1026	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165		1027	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1166	if (tmp->above == tmp)	1028	if (tmp->above == tmp)
1167	tmp->above = NULL;	1029	tmp->above = 0;
1168		1030
1169	last = tmp;	1031	last = tmp;
1170	}	1032	}
1171		1033
1172	/* last == NULL of there are no objects on this space */	1034	/* last == NULL if there are no objects on this space */
		1035	//TODO: this makes little sense, why only update the topmost object?
1173	if (last == NULL)	1036	if (!last)
1174	{	1037	map->at (x, y).flags_ = 0;
1175	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177	* those out anyways, and if there are any flags set right now, they won't
1178	* be correct anyways.
1179	*/
1180	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1181	update_position (op->map, op->x, op->y);
1182	}
1183	else	1038	else
1184	update_object (last, UP_OBJ_REMOVE);	1039	update_object (last, UP_OBJ_REMOVE);
1185		1040
1186	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1041	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1187	update_all_los (op->map, op->x, op->y);	1042	update_all_los (map, x, y);
1188	}	1043	}
1189	}	1044	}
1190		1045
1191	/*	1046	/*
1192	* merge_ob(op,top):	1047	* merge_ob(op,top):
…		…
1200	merge_ob (object *op, object *top)	1055	merge_ob (object *op, object *top)
1201	{	1056	{
1202	if (!op->nrof)	1057	if (!op->nrof)
1203	return 0;	1058	return 0;
1204		1059
1205	if (top == NULL)	1060	if (top)
1206	for (top = op; top != NULL && top->above != NULL; top = top->above);	1061	for (top = op; top && top->above; top = top->above)
		1062	;
1207		1063
1208	for (; top != NULL; top = top->below)	1064	for (; top; top = top->below)
1209	{	1065	{
1210	if (top == op)	1066	if (top == op)
1211	continue;	1067	continue;
1212	if (CAN_MERGE (op, top))	1068
		1069	if (object::can_merge (op, top))
1213	{	1070	{
1214	top->nrof += op->nrof;	1071	top->nrof += op->nrof;
1215		1072
1216	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1073	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217	op->weight = 0; /* Don't want any adjustements now */	1074	op->weight = 0; /* Don't want any adjustements now */
1218	remove_ob (op);	1075	op->destroy ();
1219	free_object (op);
1220	return top;	1076	return top;
1221	}	1077	}
1222	}	1078	}
1223		1079
1224	return 0;	1080	return 0;
1225	}	1081	}
1226		1082
1227	/*	1083	/*
1228	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1084	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1229	* job preparing multi-part monsters	1085	* job preparing multi-part monsters.
1230	*/	1086	*/
1231	object *	1087	object *
1232	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1088	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1233	{	1089	{
1234	object *tmp;
1235
1236	if (op->head)
1237	op = op->head;
1238
1239	for (tmp = op; tmp; tmp = tmp->more)	1090	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1240	{	1091	{
1241	tmp->x = x + tmp->arch->clone.x;	1092	tmp->x = x + tmp->arch->clone.x;
1242	tmp->y = y + tmp->arch->clone.y;	1093	tmp->y = y + tmp->arch->clone.y;
1243	}	1094	}
1244		1095
…		…
1263	* Return value:	1114	* Return value:
1264	* new object if 'op' was merged with other object	1115	* new object if 'op' was merged with other object
1265	* NULL if 'op' was destroyed	1116	* NULL if 'op' was destroyed
1266	* just 'op' otherwise	1117	* just 'op' otherwise
1267	*/	1118	*/
1268
1269	object *	1119	object *
1270	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1120	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271	{	1121	{
1272	object *tmp, *top, *floor = NULL;	1122	object *tmp, *top, *floor = NULL;
1273	sint16 x, y;
1274		1123
1275	if (QUERY_FLAG (op, FLAG_FREED))	1124	if (QUERY_FLAG (op, FLAG_FREED))
1276	{	1125	{
1277	LOG (llevError, "Trying to insert freed object!\n");	1126	LOG (llevError, "Trying to insert freed object!\n");
1278	return NULL;	1127	return NULL;
1279	}	1128	}
1280		1129
1281	if (m == NULL)	1130	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1131	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1132
		1133	op->remove ();
		1134
		1135	if (!m)
1282	{	1136	{
1283	char *dump = dump_object (op);	1137	char *dump = dump_object (op);
1284	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1138	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1285	free (dump);	1139	free (dump);
1286	return op;	1140	return op;
…		…
1299	#endif	1153	#endif
1300	free (dump);	1154	free (dump);
1301	return op;	1155	return op;
1302	}	1156	}
1303		1157
1304	if (!QUERY_FLAG (op, FLAG_REMOVED))
1305	{
1306	char *dump = dump_object (op);
1307	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1308	free (dump);
1309	return op;
1310	}
1311
1312	if (op->more != NULL)
1313	{
1314	/* The part may be on a different map. */
1315
1316	object *more = op->more;	1158	if (object *more = op->more)
1317		1159	{
1318	/* We really need the caller to normalize coordinates - if
1319	* we set the map, that doesn't work if the location is within
1320	* a map and this is straddling an edge. So only if coordinate
1321	* is clear wrong do we normalize it.
1322	*/
1323	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1324	more->map = get_map_from_coord (m, &more->x, &more->y);
1325	else if (!more->map)
1326	{
1327	/* For backwards compatibility - when not dealing with tiled maps,
1328	* more->map should always point to the parent.
1329	*/
1330	more->map = m;
1331	}
1332
1333	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1160	if (!insert_ob_in_map (more, m, originator, flag))
1334	{	1161	{
1335	if (!op->head)	1162	if (!op->head)
1336	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1163	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1337		1164
1338	return NULL;	1165	return 0;
1339	}	1166	}
1340	}	1167	}
1341		1168
1342	CLEAR_FLAG (op, FLAG_REMOVED);	1169	CLEAR_FLAG (op, FLAG_REMOVED);
1343		1170
1344	/* Ideally, the caller figures this out. However, it complicates a lot	1171	/* Ideally, the caller figures this out. However, it complicates a lot
1345	* of areas of callers (eg, anything that uses find_free_spot would now	1172	* of areas of callers (eg, anything that uses find_free_spot would now
1346	* need extra work	1173	* need extra work
1347	*/	1174	*/
1348	op->map = get_map_from_coord (m, &op->x, &op->y);	1175	if (!xy_normalise (m, op->x, op->y))
1349	x = op->x;	1176	return 0;
1350	y = op->y;	1177
		1178	op->map = m;
		1179	mapspace &ms = op->ms ();
1351		1180
1352	/* this has to be done after we translate the coordinates.	1181	/* this has to be done after we translate the coordinates.
1353	*/	1182	*/
1354	if (op->nrof && !(flag & INS_NO_MERGE))	1183	if (op->nrof && !(flag & INS_NO_MERGE))
1355	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1184	for (tmp = ms.bot; tmp; tmp = tmp->above)
1356	if (CAN_MERGE (op, tmp))	1185	if (object::can_merge (op, tmp))
1357	{	1186	{
1358	op->nrof += tmp->nrof;	1187	op->nrof += tmp->nrof;
1359	remove_ob (tmp);	1188	tmp->destroy ();
1360	free_object (tmp);
1361	}	1189	}
1362		1190
1363	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1191	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1192	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365		1193
…		…
1378	op->below = originator->below;	1206	op->below = originator->below;
1379		1207
1380	if (op->below)	1208	if (op->below)
1381	op->below->above = op;	1209	op->below->above = op;
1382	else	1210	else
1383	SET_MAP_OB (op->map, op->x, op->y, op);	1211	ms.bot = op;
1384		1212
1385	/* since *below* originator, no need to update top */	1213	/* since *below* originator, no need to update top */
1386	originator->below = op;	1214	originator->below = op;
1387	}	1215	}
1388	else	1216	else
1389	{	1217	{
		1218	top = ms.bot;
		1219
1390	/* If there are other objects, then */	1220	/* If there are other objects, then */
1391	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1221	if ((!(flag & INS_MAP_LOAD)) && top)
1392	{	1222	{
1393	object *last = NULL;	1223	object *last = 0;
1394		1224
1395	/*	1225	/*
1396	* If there are multiple objects on this space, we do some trickier handling.	1226	* If there are multiple objects on this space, we do some trickier handling.
1397	* We've already dealt with merging if appropriate.	1227	* We've already dealt with merging if appropriate.
1398	* Generally, we want to put the new object on top. But if	1228	* Generally, we want to put the new object on top. But if
…		…
1402	* once we get to them. This reduces the need to traverse over all of	1232	* once we get to them. This reduces the need to traverse over all of
1403	* them when adding another one - this saves quite a bit of cpu time	1233	* them when adding another one - this saves quite a bit of cpu time
1404	* when lots of spells are cast in one area. Currently, it is presumed	1234	* when lots of spells are cast in one area. Currently, it is presumed
1405	* that flying non pickable objects are spell objects.	1235	* that flying non pickable objects are spell objects.
1406	*/	1236	*/
1407		1237	for (top = ms.bot; top; top = top->above)
1408	while (top != NULL)
1409	{	1238	{
1410	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1239	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1411	floor = top;	1240	floor = top;
1412		1241
1413	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1242	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1416	top = top->below;	1245	top = top->below;
1417	break;	1246	break;
1418	}	1247	}
1419		1248
1420	last = top;	1249	last = top;
1421	top = top->above;
1422	}	1250	}
1423		1251
1424	/* Don't want top to be NULL, so set it to the last valid object */	1252	/* Don't want top to be NULL, so set it to the last valid object */
1425	top = last;	1253	top = last;
1426		1254
…		…
1433	* Unless those objects are exits, type 66	1261	* Unless those objects are exits, type 66
1434	* If INS_ON_TOP is used, don't do this processing	1262	* If INS_ON_TOP is used, don't do this processing
1435	* Need to find the object that in fact blocks view, otherwise	1263	* Need to find the object that in fact blocks view, otherwise
1436	* stacking is a bit odd.	1264	* stacking is a bit odd.
1437	*/	1265	*/
1438	if (!(flag & INS_ON_TOP) &&	1266	if (!(flag & INS_ON_TOP)
1439	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1267	&& ms.flags () & P_BLOCKSVIEW
		1268	&& (op->face && !op->face->visibility))
1440	{	1269	{
1441	for (last = top; last != floor; last = last->below)	1270	for (last = top; last != floor; last = last->below)
1442	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1271	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1443	break;	1272	break;
		1273
1444	/* Check to see if we found the object that blocks view,	1274	/* Check to see if we found the object that blocks view,
1445	* and make sure we have a below pointer for it so that	1275	* and make sure we have a below pointer for it so that
1446	* we can get inserted below this one, which requires we	1276	* we can get inserted below this one, which requires we
1447	* set top to the object below us.	1277	* set top to the object below us.
1448	*/	1278	*/
…		…
1450	top = last->below;	1280	top = last->below;
1451	}	1281	}
1452	} /* If objects on this space */	1282	} /* If objects on this space */
1453		1283
1454	if (flag & INS_MAP_LOAD)	1284	if (flag & INS_MAP_LOAD)
1455	top = GET_MAP_TOP (op->map, op->x, op->y);	1285	top = ms.top;
1456		1286
1457	if (flag & INS_ABOVE_FLOOR_ONLY)	1287	if (flag & INS_ABOVE_FLOOR_ONLY)
1458	top = floor;	1288	top = floor;
1459		1289
1460	/* Top is the object that our object (op) is going to get inserted above.	1290	/* Top is the object that our object (op) is going to get inserted above.
1461	*/	1291	*/
1462		1292
1463	/* First object on this space */	1293	/* First object on this space */
1464	if (!top)	1294	if (!top)
1465	{	1295	{
1466	op->above = GET_MAP_OB (op->map, op->x, op->y);	1296	op->above = ms.bot;
1467		1297
1468	if (op->above)	1298	if (op->above)
1469	op->above->below = op;	1299	op->above->below = op;
1470		1300
1471	op->below = NULL;	1301	op->below = 0;
1472	SET_MAP_OB (op->map, op->x, op->y, op);	1302	ms.bot = op;
1473	}	1303	}
1474	else	1304	else
1475	{ /* get inserted into the stack above top */	1305	{ /* get inserted into the stack above top */
1476	op->above = top->above;	1306	op->above = top->above;
1477		1307
…		…
1480		1310
1481	op->below = top;	1311	op->below = top;
1482	top->above = op;	1312	top->above = op;
1483	}	1313	}
1484		1314
1485	if (op->above == NULL)	1315	if (!op->above)
1486	SET_MAP_TOP (op->map, op->x, op->y, op);	1316	ms.top = op;
1487	} /* else not INS_BELOW_ORIGINATOR */	1317	} /* else not INS_BELOW_ORIGINATOR */
1488		1318
1489	if (op->type == PLAYER)	1319	if (op->type == PLAYER)
		1320	{
1490	op->contr->do_los = 1;	1321	op->contr->do_los = 1;
		1322	++op->map->players;
		1323	op->map->touch ();
		1324	}
		1325
		1326	op->map->dirty = true;
1491		1327
1492	/* If we have a floor, we know the player, if any, will be above	1328	/* If we have a floor, we know the player, if any, will be above
1493	* it, so save a few ticks and start from there.	1329	* it, so save a few ticks and start from there.
1494	*/	1330	*/
1495	if (!(flag & INS_MAP_LOAD))	1331	if (!(flag & INS_MAP_LOAD))
1496	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1332	if (object *pl = ms.player ())
1497	if (tmp->type == PLAYER)	1333	if (pl->contr->ns)
1498	tmp->contr->socket.update_look = 1;	1334	pl->contr->ns->floorbox_update ();
1499		1335
1500	/* If this object glows, it may affect lighting conditions that are	1336	/* If this object glows, it may affect lighting conditions that are
1501	* visible to others on this map. But update_all_los is really	1337	* visible to others on this map. But update_all_los is really
1502	* an inefficient way to do this, as it means los for all players	1338	* an inefficient way to do this, as it means los for all players
1503	* on the map will get recalculated. The players could very well	1339	* on the map will get recalculated. The players could very well
1504	* be far away from this change and not affected in any way -	1340	* be far away from this change and not affected in any way -
1505	* this should get redone to only look for players within range,	1341	* this should get redone to only look for players within range,
1506	* or just updating the P_NEED_UPDATE for spaces within this area	1342	* or just updating the P_UPTODATE for spaces within this area
1507	* of effect may be sufficient.	1343	* of effect may be sufficient.
1508	*/	1344	*/
1509	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1345	if (op->map->darkness && (op->glow_radius != 0))
1510	update_all_los (op->map, op->x, op->y);	1346	update_all_los (op->map, op->x, op->y);
1511		1347
1512	/* updates flags (blocked, alive, no magic, etc) for this map space */	1348	/* updates flags (blocked, alive, no magic, etc) for this map space */
1513	update_object (op, UP_OBJ_INSERT);	1349	update_object (op, UP_OBJ_INSERT);
1514		1350
		1351	INVOKE_OBJECT (INSERT, op);
		1352
1515	/* Don't know if moving this to the end will break anything. However,	1353	/* Don't know if moving this to the end will break anything. However,
1516	* we want to have update_look set above before calling this.	1354	* we want to have floorbox_update called before calling this.
1517	*	1355	*
1518	* check_move_on() must be after this because code called from	1356	* check_move_on() must be after this because code called from
1519	* check_move_on() depends on correct map flags (so functions like	1357	* check_move_on() depends on correct map flags (so functions like
1520	* blocked() and wall() work properly), and these flags are updated by	1358	* blocked() and wall() work properly), and these flags are updated by
1521	* update_object().	1359	* update_object().
…		…
1523		1361
1524	/* if this is not the head or flag has been passed, don't check walk on status */	1362	/* if this is not the head or flag has been passed, don't check walk on status */
1525	if (!(flag & INS_NO_WALK_ON) && !op->head)	1363	if (!(flag & INS_NO_WALK_ON) && !op->head)
1526	{	1364	{
1527	if (check_move_on (op, originator))	1365	if (check_move_on (op, originator))
1528	return NULL;	1366	return 0;
1529		1367
1530	/* If we are a multi part object, lets work our way through the check	1368	/* If we are a multi part object, lets work our way through the check
1531	* walk on's.	1369	* walk on's.
1532	*/	1370	*/
1533	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1371	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1534	if (check_move_on (tmp, originator))	1372	if (check_move_on (tmp, originator))
1535	return NULL;	1373	return 0;
1536	}	1374	}
1537		1375
1538	return op;	1376	return op;
1539	}	1377	}
1540		1378
1541	/* this function inserts an object in the map, but if it	1379	/* this function inserts an object in the map, but if it
1542	* finds an object of its own type, it'll remove that one first.	1380	* finds an object of its own type, it'll remove that one first.
1543	* op is the object to insert it under: supplies x and the map.	1381	* op is the object to insert it under: supplies x and the map.
1544	*/	1382	*/
1545	void	1383	void
1546	replace_insert_ob_in_map (const char *arch_string, object *op)	1384	replace_insert_ob_in_map (const char *arch_string, object *op)
1547	{	1385	{
1548	object *	1386	object *tmp, *tmp1;
1549	tmp;
1550	object *
1551	tmp1;
1552		1387
1553	/* first search for itself and remove any old instances */	1388	/* first search for itself and remove any old instances */
1554		1389
1555	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1390	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1556	{
1557	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1391	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558	{	1392	tmp->destroy ();
1559	remove_ob (tmp);
1560	free_object (tmp);
1561	}
1562	}
1563		1393
1564	tmp1 = arch_to_object (archetype::find (arch_string));	1394	tmp1 = arch_to_object (archetype::find (arch_string));
1565		1395
1566	tmp1->x = op->x;	1396	tmp1->x = op->x;
1567	tmp1->y = op->y;	1397	tmp1->y = op->y;
1568	insert_ob_in_map (tmp1, op->map, op, 0);	1398	insert_ob_in_map (tmp1, op->map, op, 0);
		1399	}
		1400
		1401	object *
		1402	object::insert_at (object *where, object *originator, int flags)
		1403	{
		1404	where->map->insert (this, where->x, where->y, originator, flags);
1569	}	1405	}
1570		1406
1571	/*	1407	/*
1572	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1408	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1573	* is returned contains nr objects, and the remaining parts contains	1409	* is returned contains nr objects, and the remaining parts contains
1574	* the rest (or is removed and freed if that number is 0).	1410	* the rest (or is removed and freed if that number is 0).
1575	* On failure, NULL is returned, and the reason put into the	1411	* On failure, NULL is returned, and the reason put into the
1576	* global static errmsg array.	1412	* global static errmsg array.
1577	*/	1413	*/
1578
1579	object *	1414	object *
1580	get_split_ob (object *orig_ob, uint32 nr)	1415	get_split_ob (object *orig_ob, uint32 nr)
1581	{	1416	{
1582	object *	1417	object *newob;
1583	newob;
1584	int
1585	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1418	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586		1419
1587	if (orig_ob->nrof < nr)	1420	if (orig_ob->nrof < nr)
1588	{	1421	{
1589	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1422	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590	return NULL;	1423	return NULL;
1591	}	1424	}
1592		1425
1593	newob = object_create_clone (orig_ob);	1426	newob = object_create_clone (orig_ob);
1594		1427
1595	if ((orig_ob->nrof -= nr) < 1)	1428	if ((orig_ob->nrof -= nr) < 1)
1596	{	1429	orig_ob->destroy (1);
1597	if (!is_removed)
1598	remove_ob (orig_ob);
1599	free_object2 (orig_ob, 1);
1600	}
1601	else if (!is_removed)	1430	else if (!is_removed)
1602	{	1431	{
1603	if (orig_ob->env != NULL)	1432	if (orig_ob->env != NULL)
1604	sub_weight (orig_ob->env, orig_ob->weight * nr);	1433	sub_weight (orig_ob->env, orig_ob->weight * nr);
1605	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1434	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1625		1454
1626	object *	1455	object *
1627	decrease_ob_nr (object *op, uint32 i)	1456	decrease_ob_nr (object *op, uint32 i)
1628	{	1457	{
1629	object *tmp;	1458	object *tmp;
1630	player *pl;
1631		1459
1632	if (i == 0) /* objects with op->nrof require this check */	1460	if (i == 0) /* objects with op->nrof require this check */
1633	return op;	1461	return op;
1634		1462
1635	if (i > op->nrof)	1463	if (i > op->nrof)
1636	i = op->nrof;	1464	i = op->nrof;
1637		1465
1638	if (QUERY_FLAG (op, FLAG_REMOVED))	1466	if (QUERY_FLAG (op, FLAG_REMOVED))
1639	op->nrof -= i;	1467	op->nrof -= i;
1640	else if (op->env != NULL)	1468	else if (op->env)
1641	{	1469	{
1642	/* is this object in the players inventory, or sub container	1470	/* is this object in the players inventory, or sub container
1643	* therein?	1471	* therein?
1644	*/	1472	*/
1645	tmp = is_player_inv (op->env);	1473	tmp = op->in_player ();
1646	/* nope. Is this a container the player has opened?	1474	/* nope. Is this a container the player has opened?
1647	* If so, set tmp to that player.	1475	* If so, set tmp to that player.
1648	* IMO, searching through all the players will mostly	1476	* IMO, searching through all the players will mostly
1649	* likely be quicker than following op->env to the map,	1477	* likely be quicker than following op->env to the map,
1650	* and then searching the map for a player.	1478	* and then searching the map for a player.
1651	*/	1479	*/
1652	if (!tmp)	1480	if (!tmp)
1653	{	1481	for_all_players (pl)
1654	for (pl = first_player; pl; pl = pl->next)
1655	if (pl->ob->container == op->env)	1482	if (pl->ob->container == op->env)
		1483	{
		1484	tmp = pl->ob;
1656	break;	1485	break;
1657	if (pl)
1658	tmp = pl->ob;
1659	else
1660	tmp = NULL;
1661	}	1486	}
1662		1487
1663	if (i < op->nrof)	1488	if (i < op->nrof)
1664	{	1489	{
1665	sub_weight (op->env, op->weight * i);	1490	sub_weight (op->env, op->weight * i);
1666	op->nrof -= i;	1491	op->nrof -= i;
1667	if (tmp)	1492	if (tmp)
1668	{
1669	esrv_send_item (tmp, op);	1493	esrv_send_item (tmp, op);
1670	}
1671	}	1494	}
1672	else	1495	else
1673	{	1496	{
1674	remove_ob (op);	1497	op->remove ();
1675	op->nrof = 0;	1498	op->nrof = 0;
1676	if (tmp)	1499	if (tmp)
1677	{
1678	esrv_del_item (tmp->contr, op->count);	1500	esrv_del_item (tmp->contr, op->count);
1679	}
1680	}	1501	}
1681	}	1502	}
1682	else	1503	else
1683	{	1504	{
1684	object *above = op->above;	1505	object *above = op->above;
1685		1506
1686	if (i < op->nrof)	1507	if (i < op->nrof)
1687	op->nrof -= i;	1508	op->nrof -= i;
1688	else	1509	else
1689	{	1510	{
1690	remove_ob (op);	1511	op->remove ();
1691	op->nrof = 0;	1512	op->nrof = 0;
1692	}	1513	}
1693		1514
1694	/* Since we just removed op, op->above is null */	1515	/* Since we just removed op, op->above is null */
1695	for (tmp = above; tmp != NULL; tmp = tmp->above)	1516	for (tmp = above; tmp; tmp = tmp->above)
1696	if (tmp->type == PLAYER)	1517	if (tmp->type == PLAYER)
1697	{	1518	{
1698	if (op->nrof)	1519	if (op->nrof)
1699	esrv_send_item (tmp, op);	1520	esrv_send_item (tmp, op);
1700	else	1521	else
…		…
1704		1525
1705	if (op->nrof)	1526	if (op->nrof)
1706	return op;	1527	return op;
1707	else	1528	else
1708	{	1529	{
1709	free_object (op);	1530	op->destroy ();
1710	return NULL;	1531	return 0;
1711	}	1532	}
1712	}	1533	}
1713		1534
1714	/*	1535	/*
1715	* add_weight(object, weight) adds the specified weight to an object,	1536	* add_weight(object, weight) adds the specified weight to an object,
…		…
1727	op->carrying += weight;	1548	op->carrying += weight;
1728	op = op->env;	1549	op = op->env;
1729	}	1550	}
1730	}	1551	}
1731		1552
1732	/*
1733	* insert_ob_in_ob(op,environment):
1734	* This function inserts the object op in the linked list
1735	* inside the object environment.
1736	*
1737	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738	* the inventory at the last position or next to other objects of the same
1739	* type.
1740	* Frank: Now sorted by type, archetype and magic!
1741	*
1742	* The function returns now pointer to inserted item, and return value can
1743	* be != op, if items are merged. -Tero
1744	*/
1745
1746	object *	1553	object *
1747	insert_ob_in_ob (object *op, object *where)	1554	insert_ob_in_ob (object *op, object *where)
1748	{	1555	{
1749	object *	1556	if (!where)
1750	tmp, *
1751	otmp;
1752
1753	if (!QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	char *dump = dump_object (op);
1756	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757	free (dump);
1758	return op;
1759	}
1760
1761	if (where == NULL)
1762	{	1557	{
1763	char *dump = dump_object (op);	1558	char *dump = dump_object (op);
1764	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1559	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765	free (dump);	1560	free (dump);
1766	return op;	1561	return op;
1767	}	1562	}
1768		1563
1769	if (where->head)	1564	if (where->head)
1770	{	1565	{
1771	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1566	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772	where = where->head;	1567	where = where->head;
1773	}	1568	}
		1569
		1570	return where->insert (op);
		1571	}
		1572
		1573	/*
		1574	* env->insert (op)
		1575	* This function inserts the object op in the linked list
		1576	* inside the object environment.
		1577	*
		1578	* The function returns now pointer to inserted item, and return value can
		1579	* be != op, if items are merged. -Tero
		1580	*/
		1581
		1582	object *
		1583	object::insert (object *op)
		1584	{
		1585	object *tmp, *otmp;
		1586
		1587	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1588	op->remove ();
1774		1589
1775	if (op->more)	1590	if (op->more)
1776	{	1591	{
1777	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1592	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778	return op;	1593	return op;
…		…
1780		1595
1781	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1596	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782	CLEAR_FLAG (op, FLAG_REMOVED);	1597	CLEAR_FLAG (op, FLAG_REMOVED);
1783	if (op->nrof)	1598	if (op->nrof)
1784	{	1599	{
1785	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1600	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786	if (CAN_MERGE (tmp, op))	1601	if (object::can_merge (tmp, op))
1787	{	1602	{
1788	/* return the original object and remove inserted object	1603	/* return the original object and remove inserted object
1789	(client needs the original object) */	1604	(client needs the original object) */
1790	tmp->nrof += op->nrof;	1605	tmp->nrof += op->nrof;
1791	/* Weight handling gets pretty funky. Since we are adding to	1606	/* Weight handling gets pretty funky. Since we are adding to
1792	* tmp->nrof, we need to increase the weight.	1607	* tmp->nrof, we need to increase the weight.
1793	*/	1608	*/
1794	add_weight (where, op->weight * op->nrof);	1609	add_weight (this, op->weight * op->nrof);
1795	SET_FLAG (op, FLAG_REMOVED);	1610	SET_FLAG (op, FLAG_REMOVED);
1796	free_object (op); /* free the inserted object */	1611	op->destroy (); /* free the inserted object */
1797	op = tmp;	1612	op = tmp;
1798	remove_ob (op); /* and fix old object's links */	1613	op->remove (); /* and fix old object's links */
1799	CLEAR_FLAG (op, FLAG_REMOVED);	1614	CLEAR_FLAG (op, FLAG_REMOVED);
1800	break;	1615	break;
1801	}	1616	}
1802		1617
1803	/* I assume combined objects have no inventory	1618	/* I assume combined objects have no inventory
1804	* We add the weight - this object could have just been removed	1619	* We add the weight - this object could have just been removed
1805	* (if it was possible to merge). calling remove_ob will subtract	1620	* (if it was possible to merge). calling remove_ob will subtract
1806	* the weight, so we need to add it in again, since we actually do	1621	* the weight, so we need to add it in again, since we actually do
1807	* the linking below	1622	* the linking below
1808	*/	1623	*/
1809	add_weight (where, op->weight * op->nrof);	1624	add_weight (this, op->weight * op->nrof);
1810	}	1625	}
1811	else	1626	else
1812	add_weight (where, (op->weight + op->carrying));	1627	add_weight (this, (op->weight + op->carrying));
1813		1628
1814	otmp = is_player_inv (where);	1629	otmp = this->in_player ();
1815	if (otmp && otmp->contr != NULL)	1630	if (otmp && otmp->contr)
1816	{
1817	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1631	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818	fix_player (otmp);	1632	otmp->update_stats ();
1819	}
1820		1633
1821	op->map = NULL;	1634	op->map = 0;
1822	op->env = where;	1635	op->env = this;
1823	op->above = NULL;	1636	op->above = 0;
1824	op->below = NULL;	1637	op->below = 0;
1825	op->x = 0, op->y = 0;	1638	op->x = 0, op->y = 0;
1826		1639
1827	/* reset the light list and los of the players on the map */	1640	/* reset the light list and los of the players on the map */
1828	if ((op->glow_radius != 0) && where->map)	1641	if ((op->glow_radius != 0) && map)
1829	{	1642	{
1830	#ifdef DEBUG_LIGHTS	1643	#ifdef DEBUG_LIGHTS
1831	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1644	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832	#endif /* DEBUG_LIGHTS */	1645	#endif /* DEBUG_LIGHTS */
1833	if (MAP_DARKNESS (where->map))	1646	if (map->darkness)
1834	update_all_los (where->map, where->x, where->y);	1647	update_all_los (map, x, y);
1835	}	1648	}
1836		1649
1837	/* Client has no idea of ordering so lets not bother ordering it here.	1650	/* Client has no idea of ordering so lets not bother ordering it here.
1838	* It sure simplifies this function...	1651	* It sure simplifies this function...
1839	*/	1652	*/
1840	if (where->inv == NULL)	1653	if (!inv)
1841	where->inv = op;	1654	inv = op;
1842	else	1655	else
1843	{	1656	{
1844	op->below = where->inv;	1657	op->below = inv;
1845	op->below->above = op;	1658	op->below->above = op;
1846	where->inv = op;	1659	inv = op;
1847	}	1660	}
		1661
		1662	INVOKE_OBJECT (INSERT, this);
		1663
1848	return op;	1664	return op;
1849	}	1665	}
1850		1666
1851	/*	1667	/*
1852	* Checks if any objects has a move_type that matches objects	1668	* Checks if any objects has a move_type that matches objects
…		…
1866	*	1682	*
1867	* MSW 2001-07-08: Check all objects on space, not just those below	1683	* MSW 2001-07-08: Check all objects on space, not just those below
1868	* object being inserted. insert_ob_in_map may not put new objects	1684	* object being inserted. insert_ob_in_map may not put new objects
1869	* on top.	1685	* on top.
1870	*/	1686	*/
1871
1872	int	1687	int
1873	check_move_on (object *op, object *originator)	1688	check_move_on (object *op, object *originator)
1874	{	1689	{
1875	object *tmp;	1690	object *tmp;
1876	maptile *m = op->map;	1691	maptile *m = op->map;
…		…
1903		1718
1904	/* The objects have to be checked from top to bottom.	1719	/* The objects have to be checked from top to bottom.
1905	* Hence, we first go to the top:	1720	* Hence, we first go to the top:
1906	*/	1721	*/
1907		1722
1908	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1723	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1909	{	1724	{
1910	/* Trim the search when we find the first other spell effect	1725	/* Trim the search when we find the first other spell effect
1911	* this helps performance so that if a space has 50 spell objects,	1726	* this helps performance so that if a space has 50 spell objects,
1912	* we don't need to check all of them.	1727	* we don't need to check all of them.
1913	*/	1728	*/
…		…
1968	/*	1783	/*
1969	* present_arch(arch, map, x, y) searches for any objects with	1784	* present_arch(arch, map, x, y) searches for any objects with
1970	* a matching archetype at the given map and coordinates.	1785	* a matching archetype at the given map and coordinates.
1971	* The first matching object is returned, or NULL if none.	1786	* The first matching object is returned, or NULL if none.
1972	*/	1787	*/
1973
1974	object *	1788	object *
1975	present_arch (const archetype *at, maptile *m, int x, int y)	1789	present_arch (const archetype *at, maptile *m, int x, int y)
1976	{	1790	{
1977	object *
1978	tmp;
1979
1980	if (m == NULL || out_of_map (m, x, y))	1791	if (!m || out_of_map (m, x, y))
1981	{	1792	{
1982	LOG (llevError, "Present_arch called outside map.\n");	1793	LOG (llevError, "Present_arch called outside map.\n");
1983	return NULL;	1794	return NULL;
1984	}	1795	}
1985	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1796
		1797	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1986	if (tmp->arch == at)	1798	if (tmp->arch == at)
1987	return tmp;	1799	return tmp;
		1800
1988	return NULL;	1801	return NULL;
1989	}	1802	}
1990		1803
1991	/*	1804	/*
1992	* present(type, map, x, y) searches for any objects with	1805	* present(type, map, x, y) searches for any objects with
1993	* a matching type variable at the given map and coordinates.	1806	* a matching type variable at the given map and coordinates.
1994	* The first matching object is returned, or NULL if none.	1807	* The first matching object is returned, or NULL if none.
1995	*/	1808	*/
1996
1997	object *	1809	object *
1998	present (unsigned char type, maptile *m, int x, int y)	1810	present (unsigned char type, maptile *m, int x, int y)
1999	{	1811	{
2000	object *
2001	tmp;
2002
2003	if (out_of_map (m, x, y))	1812	if (out_of_map (m, x, y))
2004	{	1813	{
2005	LOG (llevError, "Present called outside map.\n");	1814	LOG (llevError, "Present called outside map.\n");
2006	return NULL;	1815	return NULL;
2007	}	1816	}
2008	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1817
		1818	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2009	if (tmp->type == type)	1819	if (tmp->type == type)
2010	return tmp;	1820	return tmp;
		1821
2011	return NULL;	1822	return NULL;
2012	}	1823	}
2013		1824
2014	/*	1825	/*
2015	* present_in_ob(type, object) searches for any objects with	1826	* present_in_ob(type, object) searches for any objects with
2016	* a matching type variable in the inventory of the given object.	1827	* a matching type variable in the inventory of the given object.
2017	* The first matching object is returned, or NULL if none.	1828	* The first matching object is returned, or NULL if none.
2018	*/	1829	*/
2019
2020	object *	1830	object *
2021	present_in_ob (unsigned char type, const object *op)	1831	present_in_ob (unsigned char type, const object *op)
2022	{	1832	{
2023	object *
2024	tmp;
2025
2026	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1833	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2027	if (tmp->type == type)	1834	if (tmp->type == type)
2028	return tmp;	1835	return tmp;
		1836
2029	return NULL;	1837	return NULL;
2030	}	1838	}
2031		1839
2032	/*	1840	/*
2033	* present_in_ob (type, str, object) searches for any objects with	1841	* present_in_ob (type, str, object) searches for any objects with
…		…
2041	* str is the string to match against. Note that we match against	1849	* str is the string to match against. Note that we match against
2042	* the object name, not the archetype name. this is so that the	1850	* the object name, not the archetype name. this is so that the
2043	* spell code can use one object type (force), but change it's name	1851	* spell code can use one object type (force), but change it's name
2044	* to be unique.	1852	* to be unique.
2045	*/	1853	*/
2046
2047	object *	1854	object *
2048	present_in_ob_by_name (int type, const char *str, const object *op)	1855	present_in_ob_by_name (int type, const char *str, const object *op)
2049	{	1856	{
2050	object *
2051	tmp;
2052
2053	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1857	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2054	{
2055	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1858	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2056	return tmp;	1859	return tmp;
2057	}	1860
2058	return NULL;	1861	return 0;
2059	}	1862	}
2060		1863
2061	/*	1864	/*
2062	* present_arch_in_ob(archetype, object) searches for any objects with	1865	* present_arch_in_ob(archetype, object) searches for any objects with
2063	* a matching archetype in the inventory of the given object.	1866	* a matching archetype in the inventory of the given object.
2064	* The first matching object is returned, or NULL if none.	1867	* The first matching object is returned, or NULL if none.
2065	*/	1868	*/
2066
2067	object *	1869	object *
2068	present_arch_in_ob (const archetype *at, const object *op)	1870	present_arch_in_ob (const archetype *at, const object *op)
2069	{	1871	{
2070	object *
2071	tmp;
2072
2073	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1872	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2074	if (tmp->arch == at)	1873	if (tmp->arch == at)
2075	return tmp;	1874	return tmp;
		1875
2076	return NULL;	1876	return NULL;
2077	}	1877	}
2078		1878
2079	/*	1879	/*
2080	* activate recursively a flag on an object inventory	1880	* activate recursively a flag on an object inventory
2081	*/	1881	*/
2082	void	1882	void
2083	flag_inv (object *op, int flag)	1883	flag_inv (object *op, int flag)
2084	{	1884	{
2085	object *
2086	tmp;
2087
2088	if (op->inv)	1885	if (op->inv)
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1886	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2090	{	1887	{
2091	SET_FLAG (tmp, flag);	1888	SET_FLAG (tmp, flag);
2092	flag_inv (tmp, flag);	1889	flag_inv (tmp, flag);
2093	}	1890	}
2094	} /*	1891	}
		1892
		1893	/*
2095	* desactivate recursively a flag on an object inventory	1894	* deactivate recursively a flag on an object inventory
2096	*/	1895	*/
2097	void	1896	void
2098	unflag_inv (object *op, int flag)	1897	unflag_inv (object *op, int flag)
2099	{	1898	{
2100	object *
2101	tmp;
2102
2103	if (op->inv)	1899	if (op->inv)
2104	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2105	{	1901	{
2106	CLEAR_FLAG (tmp, flag);	1902	CLEAR_FLAG (tmp, flag);
2107	unflag_inv (tmp, flag);	1903	unflag_inv (tmp, flag);
2108	}	1904	}
2109	}	1905	}
…		…
2112	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1908	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2113	* all it's inventory (recursively).	1909	* all it's inventory (recursively).
2114	* If checksums are used, a player will get set_cheat called for	1910	* If checksums are used, a player will get set_cheat called for
2115	* him/her-self and all object carried by a call to this function.	1911	* him/her-self and all object carried by a call to this function.
2116	*/	1912	*/
2117
2118	void	1913	void
2119	set_cheat (object *op)	1914	set_cheat (object *op)
2120	{	1915	{
2121	SET_FLAG (op, FLAG_WAS_WIZ);	1916	SET_FLAG (op, FLAG_WAS_WIZ);
2122	flag_inv (op, FLAG_WAS_WIZ);	1917	flag_inv (op, FLAG_WAS_WIZ);
…		…
2141	* because arch_blocked (now ob_blocked) needs to know the movement type	1936	* because arch_blocked (now ob_blocked) needs to know the movement type
2142	* to know if the space in question will block the object. We can't use	1937	* to know if the space in question will block the object. We can't use
2143	* the archetype because that isn't correct if the monster has been	1938	* the archetype because that isn't correct if the monster has been
2144	* customized, changed states, etc.	1939	* customized, changed states, etc.
2145	*/	1940	*/
2146
2147	int	1941	int
2148	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1942	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2149	{	1943	{
2150	int
2151	i,
2152	index = 0, flag;	1944	int index = 0, flag;
2153	static int
2154	altern[SIZEOFFREE];	1945	int altern[SIZEOFFREE];
2155		1946
2156	for (i = start; i < stop; i++)	1947	for (int i = start; i < stop; i++)
2157	{	1948	{
2158	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1949	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2159	if (!flag)	1950	if (!flag)
2160	altern[index++] = i;	1951	altern [index++] = i;
2161		1952
2162	/* Basically, if we find a wall on a space, we cut down the search size.	1953	/* Basically, if we find a wall on a space, we cut down the search size.
2163	* In this way, we won't return spaces that are on another side of a wall.	1954	* In this way, we won't return spaces that are on another side of a wall.
2164	* This mostly work, but it cuts down the search size in all directions -	1955	* This mostly work, but it cuts down the search size in all directions -
2165	* if the space being examined only has a wall to the north and empty	1956	* if the space being examined only has a wall to the north and empty
2166	* spaces in all the other directions, this will reduce the search space	1957	* spaces in all the other directions, this will reduce the search space
2167	* to only the spaces immediately surrounding the target area, and	1958	* to only the spaces immediately surrounding the target area, and
2168	* won't look 2 spaces south of the target space.	1959	* won't look 2 spaces south of the target space.
2169	*/	1960	*/
2170	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1961	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2171	stop = maxfree[i];	1962	stop = maxfree[i];
2172	}	1963	}
		1964
2173	if (!index)	1965	if (!index)
2174	return -1;	1966	return -1;
		1967
2175	return altern[RANDOM () % index];	1968	return altern[RANDOM () % index];
2176	}	1969	}
2177		1970
2178	/*	1971	/*
2179	* find_first_free_spot(archetype, maptile, x, y) works like	1972	* find_first_free_spot(archetype, maptile, x, y) works like
2180	* find_free_spot(), but it will search max number of squares.	1973	* find_free_spot(), but it will search max number of squares.
2181	* But it will return the first available spot, not a random choice.	1974	* But it will return the first available spot, not a random choice.
2182	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1975	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2183	*/	1976	*/
2184
2185	int	1977	int
2186	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1978	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2187	{	1979	{
2188	int
2189	i;
2190
2191	for (i = 0; i < SIZEOFFREE; i++)	1980	for (int i = 0; i < SIZEOFFREE; i++)
2192	{
2193	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	1981	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2194	return i;	1982	return i;
2195	}	1983
2196	return -1;	1984	return -1;
2197	}	1985	}
2198		1986
2199	/*	1987	/*
2200	* The function permute(arr, begin, end) randomly reorders the array	1988	* The function permute(arr, begin, end) randomly reorders the array
2201	* arr[begin..end-1].	1989	* arr[begin..end-1].
		1990	* now uses a fisher-yates shuffle, old permute was broken
2202	*/	1991	*/
2203	static void	1992	static void
2204	permute (int *arr, int begin, int end)	1993	permute (int *arr, int begin, int end)
2205	{	1994	{
2206	int	1995	arr += begin;
2207	i,
2208	j,
2209	tmp,
2210	len;
2211
2212	len = end - begin;	1996	end -= begin;
2213	for (i = begin; i < end; i++)
2214	{
2215	j = begin + RANDOM () % len;
2216		1997
2217	tmp = arr[i];	1998	while (--end)
2218	arr[i] = arr[j];	1999	swap (arr [end], arr [RANDOM () % (end + 1)]);
2219	arr[j] = tmp;
2220	}
2221	}	2000	}
2222		2001
2223	/* new function to make monster searching more efficient, and effective!	2002	/* new function to make monster searching more efficient, and effective!
2224	* This basically returns a randomized array (in the passed pointer) of	2003	* This basically returns a randomized array (in the passed pointer) of
2225	* the spaces to find monsters. In this way, it won't always look for	2004	* the spaces to find monsters. In this way, it won't always look for
…		…
2228	* the 3x3 area will be searched, just not in a predictable order.	2007	* the 3x3 area will be searched, just not in a predictable order.
2229	*/	2008	*/
2230	void	2009	void
2231	get_search_arr (int *search_arr)	2010	get_search_arr (int *search_arr)
2232	{	2011	{
2233	int	2012	int i;
2234	i;
2235		2013
2236	for (i = 0; i < SIZEOFFREE; i++)	2014	for (i = 0; i < SIZEOFFREE; i++)
2237	{
2238	search_arr[i] = i;	2015	search_arr[i] = i;
2239	}
2240		2016
2241	permute (search_arr, 1, SIZEOFFREE1 + 1);	2017	permute (search_arr, 1, SIZEOFFREE1 + 1);
2242	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2018	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2243	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2019	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2244	}	2020	}
…		…
2253	* Perhaps incorrectly, but I'm making the assumption that exclude	2029	* Perhaps incorrectly, but I'm making the assumption that exclude
2254	* is actually want is going to try and move there. We need this info	2030	* is actually want is going to try and move there. We need this info
2255	* because we have to know what movement the thing looking to move	2031	* because we have to know what movement the thing looking to move
2256	* there is capable of.	2032	* there is capable of.
2257	*/	2033	*/
2258
2259	int	2034	int
2260	find_dir (maptile *m, int x, int y, object *exclude)	2035	find_dir (maptile *m, int x, int y, object *exclude)
2261	{	2036	{
2262	int
2263	i,
2264	max = SIZEOFFREE, mflags;	2037	int i, max = SIZEOFFREE, mflags;
2265		2038
2266	sint16 nx, ny;	2039	sint16 nx, ny;
2267	object *	2040	object *tmp;
2268	tmp;
2269	maptile *	2041	maptile *mp;
2270	mp;
2271		2042
2272	MoveType blocked, move_type;	2043	MoveType blocked, move_type;
2273		2044
2274	if (exclude && exclude->head)	2045	if (exclude && exclude->head)
2275	{	2046	{
…		…
2287	mp = m;	2058	mp = m;
2288	nx = x + freearr_x[i];	2059	nx = x + freearr_x[i];
2289	ny = y + freearr_y[i];	2060	ny = y + freearr_y[i];
2290		2061
2291	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2062	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2063
2292	if (mflags & P_OUT_OF_MAP)	2064	if (mflags & P_OUT_OF_MAP)
2293	{
2294	max = maxfree[i];	2065	max = maxfree[i];
2295	}
2296	else	2066	else
2297	{	2067	{
2298	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2068	mapspace &ms = mp->at (nx, ny);
		2069
		2070	blocked = ms.move_block;
2299		2071
2300	if ((move_type & blocked) == move_type)	2072	if ((move_type & blocked) == move_type)
2301	{
2302	max = maxfree[i];	2073	max = maxfree[i];
2303	}
2304	else if (mflags & P_IS_ALIVE)	2074	else if (mflags & P_IS_ALIVE)
2305	{	2075	{
2306	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2076	for (tmp = ms.bot; tmp; tmp = tmp->above)
2307	{	2077	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2308	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2078	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2309	{
2310	break;	2079	break;
2311	}	2080
2312	}
2313	if (tmp)	2081	if (tmp)
2314	{
2315	return freedir[i];	2082	return freedir[i];
2316	}
2317	}	2083	}
2318	}	2084	}
2319	}	2085	}
		2086
2320	return 0;	2087	return 0;
2321	}	2088	}
2322		2089
2323	/*	2090	/*
2324	* distance(object 1, object 2) will return the square of the	2091	* distance(object 1, object 2) will return the square of the
2325	* distance between the two given objects.	2092	* distance between the two given objects.
2326	*/	2093	*/
2327
2328	int	2094	int
2329	distance (const object *ob1, const object *ob2)	2095	distance (const object *ob1, const object *ob2)
2330	{	2096	{
2331	int
2332	i;
2333
2334	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2097	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2335	return i;
2336	}	2098	}
2337		2099
2338	/*	2100	/*
2339	* find_dir_2(delta-x,delta-y) will return a direction in which	2101	* find_dir_2(delta-x,delta-y) will return a direction in which
2340	* an object which has subtracted the x and y coordinates of another	2102	* an object which has subtracted the x and y coordinates of another
2341	* object, needs to travel toward it.	2103	* object, needs to travel toward it.
2342	*/	2104	*/
2343
2344	int	2105	int
2345	find_dir_2 (int x, int y)	2106	find_dir_2 (int x, int y)
2346	{	2107	{
2347	int	2108	int q;
2348	q;
2349		2109
2350	if (y)	2110	if (y)
2351	q = x * 100 / y;	2111	q = x * 100 / y;
2352	else if (x)	2112	else if (x)
2353	q = -300 * x;	2113	q = -300 * x;
…		…
2378		2138
2379	return 3;	2139	return 3;
2380	}	2140	}
2381		2141
2382	/*	2142	/*
2383	* absdir(int): Returns a number between 1 and 8, which represent
2384	* the "absolute" direction of a number (it actually takes care of
2385	* "overflow" in previous calculations of a direction).
2386	*/
2387
2388	int
2389	absdir (int d)
2390	{
2391	while (d < 1)
2392	d += 8;
2393	while (d > 8)
2394	d -= 8;
2395	return d;
2396	}
2397
2398	/*
2399	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2143	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2400	* between two directions (which are expected to be absolute (see absdir())	2144	* between two directions (which are expected to be absolute (see absdir())
2401	*/	2145	*/
2402
2403	int	2146	int
2404	dirdiff (int dir1, int dir2)	2147	dirdiff (int dir1, int dir2)
2405	{	2148	{
2406	int	2149	int d;
2407	d;
2408		2150
2409	d = abs (dir1 - dir2);	2151	d = abs (dir1 - dir2);
2410	if (d > 4)	2152	if (d > 4)
2411	d = 8 - d;	2153	d = 8 - d;
		2154
2412	return d;	2155	return d;
2413	}	2156	}
2414		2157
2415	/* peterm:	2158	/* peterm:
2416	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2159	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2419	* This basically means that if direction is 15, then it could either go	2162	* This basically means that if direction is 15, then it could either go
2420	* direction 4, 14, or 16 to get back to where we are.	2163	* direction 4, 14, or 16 to get back to where we are.
2421	* Moved from spell_util.c to object.c with the other related direction	2164	* Moved from spell_util.c to object.c with the other related direction
2422	* functions.	2165	* functions.
2423	*/	2166	*/
2424
2425	int
2426	reduction_dir[SIZEOFFREE][3] = {	2167	int reduction_dir[SIZEOFFREE][3] = {
2427	{0, 0, 0}, /* 0 */	2168	{0, 0, 0}, /* 0 */
2428	{0, 0, 0}, /* 1 */	2169	{0, 0, 0}, /* 1 */
2429	{0, 0, 0}, /* 2 */	2170	{0, 0, 0}, /* 2 */
2430	{0, 0, 0}, /* 3 */	2171	{0, 0, 0}, /* 3 */
2431	{0, 0, 0}, /* 4 */	2172	{0, 0, 0}, /* 4 */
…		…
2479	* find a path to that monster that we found. If not,	2220	* find a path to that monster that we found. If not,
2480	* we don't bother going toward it. Returns 1 if we	2221	* we don't bother going toward it. Returns 1 if we
2481	* can see a direct way to get it	2222	* can see a direct way to get it
2482	* Modified to be map tile aware -.MSW	2223	* Modified to be map tile aware -.MSW
2483	*/	2224	*/
2484
2485
2486	int	2225	int
2487	can_see_monsterP (maptile *m, int x, int y, int dir)	2226	can_see_monsterP (maptile *m, int x, int y, int dir)
2488	{	2227	{
2489	sint16 dx, dy;	2228	sint16 dx, dy;
2490	int
2491	mflags;	2229	int mflags;
2492		2230
2493	if (dir < 0)	2231	if (dir < 0)
2494	return 0; /* exit condition: invalid direction */	2232	return 0; /* exit condition: invalid direction */
2495		2233
2496	dx = x + freearr_x[dir];	2234	dx = x + freearr_x[dir];
…		…
2509	return 0;	2247	return 0;
2510		2248
2511	/* yes, can see. */	2249	/* yes, can see. */
2512	if (dir < 9)	2250	if (dir < 9)
2513	return 1;	2251	return 1;
		2252
2514	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2253	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2515	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2254	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2255	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2516	}	2256	}
2517
2518
2519		2257
2520	/*	2258	/*
2521	* can_pick(picker, item): finds out if an object is possible to be	2259	* can_pick(picker, item): finds out if an object is possible to be
2522	* picked up by the picker. Returnes 1 if it can be	2260	* picked up by the picker. Returnes 1 if it can be
2523	* picked up, otherwise 0.	2261	* picked up, otherwise 0.
…		…
2534	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2272	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2535	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2273	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2536	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2274	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2537	}	2275	}
2538		2276
2539
2540	/*	2277	/*
2541	* create clone from object to another	2278	* create clone from object to another
2542	*/	2279	*/
2543	object *	2280	object *
2544	object_create_clone (object *asrc)	2281	object_create_clone (object *asrc)
2545	{	2282	{
2546	object *
2547	dst = NULL, *tmp, *src, *part, *prev, *item;	2283	object *dst = 0, *tmp, *src, *part, *prev, *item;
2548		2284
2549	if (!asrc)	2285	if (!asrc)
2550	return NULL;	2286	return 0;
		2287
2551	src = asrc;	2288	src = asrc;
2552	if (src->head)	2289	if (src->head)
2553	src = src->head;	2290	src = src->head;
2554		2291
2555	prev = NULL;	2292	prev = 0;
2556	for (part = src; part; part = part->more)	2293	for (part = src; part; part = part->more)
2557	{	2294	{
2558	tmp = get_object ();	2295	tmp = part->clone ();
2559	copy_object (part, tmp);
2560	tmp->x -= src->x;	2296	tmp->x -= src->x;
2561	tmp->y -= src->y;	2297	tmp->y -= src->y;
		2298
2562	if (!part->head)	2299	if (!part->head)
2563	{	2300	{
2564	dst = tmp;	2301	dst = tmp;
2565	tmp->head = NULL;	2302	tmp->head = 0;
2566	}	2303	}
2567	else	2304	else
2568	{
2569	tmp->head = dst;	2305	tmp->head = dst;
2570	}	2306
2571	tmp->more = NULL;	2307	tmp->more = 0;
		2308
2572	if (prev)	2309	if (prev)
2573	prev->more = tmp;	2310	prev->more = tmp;
		2311
2574	prev = tmp;	2312	prev = tmp;
2575	}	2313	}
2576		2314
2577	for (item = src->inv; item; item = item->below)	2315	for (item = src->inv; item; item = item->below)
2578	insert_ob_in_ob (object_create_clone (item), dst);	2316	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2584	/* Basically, we save the content of the string to a temp file, then call */	2322	/* Basically, we save the content of the string to a temp file, then call */
2585	/* load_object on it. I admit it is a highly inefficient way to make things, */	2323	/* load_object on it. I admit it is a highly inefficient way to make things, */
2586	/* but it was simple to make and allows reusing the load_object function. */	2324	/* but it was simple to make and allows reusing the load_object function. */
2587	/* Remember not to use load_object_str in a time-critical situation. */	2325	/* Remember not to use load_object_str in a time-critical situation. */
2588	/* Also remember that multiparts objects are not supported for now. */	2326	/* Also remember that multiparts objects are not supported for now. */
2589
2590	object *	2327	object *
2591	load_object_str (const char *obstr)	2328	load_object_str (const char *obstr)
2592	{	2329	{
2593	object *op;	2330	object *op;
2594	char filename[MAX_BUF];	2331	char filename[MAX_BUF];
…		…
2604	}	2341	}
2605		2342
2606	fprintf (tempfile, obstr);	2343	fprintf (tempfile, obstr);
2607	fclose (tempfile);	2344	fclose (tempfile);
2608		2345
2609	op = get_object ();	2346	op = object::create ();
2610		2347
2611	object_thawer thawer (filename);	2348	object_thawer thawer (filename);
2612		2349
2613	if (thawer)	2350	if (thawer)
2614	load_object (thawer, op, 0);	2351	load_object (thawer, op, 0);
…		…
2624	* returns NULL if no match.	2361	* returns NULL if no match.
2625	*/	2362	*/
2626	object *	2363	object *
2627	find_obj_by_type_subtype (const object *who, int type, int subtype)	2364	find_obj_by_type_subtype (const object *who, int type, int subtype)
2628	{	2365	{
2629	object *tmp;
2630
2631	for (tmp = who->inv; tmp; tmp = tmp->below)	2366	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2632	if (tmp->type == type && tmp->subtype == subtype)	2367	if (tmp->type == type && tmp->subtype == subtype)
2633	return tmp;	2368	return tmp;
2634		2369
2635	return NULL;	2370	return 0;
2636	}	2371	}
2637		2372
2638	/* If ob has a field named key, return the link from the list,	2373	/* If ob has a field named key, return the link from the list,
2639	* otherwise return NULL.	2374	* otherwise return NULL.
2640	*	2375	*
…		…
2642	* do the desired thing.	2377	* do the desired thing.
2643	*/	2378	*/
2644	key_value *	2379	key_value *
2645	get_ob_key_link (const object *ob, const char *key)	2380	get_ob_key_link (const object *ob, const char *key)
2646	{	2381	{
2647	key_value *link;
2648
2649	for (link = ob->key_values; link != NULL; link = link->next)	2382	for (key_value *link = ob->key_values; link; link = link->next)
2650	if (link->key == key)	2383	if (link->key == key)
2651	return link;	2384	return link;
2652		2385
2653	return NULL;	2386	return 0;
2654	}	2387	}
2655		2388
2656	/*	2389	/*
2657	* Returns the value of op has an extra_field for key, or NULL.	2390	* Returns the value of op has an extra_field for key, or NULL.
2658	*	2391	*
…		…
2698	* Returns TRUE on success.	2431	* Returns TRUE on success.
2699	*/	2432	*/
2700	int	2433	int
2701	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2434	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2702	{	2435	{
2703	key_value *
2704	field = NULL, *last = NULL;	2436	key_value *field = NULL, *last = NULL;
2705		2437
2706	for (field = op->key_values; field != NULL; field = field->next)	2438	for (field = op->key_values; field != NULL; field = field->next)
2707	{	2439	{
2708	if (field->key != canonical_key)	2440	if (field->key != canonical_key)
2709	{	2441	{
…		…
2737	/* IF we get here, key doesn't exist */	2469	/* IF we get here, key doesn't exist */
2738		2470
2739	/* No field, we'll have to add it. */	2471	/* No field, we'll have to add it. */
2740		2472
2741	if (!add_key)	2473	if (!add_key)
2742	{
2743	return FALSE;	2474	return FALSE;
2744	}	2475
2745	/* There isn't any good reason to store a null	2476	/* There isn't any good reason to store a null
2746	* value in the key/value list. If the archetype has	2477	* value in the key/value list. If the archetype has
2747	* this key, then we should also have it, so shouldn't	2478	* this key, then we should also have it, so shouldn't
2748	* be here. If user wants to store empty strings,	2479	* be here. If user wants to store empty strings,
2749	* should pass in ""	2480	* should pass in ""
…		…
2798	}	2529	}
2799	else	2530	else
2800	item = item->env;	2531	item = item->env;
2801	}	2532	}
2802		2533
		2534
		2535	const char *
		2536	object::flag_desc (char *desc, int len) const
		2537	{
		2538	char *p = desc;
		2539	bool first = true;
		2540
		2541	*p = 0;
		2542
		2543	for (int i = 0; i < NUM_FLAGS; i++)
		2544	{
		2545	if (len <= 10) // magic constant!
		2546	{
		2547	snprintf (p, len, ",...");
		2548	break;
		2549	}
		2550
		2551	if (flag [i])
		2552	{
		2553	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2554	len -= cnt;
		2555	p += cnt;
		2556	first = false;
		2557	}
		2558	}
		2559
		2560	return desc;
		2561	}
		2562
2803	// return a suitable string describing an objetc in enough detail to find it	2563	// return a suitable string describing an object in enough detail to find it
2804	const char *	2564	const char *
2805	object::debug_desc (char *info) const	2565	object::debug_desc (char *info) const
2806	{	2566	{
		2567	char flagdesc[512];
2807	char info2[256 * 3];	2568	char info2[256 * 4];
2808	char *p = info;	2569	char *p = info;
2809		2570
2810	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2571	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2811	count,	2572	count, uuid.seq,
2812	&name,	2573	&name,
2813	title ? " " : "",	2574	title ? "\",title:\"" : "",
2814	title ? (const char *)title : "");	2575	title ? (const char *)title : "",
		2576	flag_desc (flagdesc, 512), type);
2815		2577
2816	if (env)	2578	if (env)
2817	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2579	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2818		2580
2819	if (map)	2581	if (map)
2820	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2582	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2821		2583
2822	return info;	2584	return info;
2823	}	2585	}
2824		2586
2825	const char *	2587	const char *
2826	object::debug_desc () const	2588	object::debug_desc () const
2827	{	2589	{
2828	static char info[256 * 3];	2590	static char info[256 * 4];
2829	return debug_desc (info);	2591	return debug_desc (info);
2830	}	2592	}
2831		2593
		2594	const char *
		2595	object::debug_desc2 () const
		2596	{
		2597	static char info[256 * 4];
		2598	return debug_desc (info);
		2599	}
		2600

Diff Legend

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