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.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

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

Diff Legend

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