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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.158 by root, Mon Jun 4 12:19:08 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* 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, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* 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 along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <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	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance all your items at once, "
		501	"but the %s is just too much for your body. "
		502	"[You need to unapply some items first.]", &ob->name);
		503	return false;
		504	}
		505
		506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		507	}
		508	else
		509	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		510
		511	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		512	{
		513	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		514	&name, ob->debug_desc ());
		515	return false;
		516	}
		517
		518	return true;
		519	}
		520
455	/* Zero the key_values on op, decrementing the shared-string	521	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	522	* refcounts and freeing the links.
457	*/	523	*/
458	static void	524	static void
459	free_key_values (object *op)	525	free_key_values (object *op)
460	{	526	{
461	for (key_value *i = op->key_values; i != 0;)	527	for (key_value *i = op->key_values; i; )
462	{	528	{
463	key_value *next = i->next;	529	key_value *next = i->next;
464	delete i;	530	delete i;
465		531
466	i = next;	532	i = next;
467	}	533	}
468		534
469	op->key_values = 0;	535	op->key_values = 0;
470	}	536	}
471		537
472	void object::clear ()	538	object &
		539	object::operator =(const object &src)
473	{	540	{
474	attachable_base::clear ();	541	bool is_freed = flag [FLAG_FREED];
		542	bool is_removed = flag [FLAG_REMOVED];
475		543
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*
515	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
519	* if the first object is freed, the pointers in the new object
520	* will point at garbage.
521	*/
522	void
523	object::copy_to (object *dst)
524	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528	*(object_copy *)dst = *this;	544	*(object_copy *)this = src;
529	*(object_pod *)dst = *this;
530		545
531	if (self || cb)	546	flag [FLAG_FREED] = is_freed;
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	547	flag [FLAG_REMOVED] = is_removed;
533
534	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);
536
537	if (is_removed)
538	SET_FLAG (dst, FLAG_REMOVED);
539
540	if (speed < 0)
541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542		548
543	/* Copy over key_values, if any. */	549	/* Copy over key_values, if any. */
544	if (key_values)	550	if (src.key_values)
545	{	551	{
546	key_value *tail = 0;	552	key_value *tail = 0;
547	key_value *i;
548
549	dst->key_values = 0;	553	key_values = 0;
550		554
551	for (i = key_values; i; i = i->next)	555	for (key_value *i = src.key_values; i; i = i->next)
552	{	556	{
553	key_value *new_link = new key_value;	557	key_value *new_link = new key_value;
554		558
555	new_link->next = 0;	559	new_link->next = 0;
556	new_link->key = i->key;	560	new_link->key = i->key;
557	new_link->value = i->value;	561	new_link->value = i->value;
558		562
559	/* Try and be clever here, too. */	563	/* Try and be clever here, too. */
560	if (!dst->key_values)	564	if (!key_values)
561	{	565	{
562	dst->key_values = new_link;	566	key_values = new_link;
563	tail = new_link;	567	tail = new_link;
564	}	568	}
565	else	569	else
566	{	570	{
567	tail->next = new_link;	571	tail->next = new_link;
568	tail = new_link;	572	tail = new_link;
569	}	573	}
570	}	574	}
571	}	575	}
		576	}
572		577
573	update_ob_speed (dst);	578	/*
		579	* copy_to first frees everything allocated by the dst object,
		580	* and then copies the contents of itself into the second
		581	* object, allocating what needs to be allocated. Basically, any
		582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		583	* if the first object is freed, the pointers in the new object
		584	* will point at garbage.
		585	*/
		586	void
		587	object::copy_to (object *dst)
		588	{
		589	*dst = *this;
		590
		591	if (speed < 0)
		592	dst->speed_left = speed_left - rndm ();
		593
		594	dst->set_speed (dst->speed);
		595	}
		596
		597	void
		598	object::instantiate ()
		599	{
		600	if (!uuid.seq) // HACK
		601	uuid = gen_uuid ();
		602
		603	speed_left = -0.1f;
		604	/* copy the body_info to the body_used - this is only really
		605	* need for monsters, but doesn't hurt to do it for everything.
		606	* by doing so, when a monster is created, it has good starting
		607	* values for the body_used info, so when items are created
		608	* for it, they can be properly equipped.
		609	*/
		610	for (int i = NUM_BODY_LOCATIONS; i--; )
		611	slot[i].used = slot[i].info;
		612
		613	attachable::instantiate ();
574	}	614	}
575		615
576	object *	616	object *
577	object::clone ()	617	object::clone ()
578	{	618	{
…		…
584	/*	624	/*
585	* If an object with the IS_TURNABLE() flag needs to be turned due	625	* If an object with the IS_TURNABLE() flag needs to be turned due
586	* to the closest player being on the other side, this function can	626	* to the closest player being on the other side, this function can
587	* be called to update the face variable, _and_ how it looks on the map.	627	* be called to update the face variable, _and_ how it looks on the map.
588	*/	628	*/
589
590	void	629	void
591	update_turn_face (object *op)	630	update_turn_face (object *op)
592	{	631	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	632	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	633	return;
		634
595	SET_ANIMATION (op, op->direction);	635	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	636	update_object (op, UP_OBJ_FACE);
597	}	637	}
598		638
599	/*	639	/*
600	* Updates the speed of an object. If the speed changes from 0 to another	640	* Updates the speed of an object. If the speed changes from 0 to another
601	* value, or vice versa, then add/remove the object from the active list.	641	* value, or vice versa, then add/remove the object from the active list.
602	* This function needs to be called whenever the speed of an object changes.	642	* This function needs to be called whenever the speed of an object changes.
603	*/	643	*/
604	void	644	void
605	update_ob_speed (object *op)	645	object::set_speed (float speed)
606	{	646	{
607	extern int arch_init;	647	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	648	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	649	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	650	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	651	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		652
632	/* process_events() expects us to insert the object at the beginning	653	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		654
636	if (op->active_next != NULL)	655	if (has_active_speed ())
637	op->active_next->active_prev = op;	656	activate ();
638
639	active_objects = op;
640	}
641	else	657	else
642	{	658	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}
666
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}	659	}
697		660
698	/*	661	/*
699	* update_object() updates the the map.	662	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	663	* It takes into account invisible objects (and represent squares covered
…		…
713	* UP_OBJ_FACE: only the objects face has changed.	676	* UP_OBJ_FACE: only the objects face has changed.
714	*/	677	*/
715	void	678	void
716	update_object (object *op, int action)	679	update_object (object *op, int action)
717	{	680	{
718	MoveType move_on, move_off, move_block, move_slow;
719
720	if (op == NULL)	681	if (op == NULL)
721	{	682	{
722	/* this should never happen */	683	/* this should never happen */
723	LOG (llevDebug, "update_object() called for NULL object.\n");	684	LOG (llevDebug, "update_object() called for NULL object.\n");
724	return;	685	return;
…		…
737	*/	698	*/
738	if (!op->map || op->map->in_memory == MAP_SAVING)	699	if (!op->map || op->map->in_memory == MAP_SAVING)
739	return;	700	return;
740		701
741	/* make sure the object is within map boundaries */	702	/* make sure the object is within map boundaries */
742	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	703	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743	{	704	{
744	LOG (llevError, "update_object() called for object out of map!\n");	705	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	706	#ifdef MANY_CORES
746	abort ();	707	abort ();
747	#endif	708	#endif
748	return;	709	return;
749	}	710	}
750		711
751	mapspace &m = op->map->at (op->x, op->y);	712	mapspace &m = op->ms ();
752		713
753	if (m.flags_ & P_NEED_UPDATE)	714	if (!(m.flags_ & P_UPTODATE))
754	/* nop */;	715	/* nop */;
755	else if (action == UP_OBJ_INSERT)	716	else if (action == UP_OBJ_INSERT)
756	{	717	{
757	// this is likely overkill, TODO: revisit (schmorp)	718	// this is likely overkill, TODO: revisit (schmorp)
758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	719	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
767	/* This isn't perfect, but I don't expect a lot of objects to	728	/* This isn't perfect, but I don't expect a lot of objects to
768	* to have move_allow right now.	729	* to have move_allow right now.
769	*/	730	*/
770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	731	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	732	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
772	m.flags_ = P_NEED_UPDATE;	733	m.flags_ = 0;
773	}	734	}
774	/* if the object is being removed, we can't make intelligent	735	/* if the object is being removed, we can't make intelligent
775	* decisions, because remove_ob can't really pass the object	736	* decisions, because remove_ob can't really pass the object
776	* that is being removed.	737	* that is being removed.
777	*/	738	*/
778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	739	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779	m.flags_ = P_NEED_UPDATE;	740	m.flags_ = 0;
780	else if (action == UP_OBJ_FACE)	741	else if (action == UP_OBJ_FACE)
781	/* Nothing to do for that case */ ;	742	/* Nothing to do for that case */ ;
782	else	743	else
783	LOG (llevError, "update_object called with invalid action: %d\n", action);	744	LOG (llevError, "update_object called with invalid action: %d\n", action);
784		745
785	if (op->more)	746	if (op->more)
786	update_object (op->more, action);	747	update_object (op->more, action);
787	}	748	}
788		749
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used
791	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804
805	object::object ()	750	object::object ()
806	{	751	{
807	SET_FLAG (this, FLAG_REMOVED);	752	SET_FLAG (this, FLAG_REMOVED);
808		753
809	expmul = 1.0;	754	expmul = 1.0;
810	face = blank_face;	755	face = blank_face;
811	}	756	}
812		757
813	object::~object ()	758	object::~object ()
814	{	759	{
		760	unlink ();
		761
815	free_key_values (this);	762	free_key_values (this);
816	}	763	}
817		764
		765	static int object_count;
		766
818	void object::link ()	767	void object::link ()
819	{	768	{
820	count = ++ob_count;	769	assert (!index);//D
821	uuid = gen_uuid ();	770	uuid = gen_uuid ();
		771	count = ++object_count;
822		772
823	prev = 0;	773	refcnt_inc ();
824	next = object::first;	774	objects.insert (this);
825
826	if (object::first)
827	object::first->prev = this;
828
829	object::first = this;
830	}	775	}
831		776
832	void object::unlink ()	777	void object::unlink ()
833	{	778	{
834	if (this == object::first)	779	if (!index)
835	object::first = next;	780	return;
836		781
837	/* Remove this object from the list of used objects */	782	objects.erase (this);
838	if (prev) prev->next = next;	783	refcnt_dec ();
839	if (next) next->prev = prev;	784	}
840		785
841	prev = 0;	786	void
842	next = 0;	787	object::activate ()
		788	{
		789	/* If already on active list, don't do anything */
		790	if (active)
		791	return;
		792
		793	if (has_active_speed ())
		794	actives.insert (this);
		795	}
		796
		797	void
		798	object::activate_recursive ()
		799	{
		800	activate ();
		801
		802	for (object *op = inv; op; op = op->below)
		803	op->activate_recursive ();
		804	}
		805
		806	/* This function removes object 'op' from the list of active
		807	* objects.
		808	* This should only be used for style maps or other such
		809	* reference maps where you don't want an object that isn't
		810	* in play chewing up cpu time getting processed.
		811	* The reverse of this is to call update_ob_speed, which
		812	* will do the right thing based on the speed of the object.
		813	*/
		814	void
		815	object::deactivate ()
		816	{
		817	/* If not on the active list, nothing needs to be done */
		818	if (!active)
		819	return;
		820
		821	actives.erase (this);
		822	}
		823
		824	void
		825	object::deactivate_recursive ()
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	op->deactivate_recursive ();
		829
		830	deactivate ();
		831	}
		832
		833	void
		834	object::set_flag_inv (int flag, int value)
		835	{
		836	for (object *op = inv; op; op = op->below)
		837	{
		838	op->flag [flag] = value;
		839	op->set_flag_inv (flag, value);
		840	}
		841	}
		842
		843	/*
		844	* Remove and free all objects in the inventory of the given object.
		845	* object.c ?
		846	*/
		847	void
		848	object::destroy_inv (bool drop_to_ground)
		849	{
		850	// need to check first, because the checks below might segfault
		851	// as we might be on an invalid mapspace and crossfire code
		852	// is too buggy to ensure that the inventory is empty.
		853	// corollary: if you create arrows etc. with stuff in tis inventory,
		854	// cf will crash below with off-map x and y
		855	if (!inv)
		856	return;
		857
		858	/* Only if the space blocks everything do we not process -
		859	* if some form of movement is allowed, let objects
		860	* drop on that space.
		861	*/
		862	if (!drop_to_ground
		863	|| !map
		864	|| map->in_memory != MAP_IN_MEMORY
		865	|| map->nodrop
		866	|| ms ().move_block == MOVE_ALL)
		867	{
		868	while (inv)
		869	{
		870	inv->destroy_inv (drop_to_ground);
		871	inv->destroy ();
		872	}
		873	}
		874	else
		875	{ /* Put objects in inventory onto this space */
		876	while (inv)
		877	{
		878	object *op = inv;
		879
		880	if (op->flag [FLAG_STARTEQUIP]
		881	|| op->flag [FLAG_NO_DROP]
		882	|| op->type == RUNE
		883	|| op->type == TRAP
		884	|| op->flag [FLAG_IS_A_TEMPLATE]
		885	|| op->flag [FLAG_DESTROY_ON_DEATH])
		886	op->destroy ();
		887	else
		888	map->insert (op, x, y);
		889	}
		890	}
843	}	891	}
844		892
845	object *object::create ()	893	object *object::create ()
846	{	894	{
847	object *op = new object;	895	object *op = new object;
848	op->link ();	896	op->link ();
849	return op;	897	return op;
850	}	898	}
851		899
852	/*	900	void
853	* free_object() frees everything allocated by an object, removes	901	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	902	{
864	if (QUERY_FLAG (this, FLAG_FREED))	903	attachable::do_destroy ();
865	return;
866		904
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (flag [FLAG_IS_LINKED])
		906	remove_button_link (this);
		907
		908	if (flag [FLAG_FRIENDLY])
868	remove_friendly_object (this);	909	remove_friendly_object (this);
869		910
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	911	if (!flag [FLAG_REMOVED])
871	remove ();	912	remove ();
872		913
873	SET_FLAG (this, FLAG_FREED);	914	destroy_inv (true);
874		915
875	if (more)	916	deactivate ();
876	{	917	unlink ();
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880		918
881	if (inv)	919	flag [FLAG_FREED] = 1;
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		920
923	// hack to ensure that freed objects still have a valid map	921	// hack to ensure that freed objects still have a valid map
924	{	922	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes	923	static maptile *freed_map; // freed objects are moved here to avoid crashes
926		924
…		…
930		928
931	freed_map->name = "/internal/freed_objects_map";	929	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	930	freed_map->width = 3;
933	freed_map->height = 3;	931	freed_map->height = 3;
934		932
935	freed_map->allocate ();	933	freed_map->alloc ();
		934	freed_map->in_memory = MAP_IN_MEMORY;
936	}	935	}
937		936
938	map = freed_map;	937	map = freed_map;
939	x = 1;	938	x = 1;
940	y = 1;	939	y = 1;
941	}	940	}
942		941
		942	head = 0;
		943
		944	if (more)
		945	{
		946	more->destroy ();
		947	more = 0;
		948	}
		949
943	// clear those pointers that likely might have circular references to us	950	// clear those pointers that likely might have circular references to us
944	owner = 0;	951	owner = 0;
945	enemy = 0;	952	enemy = 0;
946	attacked_by = 0;	953	attacked_by = 0;
		954	}
947		955
948	// only relevant for players(?), but make sure of it anyways	956	void
949	contr = 0;	957	object::destroy (bool destroy_inventory)
		958	{
		959	if (destroyed ())
		960	return;
950		961
951	/* Remove object from the active list */	962	if (destroy_inventory)
952	speed = 0;	963	destroy_inv (false);
953	update_ob_speed (this);
954		964
955	unlink ();	965	attachable::destroy ();
956
957	mortals.push_back (this);
958	}	966	}
959		967
960	/*	968	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	969	* sub_weight() recursively (outwards) subtracts a number from the
962	* weight of an object (and what is carried by it's environment(s)).	970	* weight of an object (and what is carried by it's environment(s)).
…		…
978	* This function removes the object op from the linked list of objects	986	* This function removes the object op from the linked list of objects
979	* which it is currently tied to. When this function is done, the	987	* which it is currently tied to. When this function is done, the
980	* object will have no environment. If the object previously had an	988	* object will have no environment. If the object previously had an
981	* environment, the x and y coordinates will be updated to	989	* environment, the x and y coordinates will be updated to
982	* the previous environment.	990	* the previous environment.
983	* Beware: This function is called from the editor as well!
984	*/	991	*/
985	void	992	void
986	object::remove ()	993	object::do_remove ()
987	{	994	{
988	object *tmp, *last = 0;	995	object *tmp, *last = 0;
989	object *otmp;	996	object *otmp;
990		997
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	998	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	999	return;
995		1000
996	SET_FLAG (this, FLAG_REMOVED);	1001	SET_FLAG (this, FLAG_REMOVED);
		1002	INVOKE_OBJECT (REMOVE, this);
997		1003
998	if (more)	1004	if (more)
999	more->remove ();	1005	more->remove ();
1000		1006
1001	/*	1007	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	1018	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	1019	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	1020	* to save cpu time.
1015	*/	1021	*/
1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017	fix_player (otmp);	1023	otmp->update_stats ();
1018		1024
1019	if (above != NULL)	1025	if (above)
1020	above->below = below;	1026	above->below = below;
1021	else	1027	else
1022	env->inv = below;	1028	env->inv = below;
1023		1029
1024	if (below != NULL)	1030	if (below)
1025	below->above = above;	1031	below->above = above;
1026		1032
1027	/* we set up values so that it could be inserted into	1033	/* we set up values so that it could be inserted into
1028	* the map, but we don't actually do that - it is up	1034	* the map, but we don't actually do that - it is up
1029	* to the caller to decide what we want to do.	1035	* to the caller to decide what we want to do.
…		…
1033	above = 0, below = 0;	1039	above = 0, below = 0;
1034	env = 0;	1040	env = 0;
1035	}	1041	}
1036	else if (map)	1042	else if (map)
1037	{	1043	{
1038	/* Re did the following section of code - it looks like it had	1044	if (type == PLAYER)
1039	* lots of logic for things we no longer care about
1040	*/	1045	{
		1046	// leaving a spot always closes any open container on the ground
		1047	if (container && !container->env)
		1048	// this causes spurious floorbox updates, but it ensures
		1049	// that the CLOSE event is being sent.
		1050	close_container ();
		1051
		1052	--map->players;
		1053	map->touch ();
		1054	}
		1055
		1056	map->dirty = true;
		1057	mapspace &ms = this->ms ();
1041		1058
1042	/* link the object above us */	1059	/* link the object above us */
1043	if (above)	1060	if (above)
1044	above->below = below;	1061	above->below = below;
1045	else	1062	else
1046	map->at (x, y).top = below; /* we were top, set new top */	1063	ms.top = below; /* we were top, set new top */
1047		1064
1048	/* Relink the object below us, if there is one */	1065	/* Relink the object below us, if there is one */
1049	if (below)	1066	if (below)
1050	below->above = above;	1067	below->above = above;
1051	else	1068	else
…		…
1053	/* Nothing below, which means we need to relink map object for this space	1070	/* Nothing below, which means we need to relink map object for this space
1054	* use translated coordinates in case some oddness with map tiling is	1071	* use translated coordinates in case some oddness with map tiling is
1055	* evident	1072	* evident
1056	*/	1073	*/
1057	if (GET_MAP_OB (map, x, y) != this)	1074	if (GET_MAP_OB (map, x, y) != this)
1058	{
1059	char *dump = dump_object (this);
1060	LOG (llevError,
1061	"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);	1075	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 ());
1062	free (dump);
1063	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);
1065	free (dump);
1066	}
1067		1076
1068	map->at (x, y).bottom = above; /* goes on above it. */	1077	ms.bot = above; /* goes on above it. */
1069	}	1078	}
1070		1079
1071	above = 0;	1080	above = 0;
1072	below = 0;	1081	below = 0;
1073		1082
1074	if (map->in_memory == MAP_SAVING)	1083	if (map->in_memory == MAP_SAVING)
1075	return;	1084	return;
1076		1085
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1086	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		1087
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1088	for (tmp = ms.bot; tmp; tmp = tmp->above)
1080	{	1089	{
1081	/* No point updating the players look faces if he is the object	1090	/* No point updating the players look faces if he is the object
1082	* being removed.	1091	* being removed.
1083	*/	1092	*/
1084		1093
…		…
1088	* removed (most likely destroyed), update the player view	1097	* removed (most likely destroyed), update the player view
1089	* appropriately.	1098	* appropriately.
1090	*/	1099	*/
1091	if (tmp->container == this)	1100	if (tmp->container == this)
1092	{	1101	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);	1102	flag [FLAG_APPLIED] = 0;
1094	tmp->container = 0;	1103	tmp->container = 0;
1095	}	1104	}
1096		1105
		1106	if (tmp->contr->ns)
1097	tmp->contr->socket->floorbox_update ();	1107	tmp->contr->ns->floorbox_update ();
1098	}	1108	}
1099		1109
1100	/* See if player moving off should effect something */	1110	/* See if object moving off should effect something */
1101	if (check_walk_off	1111	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1112	&& ((move_type & tmp->move_off)
1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104	{	1114	{
1105	move_apply (tmp, this, 0);	1115	move_apply (tmp, this, 0);
…		…
1107	if (destroyed ())	1117	if (destroyed ())
1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1118	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1109	}	1119	}
1110		1120
1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1121	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112		1122	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1113	if (tmp->above == tmp)	1123	if (tmp->above == tmp)
1114	tmp->above = 0;	1124	tmp->above = 0;
1115		1125
1116	last = tmp;	1126	last = tmp;
1117	}	1127	}
1118		1128
1119	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1120	if (!last)	1131	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1132	map->at (x, y).flags_ = 0;
1122	else	1133	else
1123	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1124		1135
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
1127	}	1138	}
1128	}	1139	}
1129		1140
1130	/*	1141	/*
…		…
1139	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1140	{	1151	{
1141	if (!op->nrof)	1152	if (!op->nrof)
1142	return 0;	1153	return 0;
1143		1154
1144	if (top == NULL)	1155	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1156	for (top = op; top && top->above; top = top->above)
		1157	;
1146		1158
1147	for (; top != NULL; top = top->below)	1159	for (; top; top = top->below)
1148	{	1160	{
1149	if (top == op)	1161	if (top == op)
1150	continue;	1162	continue;
1151		1163
1152	if (object::can_merge (op, top))	1164	if (object::can_merge (op, top))
…		…
1161	}	1173	}
1162		1174
1163	return 0;	1175	return 0;
1164	}	1176	}
1165		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = arch->more; at; at = at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1166	/*	1201	/*
1167	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1168	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1169	*/	1204	*/
1170	object *	1205	object *
1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172	{	1207	{
1173	object *tmp;
1174
1175	if (op->head)
1176	op = op->head;
1177
1178	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179	{	1209	{
1180	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->clone.x;
1181	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->clone.y;
1182	}	1212	}
1183		1213
…		…
1202	* Return value:	1232	* Return value:
1203	* new object if 'op' was merged with other object	1233	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1234	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1235	* just 'op' otherwise
1206	*/	1236	*/
1207
1208	object *	1237	object *
1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1211	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1212	sint16 x, y;
1213		1243
1214	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1215	{
1216	LOG (llevError, "Trying to insert freed object!\n");
1217	return NULL;
1218	}
1219		1245
1220	if (m == NULL)	1246	#if 0
1221	{	1247	if (!m->active != !op->active)
1222	char *dump = dump_object (op);	1248	if (m->active)
1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1249	op->activate_recursive ();
1224	free (dump);	1250	else
1225	return op;	1251	op->deactivate_recursive ();
1226	}	1252	#endif
1227		1253
1228	if (out_of_map (m, op->x, op->y))	1254	if (out_of_map (m, op->x, op->y))
1229	{	1255	{
1230	char *dump = dump_object (op);
1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1256	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1232	#ifdef MANY_CORES	1257	#ifdef MANY_CORES
1233	/* Better to catch this here, as otherwise the next use of this object	1258	/* Better to catch this here, as otherwise the next use of this object
1234	* is likely to cause a crash. Better to find out where it is getting	1259	* is likely to cause a crash. Better to find out where it is getting
1235	* improperly inserted.	1260	* improperly inserted.
1236	*/	1261	*/
1237	abort ();	1262	abort ();
1238	#endif	1263	#endif
1239	free (dump);
1240	return op;	1264	return op;
1241	}	1265	}
1242		1266
1243	if (!QUERY_FLAG (op, FLAG_REMOVED))	1267	if (object *more = op->more)
1244	{	1268	if (!insert_ob_in_map (more, m, originator, flag))
1245	char *dump = dump_object (op);
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);
1248	return op;	1269	return 0;
1249	}
1250
1251	if (op->more != NULL)
1252	{
1253	/* The part may be on a different map. */
1254
1255	object *more = op->more;
1256
1257	/* We really need the caller to normalize coordinates - if
1258	* we set the map, that doesn't work if the location is within
1259	* a map and this is straddling an edge. So only if coordinate
1260	* is clear wrong do we normalize it.
1261	*/
1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263	more->map = get_map_from_coord (m, &more->x, &more->y);
1264	else if (!more->map)
1265	{
1266	/* For backwards compatibility - when not dealing with tiled maps,
1267	* more->map should always point to the parent.
1268	*/
1269	more->map = m;
1270	}
1271
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273	{
1274	if (!op->head)
1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276
1277	return NULL;
1278	}
1279	}
1280		1270
1281	CLEAR_FLAG (op, FLAG_REMOVED);	1271	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1272
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1273	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* of areas of callers (eg, anything that uses find_free_spot would now	1274	* of areas of callers (eg, anything that uses find_free_spot would now
1285	* need extra work	1275	* need extra work
1286	*/	1276	*/
1287	op->map = get_map_from_coord (m, &op->x, &op->y);	1277	if (!xy_normalise (m, op->x, op->y))
1288	x = op->x;	1278	return 0;
1289	y = op->y;	1279
		1280	op->map = m;
		1281	mapspace &ms = op->ms ();
1290		1282
1291	/* this has to be done after we translate the coordinates.	1283	/* this has to be done after we translate the coordinates.
1292	*/	1284	*/
1293	if (op->nrof && !(flag & INS_NO_MERGE))	1285	if (op->nrof && !(flag & INS_NO_MERGE))
1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1286	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1295	if (object::can_merge (op, tmp))	1287	if (object::can_merge (op, tmp))
1296	{	1288	{
1297	op->nrof += tmp->nrof;	1289	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1290	tmp->destroy ();
1299	}	1291	}
…		…
1316	op->below = originator->below;	1308	op->below = originator->below;
1317		1309
1318	if (op->below)	1310	if (op->below)
1319	op->below->above = op;	1311	op->below->above = op;
1320	else	1312	else
1321	op->map->at (op->x, op->y).bottom = op;	1313	ms.bot = op;
1322		1314
1323	/* since *below* originator, no need to update top */	1315	/* since *below* originator, no need to update top */
1324	originator->below = op;	1316	originator->below = op;
1325	}	1317	}
1326	else	1318	else
1327	{	1319	{
		1320	top = ms.bot;
		1321
1328	/* If there are other objects, then */	1322	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1323	if ((!(flag & INS_MAP_LOAD)) && top)
1330	{	1324	{
1331	object *last = NULL;	1325	object *last = 0;
1332		1326
1333	/*	1327	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1328	* If there are multiple objects on this space, we do some trickier handling.
1335	* We've already dealt with merging if appropriate.	1329	* We've already dealt with merging if appropriate.
1336	* Generally, we want to put the new object on top. But if	1330	* Generally, we want to put the new object on top. But if
…		…
1340	* once we get to them. This reduces the need to traverse over all of	1334	* once we get to them. This reduces the need to traverse over all of
1341	* them when adding another one - this saves quite a bit of cpu time	1335	* them when adding another one - this saves quite a bit of cpu time
1342	* when lots of spells are cast in one area. Currently, it is presumed	1336	* when lots of spells are cast in one area. Currently, it is presumed
1343	* that flying non pickable objects are spell objects.	1337	* that flying non pickable objects are spell objects.
1344	*/	1338	*/
1345		1339	for (top = ms.bot; top; top = top->above)
1346	while (top != NULL)
1347	{	1340	{
1348	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1341	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1349	floor = top;	1342	floor = top;
1350		1343
1351	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1344	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1354	top = top->below;	1347	top = top->below;
1355	break;	1348	break;
1356	}	1349	}
1357		1350
1358	last = top;	1351	last = top;
1359	top = top->above;
1360	}	1352	}
1361		1353
1362	/* Don't want top to be NULL, so set it to the last valid object */	1354	/* Don't want top to be NULL, so set it to the last valid object */
1363	top = last;	1355	top = last;
1364		1356
…		…
1366	* looks like instead of lots of conditions here.	1358	* looks like instead of lots of conditions here.
1367	* makes things faster, and effectively the same result.	1359	* makes things faster, and effectively the same result.
1368	*/	1360	*/
1369		1361
1370	/* Have object 'fall below' other objects that block view.	1362	/* Have object 'fall below' other objects that block view.
1371	* Unless those objects are exits, type 66	1363	* Unless those objects are exits.
1372	* If INS_ON_TOP is used, don't do this processing	1364	* If INS_ON_TOP is used, don't do this processing
1373	* Need to find the object that in fact blocks view, otherwise	1365	* Need to find the object that in fact blocks view, otherwise
1374	* stacking is a bit odd.	1366	* stacking is a bit odd.
1375	*/	1367	*/
1376	if (!(flag & INS_ON_TOP) &&	1368	if (!(flag & INS_ON_TOP)
1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1369	&& ms.flags () & P_BLOCKSVIEW
		1370	&& (op->face && !faces [op->face].visibility))
1378	{	1371	{
1379	for (last = top; last != floor; last = last->below)	1372	for (last = top; last != floor; last = last->below)
1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1373	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1381	break;	1374	break;
		1375
1382	/* Check to see if we found the object that blocks view,	1376	/* Check to see if we found the object that blocks view,
1383	* and make sure we have a below pointer for it so that	1377	* and make sure we have a below pointer for it so that
1384	* we can get inserted below this one, which requires we	1378	* we can get inserted below this one, which requires we
1385	* set top to the object below us.	1379	* set top to the object below us.
1386	*/	1380	*/
…		…
1388	top = last->below;	1382	top = last->below;
1389	}	1383	}
1390	} /* If objects on this space */	1384	} /* If objects on this space */
1391		1385
1392	if (flag & INS_MAP_LOAD)	1386	if (flag & INS_MAP_LOAD)
1393	top = GET_MAP_TOP (op->map, op->x, op->y);	1387	top = ms.top;
1394		1388
1395	if (flag & INS_ABOVE_FLOOR_ONLY)	1389	if (flag & INS_ABOVE_FLOOR_ONLY)
1396	top = floor;	1390	top = floor;
1397		1391
1398	/* Top is the object that our object (op) is going to get inserted above.	1392	/* Top is the object that our object (op) is going to get inserted above.
1399	*/	1393	*/
1400		1394
1401	/* First object on this space */	1395	/* First object on this space */
1402	if (!top)	1396	if (!top)
1403	{	1397	{
1404	op->above = GET_MAP_OB (op->map, op->x, op->y);	1398	op->above = ms.bot;
1405		1399
1406	if (op->above)	1400	if (op->above)
1407	op->above->below = op;	1401	op->above->below = op;
1408		1402
1409	op->below = NULL;	1403	op->below = 0;
1410	op->map->at (op->x, op->y).bottom = op;	1404	ms.bot = op;
1411	}	1405	}
1412	else	1406	else
1413	{ /* get inserted into the stack above top */	1407	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1408	op->above = top->above;
1415		1409
…		…
1418		1412
1419	op->below = top;	1413	op->below = top;
1420	top->above = op;	1414	top->above = op;
1421	}	1415	}
1422		1416
1423	if (op->above == NULL)	1417	if (!op->above)
1424	op->map->at (op->x, op->y).top = op;	1418	ms.top = op;
1425	} /* else not INS_BELOW_ORIGINATOR */	1419	} /* else not INS_BELOW_ORIGINATOR */
1426		1420
1427	if (op->type == PLAYER)	1421	if (op->type == PLAYER)
		1422	{
1428	op->contr->do_los = 1;	1423	op->contr->do_los = 1;
		1424	++op->map->players;
		1425	op->map->touch ();
		1426	}
		1427
		1428	op->map->dirty = true;
1429		1429
1430	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1431	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1432	*/	1432	*/
1433	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->map->at (op->x, op->y).player ())	1434	if (object *pl = ms.player ())
		1435	if (pl->contr->ns)
1435	pl->contr->socket->floorbox_update ();	1436	pl->contr->ns->floorbox_update ();
1436		1437
1437	/* If this object glows, it may affect lighting conditions that are	1438	/* If this object glows, it may affect lighting conditions that are
1438	* visible to others on this map. But update_all_los is really	1439	* visible to others on this map. But update_all_los is really
1439	* an inefficient way to do this, as it means los for all players	1440	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1441	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1442	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1443	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1444	* or just updating the P_UPTODATE for spaces within this area
1444	* of effect may be sufficient.	1445	* of effect may be sufficient.
1445	*/	1446	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1447	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1448	update_all_los (op->map, op->x, op->y);
1448		1449
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1450	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1451	update_object (op, UP_OBJ_INSERT);
		1452
		1453	INVOKE_OBJECT (INSERT, op);
1451		1454
1452	/* Don't know if moving this to the end will break anything. However,	1455	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1456	* we want to have floorbox_update called before calling this.
1454	*	1457	*
1455	* check_move_on() must be after this because code called from	1458	* check_move_on() must be after this because code called from
…		…
1457	* blocked() and wall() work properly), and these flags are updated by	1460	* blocked() and wall() work properly), and these flags are updated by
1458	* update_object().	1461	* update_object().
1459	*/	1462	*/
1460		1463
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1464	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1465	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1463	{	1466	{
1464	if (check_move_on (op, originator))	1467	if (check_move_on (op, originator))
1465	return NULL;	1468	return 0;
1466		1469
1467	/* If we are a multi part object, lets work our way through the check	1470	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1471	* walk on's.
1469	*/	1472	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1473	for (object *tmp = op->more; tmp; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1474	if (check_move_on (tmp, originator))
1472	return NULL;	1475	return 0;
1473	}	1476	}
1474		1477
1475	return op;	1478	return op;
1476	}	1479	}
1477		1480
…		…
1484	{	1487	{
1485	object *tmp, *tmp1;	1488	object *tmp, *tmp1;
1486		1489
1487	/* first search for itself and remove any old instances */	1490	/* first search for itself and remove any old instances */
1488		1491
1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1492	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1491	tmp->destroy ();	1494	tmp->destroy ();
1492		1495
1493	tmp1 = arch_to_object (archetype::find (arch_string));	1496	tmp1 = arch_to_object (archetype::find (arch_string));
1494		1497
1495	tmp1->x = op->x;	1498	tmp1->x = op->x;
1496	tmp1->y = op->y;	1499	tmp1->y = op->y;
1497	insert_ob_in_map (tmp1, op->map, op, 0);	1500	insert_ob_in_map (tmp1, op->map, op, 0);
		1501	}
		1502
		1503	object *
		1504	object::insert_at (object *where, object *originator, int flags)
		1505	{
		1506	return where->map->insert (this, where->x, where->y, originator, flags);
1498	}	1507	}
1499		1508
1500	/*	1509	/*
1501	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1510	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1502	* is returned contains nr objects, and the remaining parts contains	1511	* is returned contains nr objects, and the remaining parts contains
1503	* the rest (or is removed and freed if that number is 0).	1512	* the rest (or is removed and freed if that number is 0).
1504	* On failure, NULL is returned, and the reason put into the	1513	* On failure, NULL is returned, and the reason put into the
1505	* global static errmsg array.	1514	* global static errmsg array.
1506	*/	1515	*/
1507
1508	object *	1516	object *
1509	get_split_ob (object *orig_ob, uint32 nr)	1517	get_split_ob (object *orig_ob, uint32 nr)
1510	{	1518	{
1511	object *newob;	1519	object *newob;
1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1520	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1543	* the amount of an object. If the amount reaches 0, the object	1551	* the amount of an object. If the amount reaches 0, the object
1544	* is subsequently removed and freed.	1552	* is subsequently removed and freed.
1545	*	1553	*
1546	* Return value: 'op' if something is left, NULL if the amount reached 0	1554	* Return value: 'op' if something is left, NULL if the amount reached 0
1547	*/	1555	*/
1548
1549	object *	1556	object *
1550	decrease_ob_nr (object *op, uint32 i)	1557	decrease_ob_nr (object *op, uint32 i)
1551	{	1558	{
1552	object *tmp;	1559	object *tmp;
1553	player *pl;
1554		1560
1555	if (i == 0) /* objects with op->nrof require this check */	1561	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1562	return op;
1557		1563
1558	if (i > op->nrof)	1564	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1577	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1578	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1579	* and then searching the map for a player.
1574	*/	1580	*/
1575	if (!tmp)	1581	if (!tmp)
1576	{	1582	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1583	if (pl->ob->container == op->env)
1579	{	1584	{
1580	tmp = pl->ob;	1585	tmp = pl->ob;
1581	break;	1586	break;
1582	}	1587	}
1583	}
1584		1588
1585	if (i < op->nrof)	1589	if (i < op->nrof)
1586	{	1590	{
1587	sub_weight (op->env, op->weight * i);	1591	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1592	op->nrof -= i;
…		…
1631		1635
1632	/*	1636	/*
1633	* add_weight(object, weight) adds the specified weight to an object,	1637	* add_weight(object, weight) adds the specified weight to an object,
1634	* and also updates how much the environment(s) is/are carrying.	1638	* and also updates how much the environment(s) is/are carrying.
1635	*/	1639	*/
1636
1637	void	1640	void
1638	add_weight (object *op, signed long weight)	1641	add_weight (object *op, signed long weight)
1639	{	1642	{
1640	while (op != NULL)	1643	while (op != NULL)
1641	{	1644	{
…		…
1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1659	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1657	free (dump);	1660	free (dump);
1658	return op;	1661	return op;
1659	}	1662	}
1660		1663
1661	if (where->head)	1664	if (where->head_ () != where)
1662	{	1665	{
1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1666	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1664	where = where->head;	1667	where = where->head;
1665	}	1668	}
1666		1669
1667	return where->insert (op);	1670	return where->insert (op);
1668	}	1671	}
…		…
1673	* inside the object environment.	1676	* inside the object environment.
1674	*	1677	*
1675	* The function returns now pointer to inserted item, and return value can	1678	* The function returns now pointer to inserted item, and return value can
1676	* be != op, if items are merged. -Tero	1679	* be != op, if items are merged. -Tero
1677	*/	1680	*/
1678
1679	object *	1681	object *
1680	object::insert (object *op)	1682	object::insert (object *op)
1681	{	1683	{
1682	object *tmp, *otmp;	1684	object *tmp, *otmp;
1683		1685
…		…
1724	add_weight (this, (op->weight + op->carrying));	1726	add_weight (this, (op->weight + op->carrying));
1725		1727
1726	otmp = this->in_player ();	1728	otmp = this->in_player ();
1727	if (otmp && otmp->contr)	1729	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1730	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1731	otmp->update_stats ();
1730		1732
1731	op->map = 0;	1733	op->map = 0;
1732	op->env = this;	1734	op->env = this;
1733	op->above = 0;	1735	op->above = 0;
1734	op->below = 0;	1736	op->below = 0;
…		…
1738	if ((op->glow_radius != 0) && map)	1740	if ((op->glow_radius != 0) && map)
1739	{	1741	{
1740	#ifdef DEBUG_LIGHTS	1742	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1743	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1744	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1745	if (map->darkness)
1744	update_all_los (map, x, y);	1746	update_all_los (map, x, y);
1745	}	1747	}
1746		1748
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1749	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1750	* It sure simplifies this function...
…		…
1753	{	1755	{
1754	op->below = inv;	1756	op->below = inv;
1755	op->below->above = op;	1757	op->below->above = op;
1756	inv = op;	1758	inv = op;
1757	}	1759	}
		1760
		1761	INVOKE_OBJECT (INSERT, this);
1758		1762
1759	return op;	1763	return op;
1760	}	1764	}
1761		1765
1762	/*	1766	/*
…		…
1777	*	1781	*
1778	* MSW 2001-07-08: Check all objects on space, not just those below	1782	* MSW 2001-07-08: Check all objects on space, not just those below
1779	* object being inserted. insert_ob_in_map may not put new objects	1783	* object being inserted. insert_ob_in_map may not put new objects
1780	* on top.	1784	* on top.
1781	*/	1785	*/
1782
1783	int	1786	int
1784	check_move_on (object *op, object *originator)	1787	check_move_on (object *op, object *originator)
1785	{	1788	{
1786	object *tmp;	1789	object *tmp;
1787	maptile *m = op->map;	1790	maptile *m = op->map;
…		…
1814		1817
1815	/* The objects have to be checked from top to bottom.	1818	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1819	* Hence, we first go to the top:
1817	*/	1820	*/
1818		1821
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1822	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820	{	1823	{
1821	/* Trim the search when we find the first other spell effect	1824	/* Trim the search when we find the first other spell effect
1822	* this helps performance so that if a space has 50 spell objects,	1825	* this helps performance so that if a space has 50 spell objects,
1823	* we don't need to check all of them.	1826	* we don't need to check all of them.
1824	*/	1827	*/
…		…
1842	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1845	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1846	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1844	{	1847	{
1845		1848
1846	float	1849	float
1847	diff = tmp->move_slow_penalty * FABS (op->speed);	1850	diff = tmp->move_slow_penalty * fabs (op->speed);
1848		1851
1849	if (op->type == PLAYER)	1852	if (op->type == PLAYER)
1850	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1853	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1851	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1854	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1852	diff /= 4.0;	1855	diff /= 4.0;
…		…
1879	/*	1882	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1883	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1884	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1883	*/	1886	*/
1884
1885	object *	1887	object *
1886	present_arch (const archetype *at, maptile *m, int x, int y)	1888	present_arch (const archetype *at, maptile *m, int x, int y)
1887	{	1889	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL || out_of_map (m, x, y))	1890	if (!m || out_of_map (m, x, y))
1892	{	1891	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1892	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1893	return NULL;
1895	}	1894	}
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1895
		1896	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897	if (tmp->arch == at)	1897	if (tmp->arch == at)
1898	return tmp;	1898	return tmp;
		1899
1899	return NULL;	1900	return NULL;
1900	}	1901	}
1901		1902
1902	/*	1903	/*
1903	* present(type, map, x, y) searches for any objects with	1904	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1905	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1906	* The first matching object is returned, or NULL if none.
1906	*/	1907	*/
1907
1908	object *	1908	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
1910	{	1910	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1911	if (out_of_map (m, x, y))
1915	{	1912	{
1916	LOG (llevError, "Present called outside map.\n");	1913	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1914	return NULL;
1918	}	1915	}
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1916
		1917	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920	if (tmp->type == type)	1918	if (tmp->type == type)
1921	return tmp;	1919	return tmp;
		1920
1922	return NULL;	1921	return NULL;
1923	}	1922	}
1924		1923
1925	/*	1924	/*
1926	* present_in_ob(type, object) searches for any objects with	1925	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1926	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1927	* The first matching object is returned, or NULL if none.
1929	*/	1928	*/
1930
1931	object *	1929	object *
1932	present_in_ob (unsigned char type, const object *op)	1930	present_in_ob (unsigned char type, const object *op)
1933	{	1931	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1932	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1933	if (tmp->type == type)
1939	return tmp;	1934	return tmp;
		1935
1940	return NULL;	1936	return NULL;
1941	}	1937	}
1942		1938
1943	/*	1939	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1940	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1948	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1949	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1950	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1951	* to be unique.
1956	*/	1952	*/
1957
1958	object *	1953	object *
1959	present_in_ob_by_name (int type, const char *str, const object *op)	1954	present_in_ob_by_name (int type, const char *str, const object *op)
1960	{	1955	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1956	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1957	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1958	return tmp;
1968	}	1959
1969	return NULL;	1960	return 0;
1970	}	1961	}
1971		1962
1972	/*	1963	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1964	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1965	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
1976	*/	1967	*/
1977
1978	object *	1968	object *
1979	present_arch_in_ob (const archetype *at, const object *op)	1969	present_arch_in_ob (const archetype *at, const object *op)
1980	{	1970	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1971	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1972	if (tmp->arch == at)
1986	return tmp;	1973	return tmp;
		1974
1987	return NULL;	1975	return NULL;
1988	}	1976	}
1989		1977
1990	/*	1978	/*
1991	* activate recursively a flag on an object inventory	1979	* activate recursively a flag on an object inventory
1992	*/	1980	*/
1993	void	1981	void
1994	flag_inv (object *op, int flag)	1982	flag_inv (object *op, int flag)
1995	{	1983	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1984	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1985	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1986	{
2002	SET_FLAG (tmp, flag);	1987	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1988	flag_inv (tmp, flag);
2004	}	1989	}
2005	} /*	1990	}
		1991
		1992	/*
2006	* desactivate recursively a flag on an object inventory	1993	* deactivate recursively a flag on an object inventory
2007	*/	1994	*/
2008	void	1995	void
2009	unflag_inv (object *op, int flag)	1996	unflag_inv (object *op, int flag)
2010	{	1997	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1998	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1999	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	2000	{
2017	CLEAR_FLAG (tmp, flag);	2001	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	2002	unflag_inv (tmp, flag);
2019	}	2003	}
2020	}
2021
2022	/*
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.
2027	*/
2028
2029	void
2030	set_cheat (object *op)
2031	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);
2034	}	2004	}
2035		2005
2036	/*	2006	/*
2037	* find_free_spot(object, map, x, y, start, stop) will search for	2007	* find_free_spot(object, map, x, y, start, stop) will search for
2038	* a spot at the given map and coordinates which will be able to contain	2008	* a spot at the given map and coordinates which will be able to contain
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	2022	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	2023	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	2024	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	2025	* customized, changed states, etc.
2056	*/	2026	*/
2057
2058	int	2027	int
2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2028	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060	{	2029	{
2061	int
2062	i,
2063	index = 0, flag;	2030	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	2031	int altern[SIZEOFFREE];
2066		2032
2067	for (i = start; i < stop; i++)	2033	for (int i = start; i < stop; i++)
2068	{	2034	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2035	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070	if (!flag)	2036	if (!flag)
2071	altern[index++] = i;	2037	altern [index++] = i;
2072		2038
2073	/* Basically, if we find a wall on a space, we cut down the search size.	2039	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	2040	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	2041	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	2042	* if the space being examined only has a wall to the north and empty
…		…
2083	}	2049	}
2084		2050
2085	if (!index)	2051	if (!index)
2086	return -1;	2052	return -1;
2087		2053
2088	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
2089	}	2055	}
2090		2056
2091	/*	2057	/*
2092	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	2060	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2061	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	2062	*/
2097
2098	int	2063	int
2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100	{	2065	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2068	return i;
2108	}	2069
2109	return -1;	2070	return -1;
2110	}	2071	}
2111		2072
2112	/*	2073	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2074	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2075	* arr[begin..end-1].
		2076	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2077	*/
2116	static void	2078	static void
2117	permute (int *arr, int begin, int end)	2079	permute (int *arr, int begin, int end)
2118	{	2080	{
2119	int	2081	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2082	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2083
2130	tmp = arr[i];	2084	while (--end)
2131	arr[i] = arr[j];	2085	swap (arr [end], arr [rndm (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2086	}
2135		2087
2136	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2138	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2093	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2094	*/
2143	void	2095	void
2144	get_search_arr (int *search_arr)	2096	get_search_arr (int *search_arr)
2145	{	2097	{
2146	int	2098	int i;
2147	i;
2148		2099
2149	for (i = 0; i < SIZEOFFREE; i++)	2100	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2101	search_arr[i] = i;
2152	}
2153		2102
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2103	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2104	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2105	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2106	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2115	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2116	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2117	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2118	* there is capable of.
2170	*/	2119	*/
2171
2172	int	2120	int
2173	find_dir (maptile *m, int x, int y, object *exclude)	2121	find_dir (maptile *m, int x, int y, object *exclude)
2174	{	2122	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2123	int i, max = SIZEOFFREE, mflags;
2178		2124
2179	sint16 nx, ny;	2125	sint16 nx, ny;
2180	object *	2126	object *tmp;
2181	tmp;
2182	maptile *	2127	maptile *mp;
2183	mp;
2184		2128
2185	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2186		2130
2187	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2188	{	2132	{
2189	exclude = exclude->head;	2133	exclude = exclude->head;
2190	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2191	}	2135	}
2192	else	2136	else
…		…
2205		2149
2206	if (mflags & P_OUT_OF_MAP)	2150	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2151	max = maxfree[i];
2208	else	2152	else
2209	{	2153	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2154	mapspace &ms = mp->at (nx, ny);
		2155
		2156	blocked = ms.move_block;
2211		2157
2212	if ((move_type & blocked) == move_type)	2158	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2159	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2215	{	2161	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2218	break;	2165	break;
2219		2166
2220	if (tmp)	2167	if (tmp)
2221	return freedir[i];	2168	return freedir[i];
2222	}	2169	}
…		…
2228		2175
2229	/*	2176	/*
2230	* distance(object 1, object 2) will return the square of the	2177	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2178	* distance between the two given objects.
2232	*/	2179	*/
2233
2234	int	2180	int
2235	distance (const object *ob1, const object *ob2)	2181	distance (const object *ob1, const object *ob2)
2236	{	2182	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2183	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2184	}
2242		2185
2243	/*	2186	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2187	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2188	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2189	* object, needs to travel toward it.
2247	*/	2190	*/
2248
2249	int	2191	int
2250	find_dir_2 (int x, int y)	2192	find_dir_2 (int x, int y)
2251	{	2193	{
2252	int q;	2194	int q;
2253		2195
…		…
2282		2224
2283	return 3;	2225	return 3;
2284	}	2226	}
2285		2227
2286	/*	2228	/*
2287	* absdir(int): Returns a number between 1 and 8, which represent
2288	* the "absolute" direction of a number (it actually takes care of
2289	* "overflow" in previous calculations of a direction).
2290	*/
2291
2292	int
2293	absdir (int d)
2294	{
2295	while (d < 1)
2296	d += 8;
2297	while (d > 8)
2298	d -= 8;
2299	return d;
2300	}
2301
2302	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2305	*/	2231	*/
2306
2307	int	2232	int
2308	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2309	{	2234	{
2310	int	2235	int d;
2311	d;
2312		2236
2313	d = abs (dir1 - dir2);	2237	d = abs (dir1 - dir2);
2314	if (d > 4)	2238	if (d > 4)
2315	d = 8 - d;	2239	d = 8 - d;
		2240
2316	return d;	2241	return d;
2317	}	2242	}
2318		2243
2319	/* peterm:	2244	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2245	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2248	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2249	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2250	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2251	* functions.
2327	*/	2252	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2253	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2254	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2255	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2256	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2257	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2258	{0, 0, 0}, /* 4 */
…		…
2441	* create clone from object to another	2364	* create clone from object to another
2442	*/	2365	*/
2443	object *	2366	object *
2444	object_create_clone (object *asrc)	2367	object_create_clone (object *asrc)
2445	{	2368	{
2446	object *dst = 0, *tmp, *src, *part, *prev, *item;	2369	object *dst = 0, *tmp, *src, *prev, *item;
2447		2370
2448	if (!asrc)	2371	if (!asrc)
2449	return 0;	2372	return 0;
2450		2373
2451	src = asrc;
2452	if (src->head)
2453	src = src->head;	2374	src = asrc->head_ ();
2454		2375
2455	prev = 0;	2376	prev = 0;
2456	for (part = src; part; part = part->more)	2377	for (object *part = src; part; part = part->more)
2457	{	2378	{
2458	tmp = part->clone ();	2379	tmp = part->clone ();
2459	tmp->x -= src->x;	2380	tmp->x -= src->x;
2460	tmp->y -= src->y;	2381	tmp->y -= src->y;
2461		2382
…		…
2479	insert_ob_in_ob (object_create_clone (item), dst);	2400	insert_ob_in_ob (object_create_clone (item), dst);
2480		2401
2481	return dst;	2402	return dst;
2482	}	2403	}
2483		2404
2484	/* GROS - Creates an object using a string representing its content. */
2485	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *
2492	load_object_str (const char *obstr)
2493	{
2494	object *op;
2495	char filename[MAX_BUF];
2496
2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499	FILE *tempfile = fopen (filename, "w");
2500
2501	if (tempfile == NULL)
2502	{
2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2504	return NULL;
2505	}
2506
2507	fprintf (tempfile, obstr);
2508	fclose (tempfile);
2509
2510	op = object::create ();
2511
2512	object_thawer thawer (filename);
2513
2514	if (thawer)
2515	load_object (thawer, op, 0);
2516
2517	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518	CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520	return op;
2521	}
2522
2523	/* This returns the first object in who's inventory that	2405	/* This returns the first object in who's inventory that
2524	* has the same type and subtype match.	2406	* has the same type and subtype match.
2525	* returns NULL if no match.	2407	* returns NULL if no match.
2526	*/	2408	*/
2527	object *	2409	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2410	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2411	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2412	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2413	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2414	return tmp;
2535		2415
2536	return NULL;	2416	return 0;
2537	}	2417	}
2538		2418
2539	/* If ob has a field named key, return the link from the list,	2419	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2420	* otherwise return NULL.
2541	*	2421	*
…		…
2543	* do the desired thing.	2423	* do the desired thing.
2544	*/	2424	*/
2545	key_value *	2425	key_value *
2546	get_ob_key_link (const object *ob, const char *key)	2426	get_ob_key_link (const object *ob, const char *key)
2547	{	2427	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2428	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2429	if (link->key == key)
2552	return link;	2430	return link;
2553		2431
2554	return NULL;	2432	return 0;
2555	}	2433	}
2556		2434
2557	/*	2435	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2436	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2437	*
…		…
2584	if (link->key == canonical_key)	2462	if (link->key == canonical_key)
2585	return link->value;	2463	return link->value;
2586		2464
2587	return 0;	2465	return 0;
2588	}	2466	}
2589
2590		2467
2591	/*	2468	/*
2592	* Updates the canonical_key in op to value.	2469	* Updates the canonical_key in op to value.
2593	*	2470	*
2594	* canonical_key is a shared string (value doesn't have to be).	2471	* canonical_key is a shared string (value doesn't have to be).
…		…
2599	* Returns TRUE on success.	2476	* Returns TRUE on success.
2600	*/	2477	*/
2601	int	2478	int
2602	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2479	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603	{	2480	{
2604	key_value *
2605	field = NULL, *last = NULL;	2481	key_value *field = NULL, *last = NULL;
2606		2482
2607	for (field = op->key_values; field != NULL; field = field->next)	2483	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2484	{
2609	if (field->key != canonical_key)	2485	if (field->key != canonical_key)
2610	{	2486	{
…		…
2638	/* IF we get here, key doesn't exist */	2514	/* IF we get here, key doesn't exist */
2639		2515
2640	/* No field, we'll have to add it. */	2516	/* No field, we'll have to add it. */
2641		2517
2642	if (!add_key)	2518	if (!add_key)
2643	{
2644	return FALSE;	2519	return FALSE;
2645	}	2520
2646	/* There isn't any good reason to store a null	2521	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2522	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2523	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2524	* be here. If user wants to store empty strings,
2650	* should pass in ""	2525	* should pass in ""
…		…
2699	}	2574	}
2700	else	2575	else
2701	item = item->env;	2576	item = item->env;
2702	}	2577	}
2703		2578
		2579
		2580	const char *
		2581	object::flag_desc (char *desc, int len) const
		2582	{
		2583	char *p = desc;
		2584	bool first = true;
		2585
		2586	*p = 0;
		2587
		2588	for (int i = 0; i < NUM_FLAGS; i++)
		2589	{
		2590	if (len <= 10) // magic constant!
		2591	{
		2592	snprintf (p, len, ",...");
		2593	break;
		2594	}
		2595
		2596	if (flag [i])
		2597	{
		2598	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2599	len -= cnt;
		2600	p += cnt;
		2601	first = false;
		2602	}
		2603	}
		2604
		2605	return desc;
		2606	}
		2607
2704	// return a suitable string describing an objetc in enough detail to find it	2608	// return a suitable string describing an object in enough detail to find it
2705	const char *	2609	const char *
2706	object::debug_desc (char *info) const	2610	object::debug_desc (char *info) const
2707	{	2611	{
		2612	char flagdesc[512];
2708	char info2[256 * 3];	2613	char info2[256 * 4];
2709	char *p = info;	2614	char *p = info;
2710		2615
2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2616	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2712	count,	2617	count, uuid.seq,
2713	&name,	2618	&name,
2714	title ? " " : "",	2619	title ? "\",title:\"" : "",
2715	title ? (const char *)title : "");	2620	title ? (const char *)title : "",
		2621	flag_desc (flagdesc, 512), type);
2716		2622
2717	if (env)	2623	if (env)
2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2624	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719		2625
2720	if (map)	2626	if (map)
2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2627	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722		2628
2723	return info;	2629	return info;
2724	}	2630	}
2725		2631
2726	const char *	2632	const char *
2727	object::debug_desc () const	2633	object::debug_desc () const
2728	{	2634	{
2729	static char info[256 * 3];	2635	static char info[3][256 * 4];
		2636	static int info_idx;
		2637
2730	return debug_desc (info);	2638	return debug_desc (info [++info_idx % 3]);
2731	}	2639	}
2732		2640
		2641	struct region *
		2642	object::region () const
		2643	{
		2644	return map ? map->region (x, y)
		2645	: region::default_region ();
		2646	}
		2647
		2648	const materialtype_t *
		2649	object::dominant_material () const
		2650	{
		2651	if (materialtype_t *mat = name_to_material (materialname))
		2652	return mat;
		2653
		2654	// omfg this is slow, this has to be temporary :)
		2655	shstr unknown ("unknown");
		2656
		2657	return name_to_material (unknown);
		2658	}
		2659
		2660	void
		2661	object::open_container (object *new_container)
		2662	{
		2663	if (container == new_container)
		2664	return;
		2665
		2666	if (object *old_container = container)
		2667	{
		2668	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	#if 0
		2672	// remove the "Close old_container" object.
		2673	if (object *closer = old_container->inv)
		2674	if (closer->type == CLOSE_CON)
		2675	closer->destroy ();
		2676	#endif
		2677
		2678	old_container->flag [FLAG_APPLIED] = 0;
		2679	container = 0;
		2680
		2681	esrv_update_item (UPD_FLAGS, this, old_container);
		2682	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2683	}
		2684
		2685	if (new_container)
		2686	{
		2687	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2688	return;
		2689
		2690	// TODO: this does not seem to serve any purpose anymore?
		2691	#if 0
		2692	// insert the "Close Container" object.
		2693	if (archetype *closer = new_container->other_arch)
		2694	{
		2695	object *closer = arch_to_object (new_container->other_arch);
		2696	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2697	new_container->insert (closer);
		2698	}
		2699	#endif
		2700
		2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2702
		2703	new_container->flag [FLAG_APPLIED] = 1;
		2704	container = new_container;
		2705
		2706	esrv_update_item (UPD_FLAGS, this, new_container);
		2707	esrv_send_inventory (this, new_container);
		2708	}
		2709	}
		2710
		2711

Diff Legend

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