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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.126 by root, Mon Jan 29 15:36:25 2007 UTC

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

Diff Legend

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