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.79 by root, Sat Dec 23 06:30:49 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
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>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.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>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	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,	46	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,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	48	};
46	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,	49	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,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	144	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	145	* different structure or at least keep the lists sorted...
143	*/	146	*/
144		147
145	/* For each field in wants, */	148	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	150	{
148	key_value *has_field;	151	key_value *has_field;
149		152
150	/* Look for a field in has with the same key. */	153	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	154	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	193	* Check nrof variable *before* calling can_merge()
191	*	194	*
192	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
193	* check weight	196	* check weight
194	*/	197	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	199	{
198	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
199	if (ob1 == ob2	201	if (ob1 == ob2
200	|| ob1->type != ob2->type	202	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		224
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		227
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	229	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	230	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	231	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	232	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	233	|| ob1->weight != ob2->weight
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	359	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	361	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
360	*/	363	*/
361
362	char *	364	char *
363	dump_object (object *op)	365	dump_object (object *op)
364	{	366	{
365	if (!op)	367	if (!op)
366	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
367		369
368	object_freezer freezer;	370	object_freezer freezer;
369	save_object (freezer, op, 3);	371	op->write (freezer);
370	return freezer.as_string ();	372	return freezer.as_string ();
371	}	373	}
372		374
373	/*	375	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	393	}
392		394
393	/*	395	/*
394	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
395	*/	397	*/
396
397	object *	398	object *
398	find_object (tag_t i)	399	find_object (tag_t i)
399	{	400	{
400	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
401	if (op->count == i)	402	if (op->count == i)
402	return op;	403	return op;
403		404
404	return 0;	405	return 0;
405	}	406	}
406		407
407	/*	408	/*
408	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
411	*/	412	*/
412
413	object *	413	object *
414	find_object_name (const char *str)	414	find_object_name (const char *str)
415	{	415	{
416	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
417	object *op;	417	object *op;
418		418
419	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
420	if (op->name == str_)	420	if (op->name == str_)
421	break;	421	break;
422		422
423	return op;	423	return op;
424	}	424	}
…		…
450	owner = owner->owner;	450	owner = owner->owner;
451		451
452	this->owner = owner;	452	this->owner = owner;
453	}	453	}
454		454
		455	bool
		456	object::change_weapon (object *ob)
		457	{
		458	if (current_weapon == ob)
		459	return true;
		460
		461	if (chosen_skill)
		462	chosen_skill->flag [FLAG_APPLIED] = false;
		463
		464	current_weapon = ob;
		465	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		466
		467	if (chosen_skill)
		468	chosen_skill->flag [FLAG_APPLIED] = true;
		469
		470	update_stats ();
		471
		472	if (ob)
		473	{
		474	// now check wether any body locations became invalid, in which case
		475	// we cannot apply the weapon at the moment.
		476	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		477	if (slot[i].used < 0)
		478	{
		479	current_weapon = chosen_skill = 0;
		480	update_stats ();
		481
		482	new_draw_info_format (NDI_UNIQUE, 0, this,
		483	"You try to balance your applied items all at once, but the %s is too much. "
		484	"You need to unapply some items first.", &ob->name);
		485	return false;
		486	}
		487
		488	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		489	}
		490	else
		491	new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		492
		493	return true;
		494	}
		495
455	/* Zero the key_values on op, decrementing the shared-string	496	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	497	* refcounts and freeing the links.
457	*/	498	*/
458	static void	499	static void
459	free_key_values (object *op)	500	free_key_values (object *op)
460	{	501	{
461	for (key_value *i = op->key_values; i != 0;)	502	for (key_value *i = op->key_values; i; )
462	{	503	{
463	key_value *next = i->next;	504	key_value *next = i->next;
464	delete i;	505	delete i;
465		506
466	i = next;	507	i = next;
467	}	508	}
468		509
469	op->key_values = 0;	510	op->key_values = 0;
470	}	511	}
471		512
472	/*	513	object &
473	* copy_to first frees everything allocated by the dst object,	514	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	515	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	516	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	517	bool is_removed = flag [FLAG_REMOVED];
485		518
486	*(object_copy *)dst = *this;	519	*(object_copy *)this = src;
487		520
488	if (self || cb)	521	flag [FLAG_FREED] = is_freed;
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	522	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);
493
494	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);
496
497	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499		523
500	/* Copy over key_values, if any. */	524	/* Copy over key_values, if any. */
501	if (key_values)	525	if (src.key_values)
502	{	526	{
503	key_value *tail = 0;	527	key_value *tail = 0;
504	key_value *i;
505
506	dst->key_values = 0;	528	key_values = 0;
507		529
508	for (i = key_values; i; i = i->next)	530	for (key_value *i = src.key_values; i; i = i->next)
509	{	531	{
510	key_value *new_link = new key_value;	532	key_value *new_link = new key_value;
511		533
512	new_link->next = 0;	534	new_link->next = 0;
513	new_link->key = i->key;	535	new_link->key = i->key;
514	new_link->value = i->value;	536	new_link->value = i->value;
515		537
516	/* Try and be clever here, too. */	538	/* Try and be clever here, too. */
517	if (!dst->key_values)	539	if (!key_values)
518	{	540	{
519	dst->key_values = new_link;	541	key_values = new_link;
520	tail = new_link;	542	tail = new_link;
521	}	543	}
522	else	544	else
523	{	545	{
524	tail->next = new_link;	546	tail->next = new_link;
525	tail = new_link;	547	tail = new_link;
526	}	548	}
527	}	549	}
528	}	550	}
		551	}
529		552
530	update_ob_speed (dst);	553	/*
		554	* copy_to first frees everything allocated by the dst object,
		555	* and then copies the contents of itself into the second
		556	* object, allocating what needs to be allocated. Basically, any
		557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		558	* if the first object is freed, the pointers in the new object
		559	* will point at garbage.
		560	*/
		561	void
		562	object::copy_to (object *dst)
		563	{
		564	*dst = *this;
		565
		566	if (speed < 0)
		567	dst->speed_left = speed_left - rndm ();
		568
		569	dst->set_speed (dst->speed);
		570	}
		571
		572	void
		573	object::instantiate ()
		574	{
		575	if (!uuid.seq) // HACK
		576	uuid = gen_uuid ();
		577
		578	speed_left = -0.1f;
		579	/* copy the body_info to the body_used - this is only really
		580	* need for monsters, but doesn't hurt to do it for everything.
		581	* by doing so, when a monster is created, it has good starting
		582	* values for the body_used info, so when items are created
		583	* for it, they can be properly equipped.
		584	*/
		585	for (int i = NUM_BODY_LOCATIONS; i--; )
		586	slot[i].used = slot[i].info;
		587
		588	attachable::instantiate ();
531	}	589	}
532		590
533	object *	591	object *
534	object::clone ()	592	object::clone ()
535	{	593	{
…		…
541	/*	599	/*
542	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* If an object with the IS_TURNABLE() flag needs to be turned due
543	* to the closest player being on the other side, this function can	601	* to the closest player being on the other side, this function can
544	* be called to update the face variable, _and_ how it looks on the map.	602	* be called to update the face variable, _and_ how it looks on the map.
545	*/	603	*/
546
547	void	604	void
548	update_turn_face (object *op)	605	update_turn_face (object *op)
549	{	606	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	607	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	608	return;
		609
552	SET_ANIMATION (op, op->direction);	610	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	611	update_object (op, UP_OBJ_FACE);
554	}	612	}
555		613
556	/*	614	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
558	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
559	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
560	*/	618	*/
561	void	619	void
562	update_ob_speed (object *op)	620	object::set_speed (float speed)
563	{	621	{
564	extern int arch_init;	622	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	623	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	624	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	625	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	626	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		627
589	/* process_events() expects us to insert the object at the beginning	628	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		629
593	if (op->active_next != NULL)	630	if (has_active_speed ())
594	op->active_next->active_prev = op;	631	activate ();
595
596	active_objects = op;
597	}
598	else	632	else
599	{	633	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	634	}
654		635
655	/*	636	/*
656	* update_object() updates the the map.	637	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	638	* It takes into account invisible objects (and represent squares covered
…		…
670	* UP_OBJ_FACE: only the objects face has changed.	651	* UP_OBJ_FACE: only the objects face has changed.
671	*/	652	*/
672	void	653	void
673	update_object (object *op, int action)	654	update_object (object *op, int action)
674	{	655	{
675	MoveType move_on, move_off, move_block, move_slow;
676
677	if (op == NULL)	656	if (op == NULL)
678	{	657	{
679	/* this should never happen */	658	/* this should never happen */
680	LOG (llevDebug, "update_object() called for NULL object.\n");	659	LOG (llevDebug, "update_object() called for NULL object.\n");
681	return;	660	return;
…		…
694	*/	673	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	674	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	675	return;
697		676
698	/* make sure the object is within map boundaries */	677	/* make sure the object is within map boundaries */
699	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	678	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	679	{
701	LOG (llevError, "update_object() called for object out of map!\n");	680	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	681	#ifdef MANY_CORES
703	abort ();	682	abort ();
704	#endif	683	#endif
705	return;	684	return;
706	}	685	}
707		686
708	mapspace &m = op->ms ();	687	mapspace &m = op->ms ();
709		688
710	if (m.flags_ & P_NEED_UPDATE)	689	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	690	/* nop */;
712	else if (action == UP_OBJ_INSERT)	691	else if (action == UP_OBJ_INSERT)
713	{	692	{
714	// this is likely overkill, TODO: revisit (schmorp)	693	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	694	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* This isn't perfect, but I don't expect a lot of objects to	703	/* This isn't perfect, but I don't expect a lot of objects to
725	* to have move_allow right now.	704	* to have move_allow right now.
726	*/	705	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	706	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	707	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	708	m.flags_ = 0;
730	}	709	}
731	/* if the object is being removed, we can't make intelligent	710	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	711	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	712	* that is being removed.
734	*/	713	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	714	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	715	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	716	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	717	/* Nothing to do for that case */ ;
739	else	718	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	719	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		720
742	if (op->more)	721	if (op->more)
743	update_object (op->more, action);	722	update_object (op->more, action);
744	}	723	}
745		724
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	725	object::object ()
763	{	726	{
764	SET_FLAG (this, FLAG_REMOVED);	727	SET_FLAG (this, FLAG_REMOVED);
765		728
766	expmul = 1.0;	729	expmul = 1.0;
767	face = blank_face;	730	face = blank_face;
768	}	731	}
769		732
770	object::~object ()	733	object::~object ()
771	{	734	{
		735	unlink ();
		736
772	free_key_values (this);	737	free_key_values (this);
773	}	738	}
774		739
		740	static int object_count;
		741
775	void object::link ()	742	void object::link ()
776	{	743	{
777	count = ++ob_count;	744	assert (!index);//D
778	uuid = gen_uuid ();	745	uuid = gen_uuid ();
		746	count = ++object_count;
779		747
780	prev = 0;	748	refcnt_inc ();
781	next = object::first;	749	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	750	}
788		751
789	void object::unlink ()	752	void object::unlink ()
790	{	753	{
791	if (this == object::first)	754	if (!index)
792	object::first = next;	755	return;
793		756
794	/* Remove this object from the list of used objects */	757	objects.erase (this);
795	if (prev) prev->next = next;	758	refcnt_dec ();
796	if (next) next->prev = prev;	759	}
797		760
798	prev = 0;	761	void
799	next = 0;	762	object::activate ()
		763	{
		764	/* If already on active list, don't do anything */
		765	if (active)
		766	return;
		767
		768	if (has_active_speed ())
		769	actives.insert (this);
		770	}
		771
		772	void
		773	object::activate_recursive ()
		774	{
		775	activate ();
		776
		777	for (object *op = inv; op; op = op->below)
		778	op->activate_recursive ();
		779	}
		780
		781	/* This function removes object 'op' from the list of active
		782	* objects.
		783	* This should only be used for style maps or other such
		784	* reference maps where you don't want an object that isn't
		785	* in play chewing up cpu time getting processed.
		786	* The reverse of this is to call update_ob_speed, which
		787	* will do the right thing based on the speed of the object.
		788	*/
		789	void
		790	object::deactivate ()
		791	{
		792	/* If not on the active list, nothing needs to be done */
		793	if (!active)
		794	return;
		795
		796	actives.erase (this);
		797	}
		798
		799	void
		800	object::deactivate_recursive ()
		801	{
		802	for (object *op = inv; op; op = op->below)
		803	op->deactivate_recursive ();
		804
		805	deactivate ();
		806	}
		807
		808	void
		809	object::set_flag_inv (int flag, int value)
		810	{
		811	for (object *op = inv; op; op = op->below)
		812	{
		813	op->flag [flag] = value;
		814	op->set_flag_inv (flag, value);
		815	}
		816	}
		817
		818	/*
		819	* Remove and free all objects in the inventory of the given object.
		820	* object.c ?
		821	*/
		822	void
		823	object::destroy_inv (bool drop_to_ground)
		824	{
		825	// need to check first, because the checks below might segfault
		826	// as we might be on an invalid mapspace and crossfire code
		827	// is too buggy to ensure that the inventory is empty.
		828	// corollary: if you create arrows etc. with stuff in tis inventory,
		829	// cf will crash below with off-map x and y
		830	if (!inv)
		831	return;
		832
		833	/* Only if the space blocks everything do we not process -
		834	* if some form of movement is allowed, let objects
		835	* drop on that space.
		836	*/
		837	if (!drop_to_ground
		838	|| !map
		839	|| map->in_memory != MAP_IN_MEMORY
		840	|| map->nodrop
		841	|| ms ().move_block == MOVE_ALL)
		842	{
		843	while (inv)
		844	{
		845	inv->destroy_inv (drop_to_ground);
		846	inv->destroy ();
		847	}
		848	}
		849	else
		850	{ /* Put objects in inventory onto this space */
		851	while (inv)
		852	{
		853	object *op = inv;
		854
		855	if (op->flag [FLAG_STARTEQUIP]
		856	|| op->flag [FLAG_NO_DROP]
		857	|| op->type == RUNE
		858	|| op->type == TRAP
		859	|| op->flag [FLAG_IS_A_TEMPLATE]
		860	|| op->flag [FLAG_DESTROY_ON_DEATH])
		861	op->destroy ();
		862	else
		863	map->insert (op, x, y);
		864	}
		865	}
800	}	866	}
801		867
802	object *object::create ()	868	object *object::create ()
803	{	869	{
804	object *op = new object;	870	object *op = new object;
805	op->link ();	871	op->link ();
806	return op;	872	return op;
807	}	873	}
808		874
809	/*	875	void
810	* free_object() frees everything allocated by an object, removes	876	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	877	{
821	if (QUERY_FLAG (this, FLAG_FREED))	878	attachable::do_destroy ();
822	return;
823		879
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	880	if (flag [FLAG_IS_LINKED])
		881	remove_button_link (this);
		882
		883	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	884	remove_friendly_object (this);
826		885
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	886	if (!flag [FLAG_REMOVED])
828	remove ();	887	remove ();
829		888
830	SET_FLAG (this, FLAG_FREED);	889	destroy_inv (true);
831		890
832	if (more)	891	deactivate ();
833	{	892	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		893
838	if (inv)	894	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		895
880	// hack to ensure that freed objects still have a valid map	896	// hack to ensure that freed objects still have a valid map
881	{	897	{
882	static maptile *freed_map; // freed objects are moved here to avoid crashes	898	static maptile *freed_map; // freed objects are moved here to avoid crashes
883		899
…		…
887		903
888	freed_map->name = "/internal/freed_objects_map";	904	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	905	freed_map->width = 3;
890	freed_map->height = 3;	906	freed_map->height = 3;
891		907
892	freed_map->allocate ();	908	freed_map->alloc ();
		909	freed_map->in_memory = MAP_IN_MEMORY;
893	}	910	}
894		911
895	map = freed_map;	912	map = freed_map;
896	x = 1;	913	x = 1;
897	y = 1;	914	y = 1;
898	}	915	}
899		916
		917	head = 0;
		918
		919	if (more)
		920	{
		921	more->destroy ();
		922	more = 0;
		923	}
		924
900	// clear those pointers that likely might have circular references to us	925	// clear those pointers that likely might have circular references to us
901	owner = 0;	926	owner = 0;
902	enemy = 0;	927	enemy = 0;
903	attacked_by = 0;	928	attacked_by = 0;
		929	}
904		930
905	// only relevant for players(?), but make sure of it anyways	931	void
906	contr = 0;	932	object::destroy (bool destroy_inventory)
		933	{
		934	if (destroyed ())
		935	return;
907		936
908	/* Remove object from the active list */	937	if (destroy_inventory)
909	speed = 0;	938	destroy_inv (false);
910	update_ob_speed (this);
911		939
912	unlink ();	940	attachable::destroy ();
913
914	mortals.push_back (this);
915	}	941	}
916		942
917	/*	943	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	944	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	945	* weight of an object (and what is carried by it's environment(s)).
…		…
935	* This function removes the object op from the linked list of objects	961	* This function removes the object op from the linked list of objects
936	* which it is currently tied to. When this function is done, the	962	* which it is currently tied to. When this function is done, the
937	* object will have no environment. If the object previously had an	963	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	964	* environment, the x and y coordinates will be updated to
939	* the previous environment.	965	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	966	*/
942	void	967	void
943	object::remove ()	968	object::do_remove ()
944	{	969	{
945	object *tmp, *last = 0;	970	object *tmp, *last = 0;
946	object *otmp;	971	object *otmp;
947		972
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	973	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	974	return;
952		975
953	SET_FLAG (this, FLAG_REMOVED);	976	SET_FLAG (this, FLAG_REMOVED);
		977	INVOKE_OBJECT (REMOVE, this);
954		978
955	if (more)	979	if (more)
956	more->remove ();	980	more->remove ();
957		981
958	/*	982	/*
…		…
971	* to save cpu time.	995	* to save cpu time.
972	*/	996	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	997	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	998	otmp->update_stats ();
975		999
976	if (above != NULL)	1000	if (above)
977	above->below = below;	1001	above->below = below;
978	else	1002	else
979	env->inv = below;	1003	env->inv = below;
980		1004
981	if (below != NULL)	1005	if (below)
982	below->above = above;	1006	below->above = above;
983		1007
984	/* we set up values so that it could be inserted into	1008	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	1009	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	1010	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	1014	above = 0, below = 0;
991	env = 0;	1015	env = 0;
992	}	1016	}
993	else if (map)	1017	else if (map)
994	{	1018	{
995	/* Re did the following section of code - it looks like it had	1019	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	1020	{
		1021	// leaving a spot always closes any open container on the ground
		1022	if (container && !container->env)
		1023	// this causes spurious floorbox updates, but it ensures
		1024	// that the CLOSE event is being sent.
		1025	close_container ();
		1026
		1027	--map->players;
		1028	map->touch ();
		1029	}
		1030
		1031	map->dirty = true;
		1032	mapspace &ms = this->ms ();
998		1033
999	/* link the object above us */	1034	/* link the object above us */
1000	if (above)	1035	if (above)
1001	above->below = below;	1036	above->below = below;
1002	else	1037	else
1003	map->at (x, y).top = below; /* we were top, set new top */	1038	ms.top = below; /* we were top, set new top */
1004		1039
1005	/* Relink the object below us, if there is one */	1040	/* Relink the object below us, if there is one */
1006	if (below)	1041	if (below)
1007	below->above = above;	1042	below->above = above;
1008	else	1043	else
…		…
1010	/* Nothing below, which means we need to relink map object for this space	1045	/* Nothing below, which means we need to relink map object for this space
1011	* use translated coordinates in case some oddness with map tiling is	1046	* use translated coordinates in case some oddness with map tiling is
1012	* evident	1047	* evident
1013	*/	1048	*/
1014	if (GET_MAP_OB (map, x, y) != this)	1049	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"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);	1050	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 ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		1051
1025	map->at (x, y).bottom = above; /* goes on above it. */	1052	ms.bot = above; /* goes on above it. */
1026	}	1053	}
1027		1054
1028	above = 0;	1055	above = 0;
1029	below = 0;	1056	below = 0;
1030		1057
1031	if (map->in_memory == MAP_SAVING)	1058	if (map->in_memory == MAP_SAVING)
1032	return;	1059	return;
1033		1060
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1061	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1062
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1063	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1064	{
1038	/* No point updating the players look faces if he is the object	1065	/* No point updating the players look faces if he is the object
1039	* being removed.	1066	* being removed.
1040	*/	1067	*/
1041		1068
…		…
1045	* removed (most likely destroyed), update the player view	1072	* removed (most likely destroyed), update the player view
1046	* appropriately.	1073	* appropriately.
1047	*/	1074	*/
1048	if (tmp->container == this)	1075	if (tmp->container == this)
1049	{	1076	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);	1077	flag [FLAG_APPLIED] = 0;
1051	tmp->container = 0;	1078	tmp->container = 0;
1052	}	1079	}
1053		1080
		1081	if (tmp->contr->ns)
1054	tmp->contr->ns->floorbox_update ();	1082	tmp->contr->ns->floorbox_update ();
1055	}	1083	}
1056		1084
1057	/* See if player moving off should effect something */	1085	/* See if object moving off should effect something */
1058	if (check_walk_off	1086	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1087	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1088	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1089	{
1062	move_apply (tmp, this, 0);	1090	move_apply (tmp, this, 0);
…		…
1064	if (destroyed ())	1092	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1093	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1094	}
1067		1095
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1096	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069		1097	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1070	if (tmp->above == tmp)	1098	if (tmp->above == tmp)
1071	tmp->above = 0;	1099	tmp->above = 0;
1072		1100
1073	last = tmp;	1101	last = tmp;
1074	}	1102	}
1075		1103
1076	/* last == NULL of there are no objects on this space */	1104	/* last == NULL if there are no objects on this space */
		1105	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1106	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1107	map->at (x, y).flags_ = 0;
1079	else	1108	else
1080	update_object (last, UP_OBJ_REMOVE);	1109	update_object (last, UP_OBJ_REMOVE);
1081		1110
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1111	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1112	update_all_los (map, x, y);
1084	}	1113	}
1085	}	1114	}
1086		1115
1087	/*	1116	/*
…		…
1096	merge_ob (object *op, object *top)	1125	merge_ob (object *op, object *top)
1097	{	1126	{
1098	if (!op->nrof)	1127	if (!op->nrof)
1099	return 0;	1128	return 0;
1100		1129
1101	if (top == NULL)	1130	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1131	for (top = op; top && top->above; top = top->above)
		1132	;
1103		1133
1104	for (; top != NULL; top = top->below)	1134	for (; top; top = top->below)
1105	{	1135	{
1106	if (top == op)	1136	if (top == op)
1107	continue;	1137	continue;
1108		1138
1109	if (object::can_merge (op, top))	1139	if (object::can_merge (op, top))
…		…
1118	}	1148	}
1119		1149
1120	return 0;	1150	return 0;
1121	}	1151	}
1122		1152
		1153	void
		1154	object::expand_tail ()
		1155	{
		1156	if (more)
		1157	return;
		1158
		1159	object *prev = this;
		1160
		1161	for (archetype *at = arch->more; at; at = at->more)
		1162	{
		1163	object *op = arch_to_object (at);
		1164
		1165	op->name = name;
		1166	op->name_pl = name_pl;
		1167	op->title = title;
		1168
		1169	op->head = this;
		1170	prev->more = op;
		1171
		1172	prev = op;
		1173	}
		1174	}
		1175
1123	/*	1176	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1177	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1178	* job preparing multi-part monsters.
1126	*/	1179	*/
1127	object *	1180	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1181	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1182	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1183	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1184	{
1137	tmp->x = x + tmp->arch->clone.x;	1185	tmp->x = x + tmp->arch->clone.x;
1138	tmp->y = y + tmp->arch->clone.y;	1186	tmp->y = y + tmp->arch->clone.y;
1139	}	1187	}
1140		1188
…		…
1159	* Return value:	1207	* Return value:
1160	* new object if 'op' was merged with other object	1208	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1209	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1210	* just 'op' otherwise
1163	*/	1211	*/
1164
1165	object *	1212	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1213	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1214	{
		1215	assert (!op->flag [FLAG_FREED]);
		1216
1168	object *tmp, *top, *floor = NULL;	1217	object *tmp, *top, *floor = NULL;
1169	sint16 x, y;
1170		1218
1171	if (QUERY_FLAG (op, FLAG_FREED))	1219	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176		1220
1177	if (m == NULL)	1221	#if 0
1178	{	1222	if (!m->active != !op->active)
1179	char *dump = dump_object (op);	1223	if (m->active)
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1224	op->activate_recursive ();
1181	free (dump);	1225	else
1182	return op;	1226	op->deactivate_recursive ();
1183	}	1227	#endif
1184		1228
1185	if (out_of_map (m, op->x, op->y))	1229	if (out_of_map (m, op->x, op->y))
1186	{	1230	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.	1235	* improperly inserted.
1193	*/	1236	*/
1194	abort ();	1237	abort ();
1195	#endif	1238	#endif
1196	free (dump);
1197	return op;	1239	return op;
1198	}	1240	}
1199		1241
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;	1242	if (object *more = op->more)
1213		1243	{
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1244	if (!insert_ob_in_map (more, m, originator, flag))
1230	{	1245	{
1231	if (!op->head)	1246	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1247	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233		1248
1234	return NULL;	1249	return 0;
1235	}	1250	}
1236	}	1251	}
1237		1252
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1253	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1254
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1257	* need extra work
1243	*/	1258	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1260	return 0;
1246	y = op->y;	1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1247		1264
1248	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1249	*/	1266	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1268	for (tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1253	{	1270	{
1254	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1272	tmp->destroy ();
1256	}	1273	}
…		…
1273	op->below = originator->below;	1290	op->below = originator->below;
1274		1291
1275	if (op->below)	1292	if (op->below)
1276	op->below->above = op;	1293	op->below->above = op;
1277	else	1294	else
1278	op->ms ().bottom = op;	1295	ms.bot = op;
1279		1296
1280	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1281	originator->below = op;	1298	originator->below = op;
1282	}	1299	}
1283	else	1300	else
1284	{	1301	{
		1302	top = ms.bot;
		1303
1285	/* If there are other objects, then */	1304	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1306	{
1288	object *last = NULL;	1307	object *last = 0;
1289		1308
1290	/*	1309	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1311	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1312	* Generally, we want to put the new object on top. But if
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1301	*/	1320	*/
1302		1321	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1322	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1324	floor = top;
1307		1325
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1311	top = top->below;	1329	top = top->below;
1312	break;	1330	break;
1313	}	1331	}
1314		1332
1315	last = top;	1333	last = top;
1316	top = top->above;
1317	}	1334	}
1318		1335
1319	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1320	top = last;	1337	top = last;
1321		1338
…		…
1323	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1324	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1325	*/	1342	*/
1326		1343
1327	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1328	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1329	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1348	* stacking is a bit odd.
1332	*/	1349	*/
1333	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1335	{	1353	{
1336	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1356	break;
		1357
1339	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1340	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1341	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1361	* set top to the object below us.
1343	*/	1362	*/
…		…
1345	top = last->below;	1364	top = last->below;
1346	}	1365	}
1347	} /* If objects on this space */	1366	} /* If objects on this space */
1348		1367
1349	if (flag & INS_MAP_LOAD)	1368	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);	1369	top = ms.top;
1351		1370
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1372	top = floor;
1354		1373
1355	/* Top is the object that our object (op) is going to get inserted above.	1374	/* Top is the object that our object (op) is going to get inserted above.
1356	*/	1375	*/
1357		1376
1358	/* First object on this space */	1377	/* First object on this space */
1359	if (!top)	1378	if (!top)
1360	{	1379	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1380	op->above = ms.bot;
1362		1381
1363	if (op->above)	1382	if (op->above)
1364	op->above->below = op;	1383	op->above->below = op;
1365		1384
1366	op->below = NULL;	1385	op->below = 0;
1367	op->ms ().bottom = op;	1386	ms.bot = op;
1368	}	1387	}
1369	else	1388	else
1370	{ /* get inserted into the stack above top */	1389	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1390	op->above = top->above;
1372		1391
…		…
1375		1394
1376	op->below = top;	1395	op->below = top;
1377	top->above = op;	1396	top->above = op;
1378	}	1397	}
1379		1398
1380	if (op->above == NULL)	1399	if (!op->above)
1381	op->ms ().top = op;	1400	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1401	} /* else not INS_BELOW_ORIGINATOR */
1383		1402
1384	if (op->type == PLAYER)	1403	if (op->type == PLAYER)
		1404	{
1385	op->contr->do_los = 1;	1405	op->contr->do_los = 1;
		1406	++op->map->players;
		1407	op->map->touch ();
		1408	}
		1409
		1410	op->map->dirty = true;
1386		1411
1387	/* If we have a floor, we know the player, if any, will be above	1412	/* If we have a floor, we know the player, if any, will be above
1388	* it, so save a few ticks and start from there.	1413	* it, so save a few ticks and start from there.
1389	*/	1414	*/
1390	if (!(flag & INS_MAP_LOAD))	1415	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1416	if (object *pl = ms.player ())
		1417	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1418	pl->contr->ns->floorbox_update ();
1393		1419
1394	/* If this object glows, it may affect lighting conditions that are	1420	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1421	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1422	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1423	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1424	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1425	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1426	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1427	* of effect may be sufficient.
1402	*/	1428	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1429	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1430	update_all_los (op->map, op->x, op->y);
1405		1431
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1432	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1433	update_object (op, UP_OBJ_INSERT);
		1434
		1435	INVOKE_OBJECT (INSERT, op);
1408		1436
1409	/* Don't know if moving this to the end will break anything. However,	1437	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1438	* we want to have floorbox_update called before calling this.
1411	*	1439	*
1412	* check_move_on() must be after this because code called from	1440	* check_move_on() must be after this because code called from
…		…
1417		1445
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1446	/* if this is not the head or flag has been passed, don't check walk on status */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1447	if (!(flag & INS_NO_WALK_ON) && !op->head)
1420	{	1448	{
1421	if (check_move_on (op, originator))	1449	if (check_move_on (op, originator))
1422	return NULL;	1450	return 0;
1423		1451
1424	/* If we are a multi part object, lets work our way through the check	1452	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1453	* walk on's.
1426	*/	1454	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1455	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1456	if (check_move_on (tmp, originator))
1429	return NULL;	1457	return 0;
1430	}	1458	}
1431		1459
1432	return op;	1460	return op;
1433	}	1461	}
1434		1462
…		…
1441	{	1469	{
1442	object *tmp, *tmp1;	1470	object *tmp, *tmp1;
1443		1471
1444	/* first search for itself and remove any old instances */	1472	/* first search for itself and remove any old instances */
1445		1473
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1474	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1475	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1448	tmp->destroy ();	1476	tmp->destroy ();
1449		1477
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1478	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1479
1452	tmp1->x = op->x;	1480	tmp1->x = op->x;
1453	tmp1->y = op->y;	1481	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1482	insert_ob_in_map (tmp1, op->map, op, 0);
		1483	}
		1484
		1485	object *
		1486	object::insert_at (object *where, object *originator, int flags)
		1487	{
		1488	return where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1489	}
1456		1490
1457	/*	1491	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1492	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1459	* is returned contains nr objects, and the remaining parts contains	1493	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1494	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1495	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1496	* global static errmsg array.
1463	*/	1497	*/
1464
1465	object *	1498	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1499	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1500	{
1468	object *newob;	1501	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1502	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1500	* the amount of an object. If the amount reaches 0, the object	1533	* the amount of an object. If the amount reaches 0, the object
1501	* is subsequently removed and freed.	1534	* is subsequently removed and freed.
1502	*	1535	*
1503	* Return value: 'op' if something is left, NULL if the amount reached 0	1536	* Return value: 'op' if something is left, NULL if the amount reached 0
1504	*/	1537	*/
1505
1506	object *	1538	object *
1507	decrease_ob_nr (object *op, uint32 i)	1539	decrease_ob_nr (object *op, uint32 i)
1508	{	1540	{
1509	object *tmp;	1541	object *tmp;
1510	player *pl;
1511		1542
1512	if (i == 0) /* objects with op->nrof require this check */	1543	if (i == 0) /* objects with op->nrof require this check */
1513	return op;	1544	return op;
1514		1545
1515	if (i > op->nrof)	1546	if (i > op->nrof)
…		…
1528	* IMO, searching through all the players will mostly	1559	* IMO, searching through all the players will mostly
1529	* likely be quicker than following op->env to the map,	1560	* likely be quicker than following op->env to the map,
1530	* and then searching the map for a player.	1561	* and then searching the map for a player.
1531	*/	1562	*/
1532	if (!tmp)	1563	if (!tmp)
1533	{	1564	for_all_players (pl)
1534	for (pl = first_player; pl; pl = pl->next)
1535	if (pl->ob->container == op->env)	1565	if (pl->ob->container == op->env)
1536	{	1566	{
1537	tmp = pl->ob;	1567	tmp = pl->ob;
1538	break;	1568	break;
1539	}	1569	}
1540	}
1541		1570
1542	if (i < op->nrof)	1571	if (i < op->nrof)
1543	{	1572	{
1544	sub_weight (op->env, op->weight * i);	1573	sub_weight (op->env, op->weight * i);
1545	op->nrof -= i;	1574	op->nrof -= i;
…		…
1588		1617
1589	/*	1618	/*
1590	* add_weight(object, weight) adds the specified weight to an object,	1619	* add_weight(object, weight) adds the specified weight to an object,
1591	* and also updates how much the environment(s) is/are carrying.	1620	* and also updates how much the environment(s) is/are carrying.
1592	*/	1621	*/
1593
1594	void	1622	void
1595	add_weight (object *op, signed long weight)	1623	add_weight (object *op, signed long weight)
1596	{	1624	{
1597	while (op != NULL)	1625	while (op != NULL)
1598	{	1626	{
…		…
1630	* inside the object environment.	1658	* inside the object environment.
1631	*	1659	*
1632	* The function returns now pointer to inserted item, and return value can	1660	* The function returns now pointer to inserted item, and return value can
1633	* be != op, if items are merged. -Tero	1661	* be != op, if items are merged. -Tero
1634	*/	1662	*/
1635
1636	object *	1663	object *
1637	object::insert (object *op)	1664	object::insert (object *op)
1638	{	1665	{
1639	object *tmp, *otmp;	1666	object *tmp, *otmp;
1640		1667
…		…
1695	if ((op->glow_radius != 0) && map)	1722	if ((op->glow_radius != 0) && map)
1696	{	1723	{
1697	#ifdef DEBUG_LIGHTS	1724	#ifdef DEBUG_LIGHTS
1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699	#endif /* DEBUG_LIGHTS */	1726	#endif /* DEBUG_LIGHTS */
1700	if (MAP_DARKNESS (map))	1727	if (map->darkness)
1701	update_all_los (map, x, y);	1728	update_all_los (map, x, y);
1702	}	1729	}
1703		1730
1704	/* Client has no idea of ordering so lets not bother ordering it here.	1731	/* Client has no idea of ordering so lets not bother ordering it here.
1705	* It sure simplifies this function...	1732	* It sure simplifies this function...
…		…
1710	{	1737	{
1711	op->below = inv;	1738	op->below = inv;
1712	op->below->above = op;	1739	op->below->above = op;
1713	inv = op;	1740	inv = op;
1714	}	1741	}
		1742
		1743	INVOKE_OBJECT (INSERT, this);
1715		1744
1716	return op;	1745	return op;
1717	}	1746	}
1718		1747
1719	/*	1748	/*
…		…
1734	*	1763	*
1735	* MSW 2001-07-08: Check all objects on space, not just those below	1764	* MSW 2001-07-08: Check all objects on space, not just those below
1736	* object being inserted. insert_ob_in_map may not put new objects	1765	* object being inserted. insert_ob_in_map may not put new objects
1737	* on top.	1766	* on top.
1738	*/	1767	*/
1739
1740	int	1768	int
1741	check_move_on (object *op, object *originator)	1769	check_move_on (object *op, object *originator)
1742	{	1770	{
1743	object *tmp;	1771	object *tmp;
1744	maptile *m = op->map;	1772	maptile *m = op->map;
…		…
1771		1799
1772	/* The objects have to be checked from top to bottom.	1800	/* The objects have to be checked from top to bottom.
1773	* Hence, we first go to the top:	1801	* Hence, we first go to the top:
1774	*/	1802	*/
1775		1803
1776	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1804	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1777	{	1805	{
1778	/* Trim the search when we find the first other spell effect	1806	/* Trim the search when we find the first other spell effect
1779	* this helps performance so that if a space has 50 spell objects,	1807	* this helps performance so that if a space has 50 spell objects,
1780	* we don't need to check all of them.	1808	* we don't need to check all of them.
1781	*/	1809	*/
…		…
1799	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1827	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1800	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1828	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1801	{	1829	{
1802		1830
1803	float	1831	float
1804	diff = tmp->move_slow_penalty * FABS (op->speed);	1832	diff = tmp->move_slow_penalty * fabs (op->speed);
1805		1833
1806	if (op->type == PLAYER)	1834	if (op->type == PLAYER)
1807	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1835	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1808	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1836	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1809	diff /= 4.0;	1837	diff /= 4.0;
…		…
1836	/*	1864	/*
1837	* present_arch(arch, map, x, y) searches for any objects with	1865	* present_arch(arch, map, x, y) searches for any objects with
1838	* a matching archetype at the given map and coordinates.	1866	* a matching archetype at the given map and coordinates.
1839	* The first matching object is returned, or NULL if none.	1867	* The first matching object is returned, or NULL if none.
1840	*/	1868	*/
1841
1842	object *	1869	object *
1843	present_arch (const archetype *at, maptile *m, int x, int y)	1870	present_arch (const archetype *at, maptile *m, int x, int y)
1844	{	1871	{
1845	object *
1846	tmp;
1847
1848	if (m == NULL || out_of_map (m, x, y))	1872	if (!m || out_of_map (m, x, y))
1849	{	1873	{
1850	LOG (llevError, "Present_arch called outside map.\n");	1874	LOG (llevError, "Present_arch called outside map.\n");
1851	return NULL;	1875	return NULL;
1852	}	1876	}
1853	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1877
		1878	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1854	if (tmp->arch == at)	1879	if (tmp->arch == at)
1855	return tmp;	1880	return tmp;
		1881
1856	return NULL;	1882	return NULL;
1857	}	1883	}
1858		1884
1859	/*	1885	/*
1860	* present(type, map, x, y) searches for any objects with	1886	* present(type, map, x, y) searches for any objects with
1861	* a matching type variable at the given map and coordinates.	1887	* a matching type variable at the given map and coordinates.
1862	* The first matching object is returned, or NULL if none.	1888	* The first matching object is returned, or NULL if none.
1863	*/	1889	*/
1864
1865	object *	1890	object *
1866	present (unsigned char type, maptile *m, int x, int y)	1891	present (unsigned char type, maptile *m, int x, int y)
1867	{	1892	{
1868	object *
1869	tmp;
1870
1871	if (out_of_map (m, x, y))	1893	if (out_of_map (m, x, y))
1872	{	1894	{
1873	LOG (llevError, "Present called outside map.\n");	1895	LOG (llevError, "Present called outside map.\n");
1874	return NULL;	1896	return NULL;
1875	}	1897	}
1876	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1898
		1899	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1900	if (tmp->type == type)
1878	return tmp;	1901	return tmp;
		1902
1879	return NULL;	1903	return NULL;
1880	}	1904	}
1881		1905
1882	/*	1906	/*
1883	* present_in_ob(type, object) searches for any objects with	1907	* present_in_ob(type, object) searches for any objects with
1884	* a matching type variable in the inventory of the given object.	1908	* a matching type variable in the inventory of the given object.
1885	* The first matching object is returned, or NULL if none.	1909	* The first matching object is returned, or NULL if none.
1886	*/	1910	*/
1887
1888	object *	1911	object *
1889	present_in_ob (unsigned char type, const object *op)	1912	present_in_ob (unsigned char type, const object *op)
1890	{	1913	{
1891	object *
1892	tmp;
1893
1894	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1914	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895	if (tmp->type == type)	1915	if (tmp->type == type)
1896	return tmp;	1916	return tmp;
		1917
1897	return NULL;	1918	return NULL;
1898	}	1919	}
1899		1920
1900	/*	1921	/*
1901	* present_in_ob (type, str, object) searches for any objects with	1922	* present_in_ob (type, str, object) searches for any objects with
…		…
1909	* str is the string to match against. Note that we match against	1930	* str is the string to match against. Note that we match against
1910	* the object name, not the archetype name. this is so that the	1931	* the object name, not the archetype name. this is so that the
1911	* spell code can use one object type (force), but change it's name	1932	* spell code can use one object type (force), but change it's name
1912	* to be unique.	1933	* to be unique.
1913	*/	1934	*/
1914
1915	object *	1935	object *
1916	present_in_ob_by_name (int type, const char *str, const object *op)	1936	present_in_ob_by_name (int type, const char *str, const object *op)
1917	{	1937	{
1918	object *
1919	tmp;
1920
1921	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1938	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922	{
1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1939	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924	return tmp;	1940	return tmp;
1925	}	1941
1926	return NULL;	1942	return 0;
1927	}	1943	}
1928		1944
1929	/*	1945	/*
1930	* present_arch_in_ob(archetype, object) searches for any objects with	1946	* present_arch_in_ob(archetype, object) searches for any objects with
1931	* a matching archetype in the inventory of the given object.	1947	* a matching archetype in the inventory of the given object.
1932	* The first matching object is returned, or NULL if none.	1948	* The first matching object is returned, or NULL if none.
1933	*/	1949	*/
1934
1935	object *	1950	object *
1936	present_arch_in_ob (const archetype *at, const object *op)	1951	present_arch_in_ob (const archetype *at, const object *op)
1937	{	1952	{
1938	object *
1939	tmp;
1940
1941	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1953	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942	if (tmp->arch == at)	1954	if (tmp->arch == at)
1943	return tmp;	1955	return tmp;
		1956
1944	return NULL;	1957	return NULL;
1945	}	1958	}
1946		1959
1947	/*	1960	/*
1948	* activate recursively a flag on an object inventory	1961	* activate recursively a flag on an object inventory
1949	*/	1962	*/
1950	void	1963	void
1951	flag_inv (object *op, int flag)	1964	flag_inv (object *op, int flag)
1952	{	1965	{
1953	object *
1954	tmp;
1955
1956	if (op->inv)	1966	if (op->inv)
1957	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1967	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958	{	1968	{
1959	SET_FLAG (tmp, flag);	1969	SET_FLAG (tmp, flag);
1960	flag_inv (tmp, flag);	1970	flag_inv (tmp, flag);
1961	}	1971	}
1962	} /*	1972	}
		1973
		1974	/*
1963	* desactivate recursively a flag on an object inventory	1975	* deactivate recursively a flag on an object inventory
1964	*/	1976	*/
1965	void	1977	void
1966	unflag_inv (object *op, int flag)	1978	unflag_inv (object *op, int flag)
1967	{	1979	{
1968	object *
1969	tmp;
1970
1971	if (op->inv)	1980	if (op->inv)
1972	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1981	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973	{	1982	{
1974	CLEAR_FLAG (tmp, flag);	1983	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	1984	unflag_inv (tmp, flag);
1976	}	1985	}
1977	}	1986	}
…		…
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1989	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).	1990	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for	1991	* If checksums are used, a player will get set_cheat called for
1983	* him/her-self and all object carried by a call to this function.	1992	* him/her-self and all object carried by a call to this function.
1984	*/	1993	*/
1985
1986	void	1994	void
1987	set_cheat (object *op)	1995	set_cheat (object *op)
1988	{	1996	{
1989	SET_FLAG (op, FLAG_WAS_WIZ);	1997	SET_FLAG (op, FLAG_WAS_WIZ);
1990	flag_inv (op, FLAG_WAS_WIZ);	1998	flag_inv (op, FLAG_WAS_WIZ);
…		…
2009	* because arch_blocked (now ob_blocked) needs to know the movement type	2017	* because arch_blocked (now ob_blocked) needs to know the movement type
2010	* to know if the space in question will block the object. We can't use	2018	* to know if the space in question will block the object. We can't use
2011	* the archetype because that isn't correct if the monster has been	2019	* the archetype because that isn't correct if the monster has been
2012	* customized, changed states, etc.	2020	* customized, changed states, etc.
2013	*/	2021	*/
2014
2015	int	2022	int
2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2023	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017	{	2024	{
2018	int
2019	i,
2020	index = 0, flag;	2025	int index = 0, flag;
2021	static int
2022	altern[SIZEOFFREE];	2026	int altern[SIZEOFFREE];
2023		2027
2024	for (i = start; i < stop; i++)	2028	for (int i = start; i < stop; i++)
2025	{	2029	{
2026	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2030	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027	if (!flag)	2031	if (!flag)
2028	altern[index++] = i;	2032	altern [index++] = i;
2029		2033
2030	/* Basically, if we find a wall on a space, we cut down the search size.	2034	/* Basically, if we find a wall on a space, we cut down the search size.
2031	* In this way, we won't return spaces that are on another side of a wall.	2035	* In this way, we won't return spaces that are on another side of a wall.
2032	* This mostly work, but it cuts down the search size in all directions -	2036	* This mostly work, but it cuts down the search size in all directions -
2033	* if the space being examined only has a wall to the north and empty	2037	* if the space being examined only has a wall to the north and empty
…		…
2040	}	2044	}
2041		2045
2042	if (!index)	2046	if (!index)
2043	return -1;	2047	return -1;
2044		2048
2045	return altern[RANDOM () % index];	2049	return altern [rndm (index)];
2046	}	2050	}
2047		2051
2048	/*	2052	/*
2049	* find_first_free_spot(archetype, maptile, x, y) works like	2053	* find_first_free_spot(archetype, maptile, x, y) works like
2050	* find_free_spot(), but it will search max number of squares.	2054	* find_free_spot(), but it will search max number of squares.
2051	* But it will return the first available spot, not a random choice.	2055	* But it will return the first available spot, not a random choice.
2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2056	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2053	*/	2057	*/
2054
2055	int	2058	int
2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2059	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057	{	2060	{
2058	int
2059	i;
2060
2061	for (i = 0; i < SIZEOFFREE; i++)	2061	for (int i = 0; i < SIZEOFFREE; i++)
2062	{
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2062	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2063	return i;
2065	}	2064
2066	return -1;	2065	return -1;
2067	}	2066	}
2068		2067
2069	/*	2068	/*
2070	* The function permute(arr, begin, end) randomly reorders the array	2069	* The function permute(arr, begin, end) randomly reorders the array
2071	* arr[begin..end-1].	2070	* arr[begin..end-1].
		2071	* now uses a fisher-yates shuffle, old permute was broken
2072	*/	2072	*/
2073	static void	2073	static void
2074	permute (int *arr, int begin, int end)	2074	permute (int *arr, int begin, int end)
2075	{	2075	{
2076	int	2076	arr += begin;
2077	i,
2078	j,
2079	tmp,
2080	len;
2081
2082	len = end - begin;	2077	end -= begin;
2083	for (i = begin; i < end; i++)
2084	{
2085	j = begin + RANDOM () % len;
2086		2078
2087	tmp = arr[i];	2079	while (--end)
2088	arr[i] = arr[j];	2080	swap (arr [end], arr [rndm (end + 1)]);
2089	arr[j] = tmp;
2090	}
2091	}	2081	}
2092		2082
2093	/* new function to make monster searching more efficient, and effective!	2083	/* new function to make monster searching more efficient, and effective!
2094	* This basically returns a randomized array (in the passed pointer) of	2084	* This basically returns a randomized array (in the passed pointer) of
2095	* the spaces to find monsters. In this way, it won't always look for	2085	* the spaces to find monsters. In this way, it won't always look for
…		…
2098	* the 3x3 area will be searched, just not in a predictable order.	2088	* the 3x3 area will be searched, just not in a predictable order.
2099	*/	2089	*/
2100	void	2090	void
2101	get_search_arr (int *search_arr)	2091	get_search_arr (int *search_arr)
2102	{	2092	{
2103	int	2093	int i;
2104	i;
2105		2094
2106	for (i = 0; i < SIZEOFFREE; i++)	2095	for (i = 0; i < SIZEOFFREE; i++)
2107	{
2108	search_arr[i] = i;	2096	search_arr[i] = i;
2109	}
2110		2097
2111	permute (search_arr, 1, SIZEOFFREE1 + 1);	2098	permute (search_arr, 1, SIZEOFFREE1 + 1);
2112	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2099	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2100	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114	}	2101	}
…		…
2123	* Perhaps incorrectly, but I'm making the assumption that exclude	2110	* Perhaps incorrectly, but I'm making the assumption that exclude
2124	* is actually want is going to try and move there. We need this info	2111	* is actually want is going to try and move there. We need this info
2125	* because we have to know what movement the thing looking to move	2112	* because we have to know what movement the thing looking to move
2126	* there is capable of.	2113	* there is capable of.
2127	*/	2114	*/
2128
2129	int	2115	int
2130	find_dir (maptile *m, int x, int y, object *exclude)	2116	find_dir (maptile *m, int x, int y, object *exclude)
2131	{	2117	{
2132	int
2133	i,
2134	max = SIZEOFFREE, mflags;	2118	int i, max = SIZEOFFREE, mflags;
2135		2119
2136	sint16 nx, ny;	2120	sint16 nx, ny;
2137	object *	2121	object *tmp;
2138	tmp;
2139	maptile *	2122	maptile *mp;
2140	mp;
2141		2123
2142	MoveType blocked, move_type;	2124	MoveType blocked, move_type;
2143		2125
2144	if (exclude && exclude->head)	2126	if (exclude && exclude->head)
2145	{	2127	{
…		…
2162		2144
2163	if (mflags & P_OUT_OF_MAP)	2145	if (mflags & P_OUT_OF_MAP)
2164	max = maxfree[i];	2146	max = maxfree[i];
2165	else	2147	else
2166	{	2148	{
2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2149	mapspace &ms = mp->at (nx, ny);
		2150
		2151	blocked = ms.move_block;
2168		2152
2169	if ((move_type & blocked) == move_type)	2153	if ((move_type & blocked) == move_type)
2170	max = maxfree[i];	2154	max = maxfree[i];
2171	else if (mflags & P_IS_ALIVE)	2155	else if (mflags & P_IS_ALIVE)
2172	{	2156	{
2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2157	for (tmp = ms.bot; tmp; tmp = tmp->above)
2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2158	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2159	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2175	break;	2160	break;
2176		2161
2177	if (tmp)	2162	if (tmp)
2178	return freedir[i];	2163	return freedir[i];
2179	}	2164	}
…		…
2185		2170
2186	/*	2171	/*
2187	* distance(object 1, object 2) will return the square of the	2172	* distance(object 1, object 2) will return the square of the
2188	* distance between the two given objects.	2173	* distance between the two given objects.
2189	*/	2174	*/
2190
2191	int	2175	int
2192	distance (const object *ob1, const object *ob2)	2176	distance (const object *ob1, const object *ob2)
2193	{	2177	{
2194	int i;
2195
2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2178	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197	return i;
2198	}	2179	}
2199		2180
2200	/*	2181	/*
2201	* find_dir_2(delta-x,delta-y) will return a direction in which	2182	* find_dir_2(delta-x,delta-y) will return a direction in which
2202	* an object which has subtracted the x and y coordinates of another	2183	* an object which has subtracted the x and y coordinates of another
2203	* object, needs to travel toward it.	2184	* object, needs to travel toward it.
2204	*/	2185	*/
2205
2206	int	2186	int
2207	find_dir_2 (int x, int y)	2187	find_dir_2 (int x, int y)
2208	{	2188	{
2209	int q;	2189	int q;
2210		2190
…		…
2239		2219
2240	return 3;	2220	return 3;
2241	}	2221	}
2242		2222
2243	/*	2223	/*
2244	* absdir(int): Returns a number between 1 and 8, which represent
2245	* the "absolute" direction of a number (it actually takes care of
2246	* "overflow" in previous calculations of a direction).
2247	*/
2248
2249	int
2250	absdir (int d)
2251	{
2252	while (d < 1)
2253	d += 8;
2254	while (d > 8)
2255	d -= 8;
2256	return d;
2257	}
2258
2259	/*
2260	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2224	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2261	* between two directions (which are expected to be absolute (see absdir())	2225	* between two directions (which are expected to be absolute (see absdir())
2262	*/	2226	*/
2263
2264	int	2227	int
2265	dirdiff (int dir1, int dir2)	2228	dirdiff (int dir1, int dir2)
2266	{	2229	{
2267	int	2230	int d;
2268	d;
2269		2231
2270	d = abs (dir1 - dir2);	2232	d = abs (dir1 - dir2);
2271	if (d > 4)	2233	if (d > 4)
2272	d = 8 - d;	2234	d = 8 - d;
		2235
2273	return d;	2236	return d;
2274	}	2237	}
2275		2238
2276	/* peterm:	2239	/* peterm:
2277	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2240	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2280	* This basically means that if direction is 15, then it could either go	2243	* This basically means that if direction is 15, then it could either go
2281	* direction 4, 14, or 16 to get back to where we are.	2244	* direction 4, 14, or 16 to get back to where we are.
2282	* Moved from spell_util.c to object.c with the other related direction	2245	* Moved from spell_util.c to object.c with the other related direction
2283	* functions.	2246	* functions.
2284	*/	2247	*/
2285
2286	int
2287	reduction_dir[SIZEOFFREE][3] = {	2248	int reduction_dir[SIZEOFFREE][3] = {
2288	{0, 0, 0}, /* 0 */	2249	{0, 0, 0}, /* 0 */
2289	{0, 0, 0}, /* 1 */	2250	{0, 0, 0}, /* 1 */
2290	{0, 0, 0}, /* 2 */	2251	{0, 0, 0}, /* 2 */
2291	{0, 0, 0}, /* 3 */	2252	{0, 0, 0}, /* 3 */
2292	{0, 0, 0}, /* 4 */	2253	{0, 0, 0}, /* 4 */
…		…
2436	insert_ob_in_ob (object_create_clone (item), dst);	2397	insert_ob_in_ob (object_create_clone (item), dst);
2437		2398
2438	return dst;	2399	return dst;
2439	}	2400	}
2440		2401
2441	/* GROS - Creates an object using a string representing its content. */
2442	/* Basically, we save the content of the string to a temp file, then call */
2443	/* load_object on it. I admit it is a highly inefficient way to make things, */
2444	/* but it was simple to make and allows reusing the load_object function. */
2445	/* Remember not to use load_object_str in a time-critical situation. */
2446	/* Also remember that multiparts objects are not supported for now. */
2447
2448	object *
2449	load_object_str (const char *obstr)
2450	{
2451	object *op;
2452	char filename[MAX_BUF];
2453
2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2455
2456	FILE *tempfile = fopen (filename, "w");
2457
2458	if (tempfile == NULL)
2459	{
2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2461	return NULL;
2462	}
2463
2464	fprintf (tempfile, obstr);
2465	fclose (tempfile);
2466
2467	op = object::create ();
2468
2469	object_thawer thawer (filename);
2470
2471	if (thawer)
2472	load_object (thawer, op, 0);
2473
2474	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2475	CLEAR_FLAG (op, FLAG_REMOVED);
2476
2477	return op;
2478	}
2479
2480	/* This returns the first object in who's inventory that	2402	/* This returns the first object in who's inventory that
2481	* has the same type and subtype match.	2403	* has the same type and subtype match.
2482	* returns NULL if no match.	2404	* returns NULL if no match.
2483	*/	2405	*/
2484	object *	2406	object *
2485	find_obj_by_type_subtype (const object *who, int type, int subtype)	2407	find_obj_by_type_subtype (const object *who, int type, int subtype)
2486	{	2408	{
2487	object *tmp;
2488
2489	for (tmp = who->inv; tmp; tmp = tmp->below)	2409	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490	if (tmp->type == type && tmp->subtype == subtype)	2410	if (tmp->type == type && tmp->subtype == subtype)
2491	return tmp;	2411	return tmp;
2492		2412
2493	return NULL;	2413	return 0;
2494	}	2414	}
2495		2415
2496	/* If ob has a field named key, return the link from the list,	2416	/* If ob has a field named key, return the link from the list,
2497	* otherwise return NULL.	2417	* otherwise return NULL.
2498	*	2418	*
…		…
2500	* do the desired thing.	2420	* do the desired thing.
2501	*/	2421	*/
2502	key_value *	2422	key_value *
2503	get_ob_key_link (const object *ob, const char *key)	2423	get_ob_key_link (const object *ob, const char *key)
2504	{	2424	{
2505	key_value *link;
2506
2507	for (link = ob->key_values; link != NULL; link = link->next)	2425	for (key_value *link = ob->key_values; link; link = link->next)
2508	if (link->key == key)	2426	if (link->key == key)
2509	return link;	2427	return link;
2510		2428
2511	return NULL;	2429	return 0;
2512	}	2430	}
2513		2431
2514	/*	2432	/*
2515	* Returns the value of op has an extra_field for key, or NULL.	2433	* Returns the value of op has an extra_field for key, or NULL.
2516	*	2434	*
…		…
2541	if (link->key == canonical_key)	2459	if (link->key == canonical_key)
2542	return link->value;	2460	return link->value;
2543		2461
2544	return 0;	2462	return 0;
2545	}	2463	}
2546
2547		2464
2548	/*	2465	/*
2549	* Updates the canonical_key in op to value.	2466	* Updates the canonical_key in op to value.
2550	*	2467	*
2551	* canonical_key is a shared string (value doesn't have to be).	2468	* canonical_key is a shared string (value doesn't have to be).
…		…
2556	* Returns TRUE on success.	2473	* Returns TRUE on success.
2557	*/	2474	*/
2558	int	2475	int
2559	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2476	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560	{	2477	{
2561	key_value *
2562	field = NULL, *last = NULL;	2478	key_value *field = NULL, *last = NULL;
2563		2479
2564	for (field = op->key_values; field != NULL; field = field->next)	2480	for (field = op->key_values; field != NULL; field = field->next)
2565	{	2481	{
2566	if (field->key != canonical_key)	2482	if (field->key != canonical_key)
2567	{	2483	{
…		…
2595	/* IF we get here, key doesn't exist */	2511	/* IF we get here, key doesn't exist */
2596		2512
2597	/* No field, we'll have to add it. */	2513	/* No field, we'll have to add it. */
2598		2514
2599	if (!add_key)	2515	if (!add_key)
2600	{
2601	return FALSE;	2516	return FALSE;
2602	}	2517
2603	/* There isn't any good reason to store a null	2518	/* There isn't any good reason to store a null
2604	* value in the key/value list. If the archetype has	2519	* value in the key/value list. If the archetype has
2605	* this key, then we should also have it, so shouldn't	2520	* this key, then we should also have it, so shouldn't
2606	* be here. If user wants to store empty strings,	2521	* be here. If user wants to store empty strings,
2607	* should pass in ""	2522	* should pass in ""
…		…
2656	}	2571	}
2657	else	2572	else
2658	item = item->env;	2573	item = item->env;
2659	}	2574	}
2660		2575
		2576
		2577	const char *
		2578	object::flag_desc (char *desc, int len) const
		2579	{
		2580	char *p = desc;
		2581	bool first = true;
		2582
		2583	*p = 0;
		2584
		2585	for (int i = 0; i < NUM_FLAGS; i++)
		2586	{
		2587	if (len <= 10) // magic constant!
		2588	{
		2589	snprintf (p, len, ",...");
		2590	break;
		2591	}
		2592
		2593	if (flag [i])
		2594	{
		2595	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2596	len -= cnt;
		2597	p += cnt;
		2598	first = false;
		2599	}
		2600	}
		2601
		2602	return desc;
		2603	}
		2604
2661	// return a suitable string describing an objetc in enough detail to find it	2605	// return a suitable string describing an object in enough detail to find it
2662	const char *	2606	const char *
2663	object::debug_desc (char *info) const	2607	object::debug_desc (char *info) const
2664	{	2608	{
		2609	char flagdesc[512];
2665	char info2[256 * 3];	2610	char info2[256 * 4];
2666	char *p = info;	2611	char *p = info;
2667		2612
2668	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2669	count,	2614	count, uuid.seq,
2670	&name,	2615	&name,
2671	title ? " " : "",	2616	title ? "\",title:\"" : "",
2672	title ? (const char *)title : "");	2617	title ? (const char *)title : "",
		2618	flag_desc (flagdesc, 512), type);
2673		2619
2674	if (env)	2620	if (env)
2675	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2676		2622
2677	if (map)	2623	if (map)
2678	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2679		2625
2680	return info;	2626	return info;
2681	}	2627	}
2682		2628
2683	const char *	2629	const char *
2684	object::debug_desc () const	2630	object::debug_desc () const
2685	{	2631	{
2686	static char info[256 * 3];	2632	static char info[3][256 * 4];
		2633	static int info_idx;
		2634
2687	return debug_desc (info);	2635	return debug_desc (info [++info_idx % 3]);
2688	}	2636	}
2689		2637
		2638	struct region *
		2639	object::region () const
		2640	{
		2641	return map ? map->region (x, y)
		2642	: region::default_region ();
		2643	}
		2644
		2645	const materialtype_t *
		2646	object::dominant_material () const
		2647	{
		2648	if (materialtype_t *mat = name_to_material (materialname))
		2649	return mat;
		2650
		2651	// omfg this is slow, this has to be temporary :)
		2652	shstr unknown ("unknown");
		2653
		2654	return name_to_material (unknown);
		2655	}
		2656
		2657	void
		2658	object::open_container (object *new_container)
		2659	{
		2660	if (container == new_container)
		2661	return;
		2662
		2663	if (object *old_container = container)
		2664	{
		2665	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2666	return;
		2667
		2668	#if 0
		2669	// remove the "Close old_container" object.
		2670	if (object *closer = old_container->inv)
		2671	if (closer->type == CLOSE_CON)
		2672	closer->destroy ();
		2673	#endif
		2674
		2675	old_container->flag [FLAG_APPLIED] = 0;
		2676	container = 0;
		2677
		2678	esrv_update_item (UPD_FLAGS, this, old_container);
		2679	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2680	}
		2681
		2682	if (new_container)
		2683	{
		2684	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2685	return;
		2686
		2687	// TODO: this does not seem to serve any purpose anymore?
		2688	#if 0
		2689	// insert the "Close Container" object.
		2690	if (archetype *closer = new_container->other_arch)
		2691	{
		2692	object *closer = arch_to_object (new_container->other_arch);
		2693	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2694	new_container->insert (closer);
		2695	}
		2696	#endif
		2697
		2698	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2699
		2700	new_container->flag [FLAG_APPLIED] = 1;
		2701	container = new_container;
		2702
		2703	esrv_update_item (UPD_FLAGS, this, new_container);
		2704	esrv_send_inventory (this, new_container);
		2705	}
		2706	}
		2707
		2708

Diff Legend

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