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.74 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.117 by root, Thu Jan 18 16:19:34 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	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 ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
277		278
278	/* 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
279	* 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
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* 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
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* 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.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
467	}	466	}
468		467
469	op->key_values = 0;	468	op->key_values = 0;
470	}	469	}
471		470
472	void object::clear ()
473	{
474	attachable_base::clear ();
475
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	/*	471	/*
515	* copy_to first frees everything allocated by the dst object,	472	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second	473	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
518	* 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,
…		…
524	{	481	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527		484
528	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
529	*(object_pod *)dst = *this;
530
531	if (self || cb)
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533		486
534	if (is_freed)	487	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
536		489
537	if (is_removed)	490	if (is_removed)
…		…
568	tail = new_link;	521	tail = new_link;
569	}	522	}
570	}	523	}
571	}	524	}
572		525
573	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
574	}	527	}
575		528
576	object *	529	object *
577	object::clone ()	530	object::clone ()
578	{	531	{
…		…
584	/*	537	/*
585	* 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
586	* 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
587	* 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.
588	*/	541	*/
589
590	void	542	void
591	update_turn_face (object *op)	543	update_turn_face (object *op)
592	{	544	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	546	return;
		547
595	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
597	}	550	}
598		551
599	/*	552	/*
600	* 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
601	* 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.
602	* 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.
603	*/	556	*/
604	void	557	void
605	update_ob_speed (object *op)	558	object::set_speed (float speed)
606	{	559	{
607	extern int arch_init;	560	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	{	561	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	563	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	564	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		565
632	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		567
636	if (op->active_next != NULL)	568	if (has_active_speed ())
637	op->active_next->active_prev = op;	569	activate ();
638
639	active_objects = op;
640	}
641	else	570	else
642	{	571	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	}	572	}
666		573
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	}
697
698	/*	574	/*
699	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
701	* 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
702	* invisible object, etc...)	578	* invisible object, etc...)
703	* 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
704	* 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
705	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
706	*	582	*
707	* 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.
708	* For example, if the only thing that has changed is the face (due to
709	* an animation), we don't need to call update_position until that actually
710	* comes into view of a player. OTOH, many other things, like addition/removal
711	* of walls or living creatures may need us to update the flags now.
712	* current action are:	584	* current action are:
713	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
714	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
715	* 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
716	* 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.
717	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
718	*/	590	*/
719
720	void	591	void
721	update_object (object *op, int action)	592	update_object (object *op, int action)
722	{	593	{
723	int update_now = 0, flags;
724	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
725		595
726	if (op == NULL)	596	if (op == NULL)
727	{	597	{
728	/* this should never happen */	598	/* this should never happen */
729	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
730	return;	600	return;
731	}	601	}
732		602
733	if (op->env != NULL)	603	if (op->env)
734	{	604	{
735	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
736	* to do in this case.	606	* to do in this case.
737	*/	607	*/
738	return;	608	return;
…		…
743	*/	613	*/
744	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
745	return;	615	return;
746		616
747	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
748	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)
749	{	619	{
750	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
751	#ifdef MANY_CORES	621	#ifdef MANY_CORES
752	abort ();	622	abort ();
753	#endif	623	#endif
754	return;	624	return;
755	}	625	}
756		626
757	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
758	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
759	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
760	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
761	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
762	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
763		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
764	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
765	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
766	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767	update_now = 1;
768
769	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
771		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
772	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
773	update_now = 1;
774
775	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
776	update_now = 1;
777
778	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
779	update_now = 1;
780
781	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
782	update_now = 1;
783
784	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
785	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
786
787	/* 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
788	* to have move_allow right now.	644	* to have move_allow right now.
789	*/	645	*/
790	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
791	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
792		648	m.flags_ = 0;
793	if ((move_slow | op->move_slow) != move_slow)
794	update_now = 1;
795	}	649	}
796
797	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
798	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
799	* that is being removed.	652	* that is being removed.
800	*/	653	*/
801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
802	update_now = 1;	655	m.flags_ = 0;
803	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
804	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
805	else	658	else
806	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
807		660
808	if (update_now)
809	{
810	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
811	update_position (op->map, op->x, op->y);
812	}
813
814	if (op->more != NULL)	661	if (op->more)
815	update_object (op->more, action);	662	update_object (op->more, action);
816	}
817
818	object::vector object::mortals;
819	object::vector object::objects; // not yet used
820	object *object::first;
821
822	void object::free_mortals ()
823	{
824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
825	if ((*i)->refcnt)
826	++i; // further delay freeing
827	else
828	{
829	delete *i;
830	mortals.erase (i);
831	}
832	}	663	}
833		664
834	object::object ()	665	object::object ()
835	{	666	{
836	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
…		…
842	object::~object ()	673	object::~object ()
843	{	674	{
844	free_key_values (this);	675	free_key_values (this);
845	}	676	}
846		677
		678	static int object_count;
		679
847	void object::link ()	680	void object::link ()
848	{	681	{
849	count = ++ob_count;	682	assert (!index);//D
850	uuid = gen_uuid ();	683	uuid = gen_uuid ();
		684	count = ++object_count;
851		685
852	prev = 0;	686	refcnt_inc ();
853	next = object::first;	687	objects.insert (this);
854
855	if (object::first)
856	object::first->prev = this;
857
858	object::first = this;
859	}	688	}
860		689
861	void object::unlink ()	690	void object::unlink ()
862	{	691	{
863	if (this == object::first)	692	assert (index);//D
864	object::first = next;	693	objects.erase (this);
		694	refcnt_dec ();
		695	}
865		696
866	/* Remove this object from the list of used objects */	697	void
867	if (prev) prev->next = next;	698	object::activate ()
868	if (next) next->prev = prev;	699	{
		700	/* If already on active list, don't do anything */
		701	if (active)
		702	return;
869		703
870	prev = 0;	704	if (has_active_speed ())
871	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	}
872	}	801	}
873		802
874	object *object::create ()	803	object *object::create ()
875	{	804	{
876	object *op = new object;	805	object *op = new object;
877	op->link ();	806	op->link ();
878	return op;	807	return op;
879	}	808	}
880		809
881	/*	810	void
882	* free_object() frees everything allocated by an object, removes	811	object::do_destroy ()
883	* it from the list of used objects, and puts it on the list of
884	* free objects. The IS_FREED() flag is set in the object.
885	* The object must have been removed by remove_ob() first for
886	* this function to succeed.
887	*
888	* If destroy_inventory is set, free inventory as well. Else drop items in
889	* inventory to the ground.
890	*/
891	void object::destroy (bool destroy_inventory)
892	{	812	{
893	if (QUERY_FLAG (this, FLAG_FREED))	813	attachable::do_destroy ();
894	return;
895		814
896	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
		816	remove_button_link (this);
		817
		818	if (flag [FLAG_FRIENDLY])
897	remove_friendly_object (this);	819	remove_friendly_object (this);
898		820
899	if (!QUERY_FLAG (this, FLAG_REMOVED))	821	if (!flag [FLAG_REMOVED])
900	remove ();	822	remove ();
901		823
902	SET_FLAG (this, FLAG_FREED);	824	destroy_inv (true);
903		825
904	if (more)	826	deactivate ();
905	{	827	unlink ();
906	more->destroy (destroy_inventory);
907	more = 0;
908	}
909		828
910	if (inv)	829	flag [FLAG_FREED] = 1;
911	{
912	/* Only if the space blocks everything do we not process -
913	* if some form of movement is allowed, let objects
914	* drop on that space.
915	*/
916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
917	{
918	object *op = inv;
919
920	while (op)
921	{
922	object *tmp = op->below;
923	op->destroy (destroy_inventory);
924	op = tmp;
925	}
926	}
927	else
928	{ /* Put objects in inventory onto this space */
929	object *op = inv;
930
931	while (op)
932	{
933	object *tmp = op->below;
934
935	op->remove ();
936
937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
939	op->destroy ();
940	else
941	{
942	op->x = x;
943	op->y = y;
944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
945	}
946
947	op = tmp;
948	}
949	}
950	}
951		830
952	// hack to ensure that freed objects still have a valid map	831	// hack to ensure that freed objects still have a valid map
953	{	832	{
954	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
955		834
…		…
959		838
960	freed_map->name = "/internal/freed_objects_map";	839	freed_map->name = "/internal/freed_objects_map";
961	freed_map->width = 3;	840	freed_map->width = 3;
962	freed_map->height = 3;	841	freed_map->height = 3;
963		842
964	freed_map->allocate ();	843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
965	}	845	}
966		846
967	map = freed_map;	847	map = freed_map;
968	x = 1;	848	x = 1;
969	y = 1;	849	y = 1;
970	}	850	}
971		851
		852	head = 0;
		853
		854	if (more)
		855	{
		856	more->destroy ();
		857	more = 0;
		858	}
		859
972	// clear those pointers that likely might have circular references to us	860	// clear those pointers that likely might have circular references to us
973	owner = 0;	861	owner = 0;
974	enemy = 0;	862	enemy = 0;
975	attacked_by = 0;	863	attacked_by = 0;
		864	}
976		865
977	// only relevant for players(?), but make sure of it anyways	866	void
978	contr = 0;	867	object::destroy (bool destroy_inventory)
		868	{
		869	if (destroyed ())
		870	return;
979		871
980	/* Remove object from the active list */	872	if (destroy_inventory)
981	speed = 0;	873	destroy_inv (false);
982	update_ob_speed (this);
983		874
984	unlink ();	875	attachable::destroy ();
985
986	mortals.push_back (this);
987	}	876	}
988		877
989	/*	878	/*
990	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
991	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
…		…
1010	* environment, the x and y coordinates will be updated to	899	* environment, the x and y coordinates will be updated to
1011	* the previous environment.	900	* the previous environment.
1012	* Beware: This function is called from the editor as well!	901	* Beware: This function is called from the editor as well!
1013	*/	902	*/
1014	void	903	void
1015	object::remove ()	904	object::remove_slow ()
1016	{	905	{
1017	object *tmp, *last = 0;	906	object *tmp, *last = 0;
1018	object *otmp;	907	object *otmp;
1019		908
1020	int check_walk_off;
1021
1022	if (QUERY_FLAG (this, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1023	return;	910	return;
1024		911
1025	SET_FLAG (this, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
1026		914
1027	if (more)	915	if (more)
1028	more->remove ();	916	more->remove ();
1029		917
1030	/*	918	/*
…		…
1041	/* 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
1042	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	931	* to save cpu time.
1044	*/	932	*/
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046	fix_player (otmp);	934	otmp->update_stats ();
1047		935
1048	if (above != NULL)	936	if (above)
1049	above->below = below;	937	above->below = below;
1050	else	938	else
1051	env->inv = below;	939	env->inv = below;
1052		940
1053	if (below != NULL)	941	if (below)
1054	below->above = above;	942	below->above = above;
1055		943
1056	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1057	* 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
1058	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
…		…
1062	above = 0, below = 0;	950	above = 0, below = 0;
1063	env = 0;	951	env = 0;
1064	}	952	}
1065	else if (map)	953	else if (map)
1066	{	954	{
1067	/* Re did the following section of code - it looks like it had	955	if (type == PLAYER)
1068	* lots of logic for things we no longer care about
1069	*/	956	{
		957	--map->players;
		958	map->touch ();
		959	}
		960
		961	map->dirty = true;
		962	mapspace &ms = this->ms ();
1070		963
1071	/* link the object above us */	964	/* link the object above us */
1072	if (above)	965	if (above)
1073	above->below = below;	966	above->below = below;
1074	else	967	else
1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	968	ms.top = below; /* we were top, set new top */
1076		969
1077	/* Relink the object below us, if there is one */	970	/* Relink the object below us, if there is one */
1078	if (below)	971	if (below)
1079	below->above = above;	972	below->above = above;
1080	else	973	else
…		…
1082	/* 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
1083	* use translated coordinates in case some oddness with map tiling is	976	* use translated coordinates in case some oddness with map tiling is
1084	* evident	977	* evident
1085	*/	978	*/
1086	if (GET_MAP_OB (map, x, y) != this)	979	if (GET_MAP_OB (map, x, y) != this)
1087	{
1088	char *dump = dump_object (this);
1089	LOG (llevError,
1090	"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 ());
1091	free (dump);
1092	dump = dump_object (GET_MAP_OB (map, x, y));
1093	LOG (llevError, "%s\n", dump);
1094	free (dump);
1095	}
1096		981
1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */	982	ms.bot = above; /* goes on above it. */
1098	}	983	}
1099		984
1100	above = 0;	985	above = 0;
1101	below = 0;	986	below = 0;
1102		987
1103	if (map->in_memory == MAP_SAVING)	988	if (map->in_memory == MAP_SAVING)
1104	return;	989	return;
1105		990
1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	991	int check_walk_off = !flag [FLAG_NO_APPLY];
1107		992
1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	993	for (tmp = ms.bot; tmp; tmp = tmp->above)
1109	{	994	{
1110	/* 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
1111	* being removed.	996	* being removed.
1112	*/	997	*/
1113		998
…		…
1117	* removed (most likely destroyed), update the player view	1002	* removed (most likely destroyed), update the player view
1118	* appropriately.	1003	* appropriately.
1119	*/	1004	*/
1120	if (tmp->container == this)	1005	if (tmp->container == this)
1121	{	1006	{
1122	CLEAR_FLAG (this, FLAG_APPLIED);	1007	flag [FLAG_APPLIED] = 0;
1123	tmp->container = 0;	1008	tmp->container = 0;
1124	}	1009	}
1125		1010
		1011	if (tmp->contr->ns)
1126	tmp->contr->socket->floorbox_update ();	1012	tmp->contr->ns->floorbox_update ();
1127	}	1013	}
1128		1014
1129	/* See if player moving off should effect something */	1015	/* See if object moving off should effect something */
1130	if (check_walk_off	1016	if (check_walk_off
1131	&& ((move_type & tmp->move_off)	1017	&& ((move_type & tmp->move_off)
1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1018	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1133	{	1019	{
1134	move_apply (tmp, this, 0);	1020	move_apply (tmp, this, 0);
…		…
1136	if (destroyed ())	1022	if (destroyed ())
1137	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 ());
1138	}	1024	}
1139		1025
1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1026	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1141		1027	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1142	if (tmp->above == tmp)	1028	if (tmp->above == tmp)
1143	tmp->above = 0;	1029	tmp->above = 0;
1144		1030
1145	last = tmp;	1031	last = tmp;
1146	}	1032	}
1147		1033
1148	/* 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?
1149	if (!last)	1036	if (!last)
1150	{	1037	map->at (x, y).flags_ = 0;
1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1153	* those out anyways, and if there are any flags set right now, they won't
1154	* be correct anyways.
1155	*/
1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1157	update_position (map, x, y);
1158	}
1159	else	1038	else
1160	update_object (last, UP_OBJ_REMOVE);	1039	update_object (last, UP_OBJ_REMOVE);
1161		1040
1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1041	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163	update_all_los (map, x, y);	1042	update_all_los (map, x, y);
1164	}	1043	}
1165	}	1044	}
1166		1045
1167	/*	1046	/*
…		…
1176	merge_ob (object *op, object *top)	1055	merge_ob (object *op, object *top)
1177	{	1056	{
1178	if (!op->nrof)	1057	if (!op->nrof)
1179	return 0;	1058	return 0;
1180		1059
1181	if (top == NULL)	1060	if (top)
1182	for (top = op; top != NULL && top->above != NULL; top = top->above);	1061	for (top = op; top && top->above; top = top->above)
		1062	;
1183		1063
1184	for (; top != NULL; top = top->below)	1064	for (; top; top = top->below)
1185	{	1065	{
1186	if (top == op)	1066	if (top == op)
1187	continue;	1067	continue;
1188		1068
1189	if (object::can_merge (op, top))	1069	if (object::can_merge (op, top))
…		…
1199		1079
1200	return 0;	1080	return 0;
1201	}	1081	}
1202		1082
1203	/*	1083	/*
1204	* 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
1205	* job preparing multi-part monsters	1085	* job preparing multi-part monsters.
1206	*/	1086	*/
1207	object *	1087	object *
1208	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)
1209	{	1089	{
1210	object *tmp;
1211
1212	if (op->head)
1213	op = op->head;
1214
1215	for (tmp = op; tmp; tmp = tmp->more)	1090	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1216	{	1091	{
1217	tmp->x = x + tmp->arch->clone.x;	1092	tmp->x = x + tmp->arch->clone.x;
1218	tmp->y = y + tmp->arch->clone.y;	1093	tmp->y = y + tmp->arch->clone.y;
1219	}	1094	}
1220		1095
…		…
1239	* Return value:	1114	* Return value:
1240	* new object if 'op' was merged with other object	1115	* new object if 'op' was merged with other object
1241	* NULL if 'op' was destroyed	1116	* NULL if 'op' was destroyed
1242	* just 'op' otherwise	1117	* just 'op' otherwise
1243	*/	1118	*/
1244
1245	object *	1119	object *
1246	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)
1247	{	1121	{
1248	object *tmp, *top, *floor = NULL;	1122	object *tmp, *top, *floor = NULL;
1249	sint16 x, y;
1250		1123
1251	if (QUERY_FLAG (op, FLAG_FREED))	1124	if (QUERY_FLAG (op, FLAG_FREED))
1252	{	1125	{
1253	LOG (llevError, "Trying to insert freed object!\n");	1126	LOG (llevError, "Trying to insert freed object!\n");
1254	return NULL;	1127	return NULL;
1255	}	1128	}
1256		1129
1257	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)
1258	{	1136	{
1259	char *dump = dump_object (op);	1137	char *dump = dump_object (op);
1260	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);
1261	free (dump);	1139	free (dump);
1262	return op;	1140	return op;
…		…
1275	#endif	1153	#endif
1276	free (dump);	1154	free (dump);
1277	return op;	1155	return op;
1278	}	1156	}
1279		1157
1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1281	{
1282	char *dump = dump_object (op);
1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284	free (dump);
1285	return op;
1286	}
1287
1288	if (op->more != NULL)
1289	{
1290	/* The part may be on a different map. */
1291
1292	object *more = op->more;	1158	if (object *more = op->more)
1293		1159	{
1294	/* We really need the caller to normalize coordinates - if
1295	* we set the map, that doesn't work if the location is within
1296	* a map and this is straddling an edge. So only if coordinate
1297	* is clear wrong do we normalize it.
1298	*/
1299	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1300	more->map = get_map_from_coord (m, &more->x, &more->y);
1301	else if (!more->map)
1302	{
1303	/* For backwards compatibility - when not dealing with tiled maps,
1304	* more->map should always point to the parent.
1305	*/
1306	more->map = m;
1307	}
1308
1309	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1160	if (!insert_ob_in_map (more, m, originator, flag))
1310	{	1161	{
1311	if (!op->head)	1162	if (!op->head)
1312	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");
1313		1164
1314	return NULL;	1165	return 0;
1315	}	1166	}
1316	}	1167	}
1317		1168
1318	CLEAR_FLAG (op, FLAG_REMOVED);	1169	CLEAR_FLAG (op, FLAG_REMOVED);
1319		1170
1320	/* Ideally, the caller figures this out. However, it complicates a lot	1171	/* Ideally, the caller figures this out. However, it complicates a lot
1321	* 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
1322	* need extra work	1173	* need extra work
1323	*/	1174	*/
1324	op->map = get_map_from_coord (m, &op->x, &op->y);	1175	if (!xy_normalise (m, op->x, op->y))
1325	x = op->x;	1176	return 0;
1326	y = op->y;	1177
		1178	op->map = m;
		1179	mapspace &ms = op->ms ();
1327		1180
1328	/* this has to be done after we translate the coordinates.	1181	/* this has to be done after we translate the coordinates.
1329	*/	1182	*/
1330	if (op->nrof && !(flag & INS_NO_MERGE))	1183	if (op->nrof && !(flag & INS_NO_MERGE))
1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1184	for (tmp = ms.bot; tmp; tmp = tmp->above)
1332	if (object::can_merge (op, tmp))	1185	if (object::can_merge (op, tmp))
1333	{	1186	{
1334	op->nrof += tmp->nrof;	1187	op->nrof += tmp->nrof;
1335	tmp->destroy ();	1188	tmp->destroy ();
1336	}	1189	}
…		…
1353	op->below = originator->below;	1206	op->below = originator->below;
1354		1207
1355	if (op->below)	1208	if (op->below)
1356	op->below->above = op;	1209	op->below->above = op;
1357	else	1210	else
1358	SET_MAP_OB (op->map, op->x, op->y, op);	1211	ms.bot = op;
1359		1212
1360	/* since *below* originator, no need to update top */	1213	/* since *below* originator, no need to update top */
1361	originator->below = op;	1214	originator->below = op;
1362	}	1215	}
1363	else	1216	else
1364	{	1217	{
		1218	top = ms.bot;
		1219
1365	/* If there are other objects, then */	1220	/* If there are other objects, then */
1366	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1221	if ((!(flag & INS_MAP_LOAD)) && top)
1367	{	1222	{
1368	object *last = NULL;	1223	object *last = 0;
1369		1224
1370	/*	1225	/*
1371	* 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.
1372	* We've already dealt with merging if appropriate.	1227	* We've already dealt with merging if appropriate.
1373	* 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
…		…
1377	* 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
1378	* 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
1379	* 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
1380	* that flying non pickable objects are spell objects.	1235	* that flying non pickable objects are spell objects.
1381	*/	1236	*/
1382		1237	for (top = ms.bot; top; top = top->above)
1383	while (top != NULL)
1384	{	1238	{
1385	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))
1386	floor = top;	1240	floor = top;
1387		1241
1388	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))
…		…
1391	top = top->below;	1245	top = top->below;
1392	break;	1246	break;
1393	}	1247	}
1394		1248
1395	last = top;	1249	last = top;
1396	top = top->above;
1397	}	1250	}
1398		1251
1399	/* 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 */
1400	top = last;	1253	top = last;
1401		1254
…		…
1408	* Unless those objects are exits, type 66	1261	* Unless those objects are exits, type 66
1409	* If INS_ON_TOP is used, don't do this processing	1262	* If INS_ON_TOP is used, don't do this processing
1410	* Need to find the object that in fact blocks view, otherwise	1263	* Need to find the object that in fact blocks view, otherwise
1411	* stacking is a bit odd.	1264	* stacking is a bit odd.
1412	*/	1265	*/
1413	if (!(flag & INS_ON_TOP) &&	1266	if (!(flag & INS_ON_TOP)
1414	(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))
1415	{	1269	{
1416	for (last = top; last != floor; last = last->below)	1270	for (last = top; last != floor; last = last->below)
1417	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1271	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418	break;	1272	break;
		1273
1419	/* Check to see if we found the object that blocks view,	1274	/* Check to see if we found the object that blocks view,
1420	* 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
1421	* we can get inserted below this one, which requires we	1276	* we can get inserted below this one, which requires we
1422	* set top to the object below us.	1277	* set top to the object below us.
1423	*/	1278	*/
…		…
1425	top = last->below;	1280	top = last->below;
1426	}	1281	}
1427	} /* If objects on this space */	1282	} /* If objects on this space */
1428		1283
1429	if (flag & INS_MAP_LOAD)	1284	if (flag & INS_MAP_LOAD)
1430	top = GET_MAP_TOP (op->map, op->x, op->y);	1285	top = ms.top;
1431		1286
1432	if (flag & INS_ABOVE_FLOOR_ONLY)	1287	if (flag & INS_ABOVE_FLOOR_ONLY)
1433	top = floor;	1288	top = floor;
1434		1289
1435	/* 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.
1436	*/	1291	*/
1437		1292
1438	/* First object on this space */	1293	/* First object on this space */
1439	if (!top)	1294	if (!top)
1440	{	1295	{
1441	op->above = GET_MAP_OB (op->map, op->x, op->y);	1296	op->above = ms.bot;
1442		1297
1443	if (op->above)	1298	if (op->above)
1444	op->above->below = op;	1299	op->above->below = op;
1445		1300
1446	op->below = NULL;	1301	op->below = 0;
1447	SET_MAP_OB (op->map, op->x, op->y, op);	1302	ms.bot = op;
1448	}	1303	}
1449	else	1304	else
1450	{ /* get inserted into the stack above top */	1305	{ /* get inserted into the stack above top */
1451	op->above = top->above;	1306	op->above = top->above;
1452		1307
…		…
1455		1310
1456	op->below = top;	1311	op->below = top;
1457	top->above = op;	1312	top->above = op;
1458	}	1313	}
1459		1314
1460	if (op->above == NULL)	1315	if (!op->above)
1461	SET_MAP_TOP (op->map, op->x, op->y, op);	1316	ms.top = op;
1462	} /* else not INS_BELOW_ORIGINATOR */	1317	} /* else not INS_BELOW_ORIGINATOR */
1463		1318
1464	if (op->type == PLAYER)	1319	if (op->type == PLAYER)
		1320	{
1465	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;
1466		1327
1467	/* 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
1468	* it, so save a few ticks and start from there.	1329	* it, so save a few ticks and start from there.
1469	*/	1330	*/
1470	if (!(flag & INS_MAP_LOAD))	1331	if (!(flag & INS_MAP_LOAD))
1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1332	if (object *pl = ms.player ())
1472	if (tmp->type == PLAYER)	1333	if (pl->contr->ns)
1473	tmp->contr->socket->floorbox_update ();	1334	pl->contr->ns->floorbox_update ();
1474		1335
1475	/* If this object glows, it may affect lighting conditions that are	1336	/* If this object glows, it may affect lighting conditions that are
1476	* 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
1477	* 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
1478	* on the map will get recalculated. The players could very well	1339	* on the map will get recalculated. The players could very well
1479	* 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 -
1480	* this should get redone to only look for players within range,	1341	* this should get redone to only look for players within range,
1481	* or just updating the P_NEED_UPDATE for spaces within this area	1342	* or just updating the P_UPTODATE for spaces within this area
1482	* of effect may be sufficient.	1343	* of effect may be sufficient.
1483	*/	1344	*/
1484	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1345	if (op->map->darkness && (op->glow_radius != 0))
1485	update_all_los (op->map, op->x, op->y);	1346	update_all_los (op->map, op->x, op->y);
1486		1347
1487	/* updates flags (blocked, alive, no magic, etc) for this map space */	1348	/* updates flags (blocked, alive, no magic, etc) for this map space */
1488	update_object (op, UP_OBJ_INSERT);	1349	update_object (op, UP_OBJ_INSERT);
		1350
		1351	INVOKE_OBJECT (INSERT, op);
1489		1352
1490	/* 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,
1491	* we want to have floorbox_update called before calling this.	1354	* we want to have floorbox_update called before calling this.
1492	*	1355	*
1493	* check_move_on() must be after this because code called from	1356	* check_move_on() must be after this because code called from
…		…
1498		1361
1499	/* 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 */
1500	if (!(flag & INS_NO_WALK_ON) && !op->head)	1363	if (!(flag & INS_NO_WALK_ON) && !op->head)
1501	{	1364	{
1502	if (check_move_on (op, originator))	1365	if (check_move_on (op, originator))
1503	return NULL;	1366	return 0;
1504		1367
1505	/* 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
1506	* walk on's.	1369	* walk on's.
1507	*/	1370	*/
1508	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1371	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1509	if (check_move_on (tmp, originator))	1372	if (check_move_on (tmp, originator))
1510	return NULL;	1373	return 0;
1511	}	1374	}
1512		1375
1513	return op;	1376	return op;
1514	}	1377	}
1515		1378
1516	/* this function inserts an object in the map, but if it	1379	/* this function inserts an object in the map, but if it
1517	* 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.
1518	* 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.
1519	*/	1382	*/
1520	void	1383	void
1521	replace_insert_ob_in_map (const char *arch_string, object *op)	1384	replace_insert_ob_in_map (const char *arch_string, object *op)
1522	{	1385	{
1523	object *	1386	object *tmp, *tmp1;
1524	tmp;
1525	object *
1526	tmp1;
1527		1387
1528	/* first search for itself and remove any old instances */	1388	/* first search for itself and remove any old instances */
1529		1389
1530	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)
1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1391	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1532	tmp->destroy ();	1392	tmp->destroy ();
1533		1393
1534	tmp1 = arch_to_object (archetype::find (arch_string));	1394	tmp1 = arch_to_object (archetype::find (arch_string));
1535		1395
1536	tmp1->x = op->x;	1396	tmp1->x = op->x;
1537	tmp1->y = op->y;	1397	tmp1->y = op->y;
1538	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);
1539	}	1405	}
1540		1406
1541	/*	1407	/*
1542	* 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
1543	* is returned contains nr objects, and the remaining parts contains	1409	* is returned contains nr objects, and the remaining parts contains
1544	* 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).
1545	* On failure, NULL is returned, and the reason put into the	1411	* On failure, NULL is returned, and the reason put into the
1546	* global static errmsg array.	1412	* global static errmsg array.
1547	*/	1413	*/
1548
1549	object *	1414	object *
1550	get_split_ob (object *orig_ob, uint32 nr)	1415	get_split_ob (object *orig_ob, uint32 nr)
1551	{	1416	{
1552	object *newob;	1417	object *newob;
1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1418	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1589		1454
1590	object *	1455	object *
1591	decrease_ob_nr (object *op, uint32 i)	1456	decrease_ob_nr (object *op, uint32 i)
1592	{	1457	{
1593	object *tmp;	1458	object *tmp;
1594	player *pl;
1595		1459
1596	if (i == 0) /* objects with op->nrof require this check */	1460	if (i == 0) /* objects with op->nrof require this check */
1597	return op;	1461	return op;
1598		1462
1599	if (i > op->nrof)	1463	if (i > op->nrof)
…		…
1612	* IMO, searching through all the players will mostly	1476	* IMO, searching through all the players will mostly
1613	* likely be quicker than following op->env to the map,	1477	* likely be quicker than following op->env to the map,
1614	* and then searching the map for a player.	1478	* and then searching the map for a player.
1615	*/	1479	*/
1616	if (!tmp)	1480	if (!tmp)
1617	{	1481	for_all_players (pl)
1618	for (pl = first_player; pl; pl = pl->next)
1619	if (pl->ob->container == op->env)	1482	if (pl->ob->container == op->env)
1620	{	1483	{
1621	tmp = pl->ob;	1484	tmp = pl->ob;
1622	break;	1485	break;
1623	}	1486	}
1624	}
1625		1487
1626	if (i < op->nrof)	1488	if (i < op->nrof)
1627	{	1489	{
1628	sub_weight (op->env, op->weight * i);	1490	sub_weight (op->env, op->weight * i);
1629	op->nrof -= i;	1491	op->nrof -= i;
…		…
1765	add_weight (this, (op->weight + op->carrying));	1627	add_weight (this, (op->weight + op->carrying));
1766		1628
1767	otmp = this->in_player ();	1629	otmp = this->in_player ();
1768	if (otmp && otmp->contr)	1630	if (otmp && otmp->contr)
1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1631	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1770	fix_player (otmp);	1632	otmp->update_stats ();
1771		1633
1772	op->map = 0;	1634	op->map = 0;
1773	op->env = this;	1635	op->env = this;
1774	op->above = 0;	1636	op->above = 0;
1775	op->below = 0;	1637	op->below = 0;
…		…
1779	if ((op->glow_radius != 0) && map)	1641	if ((op->glow_radius != 0) && map)
1780	{	1642	{
1781	#ifdef DEBUG_LIGHTS	1643	#ifdef DEBUG_LIGHTS
1782	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);
1783	#endif /* DEBUG_LIGHTS */	1645	#endif /* DEBUG_LIGHTS */
1784	if (MAP_DARKNESS (map))	1646	if (map->darkness)
1785	update_all_los (map, x, y);	1647	update_all_los (map, x, y);
1786	}	1648	}
1787		1649
1788	/* 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.
1789	* It sure simplifies this function...	1651	* It sure simplifies this function...
…		…
1794	{	1656	{
1795	op->below = inv;	1657	op->below = inv;
1796	op->below->above = op;	1658	op->below->above = op;
1797	inv = op;	1659	inv = op;
1798	}	1660	}
		1661
		1662	INVOKE_OBJECT (INSERT, this);
1799		1663
1800	return op;	1664	return op;
1801	}	1665	}
1802		1666
1803	/*	1667	/*
…		…
1818	*	1682	*
1819	* 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
1820	* 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
1821	* on top.	1685	* on top.
1822	*/	1686	*/
1823
1824	int	1687	int
1825	check_move_on (object *op, object *originator)	1688	check_move_on (object *op, object *originator)
1826	{	1689	{
1827	object *tmp;	1690	object *tmp;
1828	maptile *m = op->map;	1691	maptile *m = op->map;
…		…
1855		1718
1856	/* The objects have to be checked from top to bottom.	1719	/* The objects have to be checked from top to bottom.
1857	* Hence, we first go to the top:	1720	* Hence, we first go to the top:
1858	*/	1721	*/
1859		1722
1860	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)
1861	{	1724	{
1862	/* Trim the search when we find the first other spell effect	1725	/* Trim the search when we find the first other spell effect
1863	* 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,
1864	* we don't need to check all of them.	1727	* we don't need to check all of them.
1865	*/	1728	*/
…		…
1920	/*	1783	/*
1921	* present_arch(arch, map, x, y) searches for any objects with	1784	* present_arch(arch, map, x, y) searches for any objects with
1922	* a matching archetype at the given map and coordinates.	1785	* a matching archetype at the given map and coordinates.
1923	* The first matching object is returned, or NULL if none.	1786	* The first matching object is returned, or NULL if none.
1924	*/	1787	*/
1925
1926	object *	1788	object *
1927	present_arch (const archetype *at, maptile *m, int x, int y)	1789	present_arch (const archetype *at, maptile *m, int x, int y)
1928	{	1790	{
1929	object *
1930	tmp;
1931
1932	if (m == NULL || out_of_map (m, x, y))	1791	if (!m || out_of_map (m, x, y))
1933	{	1792	{
1934	LOG (llevError, "Present_arch called outside map.\n");	1793	LOG (llevError, "Present_arch called outside map.\n");
1935	return NULL;	1794	return NULL;
1936	}	1795	}
1937	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)
1938	if (tmp->arch == at)	1798	if (tmp->arch == at)
1939	return tmp;	1799	return tmp;
		1800
1940	return NULL;	1801	return NULL;
1941	}	1802	}
1942		1803
1943	/*	1804	/*
1944	* present(type, map, x, y) searches for any objects with	1805	* present(type, map, x, y) searches for any objects with
1945	* a matching type variable at the given map and coordinates.	1806	* a matching type variable at the given map and coordinates.
1946	* The first matching object is returned, or NULL if none.	1807	* The first matching object is returned, or NULL if none.
1947	*/	1808	*/
1948
1949	object *	1809	object *
1950	present (unsigned char type, maptile *m, int x, int y)	1810	present (unsigned char type, maptile *m, int x, int y)
1951	{	1811	{
1952	object *
1953	tmp;
1954
1955	if (out_of_map (m, x, y))	1812	if (out_of_map (m, x, y))
1956	{	1813	{
1957	LOG (llevError, "Present called outside map.\n");	1814	LOG (llevError, "Present called outside map.\n");
1958	return NULL;	1815	return NULL;
1959	}	1816	}
1960	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)
1961	if (tmp->type == type)	1819	if (tmp->type == type)
1962	return tmp;	1820	return tmp;
		1821
1963	return NULL;	1822	return NULL;
1964	}	1823	}
1965		1824
1966	/*	1825	/*
1967	* present_in_ob(type, object) searches for any objects with	1826	* present_in_ob(type, object) searches for any objects with
1968	* a matching type variable in the inventory of the given object.	1827	* a matching type variable in the inventory of the given object.
1969	* The first matching object is returned, or NULL if none.	1828	* The first matching object is returned, or NULL if none.
1970	*/	1829	*/
1971
1972	object *	1830	object *
1973	present_in_ob (unsigned char type, const object *op)	1831	present_in_ob (unsigned char type, const object *op)
1974	{	1832	{
1975	object *
1976	tmp;
1977
1978	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1833	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1979	if (tmp->type == type)	1834	if (tmp->type == type)
1980	return tmp;	1835	return tmp;
		1836
1981	return NULL;	1837	return NULL;
1982	}	1838	}
1983		1839
1984	/*	1840	/*
1985	* present_in_ob (type, str, object) searches for any objects with	1841	* present_in_ob (type, str, object) searches for any objects with
…		…
1993	* 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
1994	* 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
1995	* 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
1996	* to be unique.	1852	* to be unique.
1997	*/	1853	*/
1998
1999	object *	1854	object *
2000	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)
2001	{	1856	{
2002	object *
2003	tmp;
2004
2005	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1857	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006	{
2007	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1858	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2008	return tmp;	1859	return tmp;
2009	}	1860
2010	return NULL;	1861	return 0;
2011	}	1862	}
2012		1863
2013	/*	1864	/*
2014	* present_arch_in_ob(archetype, object) searches for any objects with	1865	* present_arch_in_ob(archetype, object) searches for any objects with
2015	* a matching archetype in the inventory of the given object.	1866	* a matching archetype in the inventory of the given object.
2016	* The first matching object is returned, or NULL if none.	1867	* The first matching object is returned, or NULL if none.
2017	*/	1868	*/
2018
2019	object *	1869	object *
2020	present_arch_in_ob (const archetype *at, const object *op)	1870	present_arch_in_ob (const archetype *at, const object *op)
2021	{	1871	{
2022	object *
2023	tmp;
2024
2025	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1872	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2026	if (tmp->arch == at)	1873	if (tmp->arch == at)
2027	return tmp;	1874	return tmp;
		1875
2028	return NULL;	1876	return NULL;
2029	}	1877	}
2030		1878
2031	/*	1879	/*
2032	* activate recursively a flag on an object inventory	1880	* activate recursively a flag on an object inventory
2033	*/	1881	*/
2034	void	1882	void
2035	flag_inv (object *op, int flag)	1883	flag_inv (object *op, int flag)
2036	{	1884	{
2037	object *
2038	tmp;
2039
2040	if (op->inv)	1885	if (op->inv)
2041	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1886	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2042	{	1887	{
2043	SET_FLAG (tmp, flag);	1888	SET_FLAG (tmp, flag);
2044	flag_inv (tmp, flag);	1889	flag_inv (tmp, flag);
2045	}	1890	}
2046	} /*	1891	}
		1892
		1893	/*
2047	* desactivate recursively a flag on an object inventory	1894	* deactivate recursively a flag on an object inventory
2048	*/	1895	*/
2049	void	1896	void
2050	unflag_inv (object *op, int flag)	1897	unflag_inv (object *op, int flag)
2051	{	1898	{
2052	object *
2053	tmp;
2054
2055	if (op->inv)	1899	if (op->inv)
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057	{	1901	{
2058	CLEAR_FLAG (tmp, flag);	1902	CLEAR_FLAG (tmp, flag);
2059	unflag_inv (tmp, flag);	1903	unflag_inv (tmp, flag);
2060	}	1904	}
2061	}	1905	}
…		…
2064	* 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
2065	* all it's inventory (recursively).	1909	* all it's inventory (recursively).
2066	* 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
2067	* 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.
2068	*/	1912	*/
2069
2070	void	1913	void
2071	set_cheat (object *op)	1914	set_cheat (object *op)
2072	{	1915	{
2073	SET_FLAG (op, FLAG_WAS_WIZ);	1916	SET_FLAG (op, FLAG_WAS_WIZ);
2074	flag_inv (op, FLAG_WAS_WIZ);	1917	flag_inv (op, FLAG_WAS_WIZ);
…		…
2093	* 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
2094	* 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
2095	* 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
2096	* customized, changed states, etc.	1939	* customized, changed states, etc.
2097	*/	1940	*/
2098
2099	int	1941	int
2100	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)
2101	{	1943	{
2102	int
2103	i,
2104	index = 0, flag;	1944	int index = 0, flag;
2105	static int
2106	altern[SIZEOFFREE];	1945	int altern[SIZEOFFREE];
2107		1946
2108	for (i = start; i < stop; i++)	1947	for (int i = start; i < stop; i++)
2109	{	1948	{
2110	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]);
2111	if (!flag)	1950	if (!flag)
2112	altern[index++] = i;	1951	altern [index++] = i;
2113		1952
2114	/* 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.
2115	* 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.
2116	* 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 -
2117	* 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
…		…
2133	* find_first_free_spot(archetype, maptile, x, y) works like	1972	* find_first_free_spot(archetype, maptile, x, y) works like
2134	* find_free_spot(), but it will search max number of squares.	1973	* find_free_spot(), but it will search max number of squares.
2135	* 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.
2136	* 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.
2137	*/	1976	*/
2138
2139	int	1977	int
2140	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)
2141	{	1979	{
2142	int
2143	i;
2144
2145	for (i = 0; i < SIZEOFFREE; i++)	1980	for (int i = 0; i < SIZEOFFREE; i++)
2146	{
2147	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]))
2148	return i;	1982	return i;
2149	}	1983
2150	return -1;	1984	return -1;
2151	}	1985	}
2152		1986
2153	/*	1987	/*
2154	* The function permute(arr, begin, end) randomly reorders the array	1988	* The function permute(arr, begin, end) randomly reorders the array
2155	* arr[begin..end-1].	1989	* arr[begin..end-1].
		1990	* now uses a fisher-yates shuffle, old permute was broken
2156	*/	1991	*/
2157	static void	1992	static void
2158	permute (int *arr, int begin, int end)	1993	permute (int *arr, int begin, int end)
2159	{	1994	{
2160	int	1995	arr += begin;
2161	i,
2162	j,
2163	tmp,
2164	len;
2165
2166	len = end - begin;	1996	end -= begin;
2167	for (i = begin; i < end; i++)
2168	{
2169	j = begin + RANDOM () % len;
2170		1997
2171	tmp = arr[i];	1998	while (--end)
2172	arr[i] = arr[j];	1999	swap (arr [end], arr [RANDOM () % (end + 1)]);
2173	arr[j] = tmp;
2174	}
2175	}	2000	}
2176		2001
2177	/* new function to make monster searching more efficient, and effective!	2002	/* new function to make monster searching more efficient, and effective!
2178	* This basically returns a randomized array (in the passed pointer) of	2003	* This basically returns a randomized array (in the passed pointer) of
2179	* 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
…		…
2182	* 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.
2183	*/	2008	*/
2184	void	2009	void
2185	get_search_arr (int *search_arr)	2010	get_search_arr (int *search_arr)
2186	{	2011	{
2187	int	2012	int i;
2188	i;
2189		2013
2190	for (i = 0; i < SIZEOFFREE; i++)	2014	for (i = 0; i < SIZEOFFREE; i++)
2191	{
2192	search_arr[i] = i;	2015	search_arr[i] = i;
2193	}
2194		2016
2195	permute (search_arr, 1, SIZEOFFREE1 + 1);	2017	permute (search_arr, 1, SIZEOFFREE1 + 1);
2196	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2018	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2197	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2019	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2198	}	2020	}
…		…
2207	* Perhaps incorrectly, but I'm making the assumption that exclude	2029	* Perhaps incorrectly, but I'm making the assumption that exclude
2208	* 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
2209	* 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
2210	* there is capable of.	2032	* there is capable of.
2211	*/	2033	*/
2212
2213	int	2034	int
2214	find_dir (maptile *m, int x, int y, object *exclude)	2035	find_dir (maptile *m, int x, int y, object *exclude)
2215	{	2036	{
2216	int
2217	i,
2218	max = SIZEOFFREE, mflags;	2037	int i, max = SIZEOFFREE, mflags;
2219		2038
2220	sint16 nx, ny;	2039	sint16 nx, ny;
2221	object *	2040	object *tmp;
2222	tmp;
2223	maptile *	2041	maptile *mp;
2224	mp;
2225		2042
2226	MoveType blocked, move_type;	2043	MoveType blocked, move_type;
2227		2044
2228	if (exclude && exclude->head)	2045	if (exclude && exclude->head)
2229	{	2046	{
…		…
2241	mp = m;	2058	mp = m;
2242	nx = x + freearr_x[i];	2059	nx = x + freearr_x[i];
2243	ny = y + freearr_y[i];	2060	ny = y + freearr_y[i];
2244		2061
2245	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2062	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2063
2246	if (mflags & P_OUT_OF_MAP)	2064	if (mflags & P_OUT_OF_MAP)
2247	{
2248	max = maxfree[i];	2065	max = maxfree[i];
2249	}
2250	else	2066	else
2251	{	2067	{
2252	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2068	mapspace &ms = mp->at (nx, ny);
		2069
		2070	blocked = ms.move_block;
2253		2071
2254	if ((move_type & blocked) == move_type)	2072	if ((move_type & blocked) == move_type)
2255	{
2256	max = maxfree[i];	2073	max = maxfree[i];
2257	}
2258	else if (mflags & P_IS_ALIVE)	2074	else if (mflags & P_IS_ALIVE)
2259	{	2075	{
2260	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2076	for (tmp = ms.bot; tmp; tmp = tmp->above)
2261	{	2077	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2262	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2078	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2263	{
2264	break;	2079	break;
2265	}	2080
2266	}
2267	if (tmp)	2081	if (tmp)
2268	{
2269	return freedir[i];	2082	return freedir[i];
2270	}
2271	}	2083	}
2272	}	2084	}
2273	}	2085	}
		2086
2274	return 0;	2087	return 0;
2275	}	2088	}
2276		2089
2277	/*	2090	/*
2278	* distance(object 1, object 2) will return the square of the	2091	* distance(object 1, object 2) will return the square of the
2279	* distance between the two given objects.	2092	* distance between the two given objects.
2280	*/	2093	*/
2281
2282	int	2094	int
2283	distance (const object *ob1, const object *ob2)	2095	distance (const object *ob1, const object *ob2)
2284	{	2096	{
2285	int
2286	i;
2287
2288	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);
2289	return i;
2290	}	2098	}
2291		2099
2292	/*	2100	/*
2293	* 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
2294	* 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
2295	* object, needs to travel toward it.	2103	* object, needs to travel toward it.
2296	*/	2104	*/
2297
2298	int	2105	int
2299	find_dir_2 (int x, int y)	2106	find_dir_2 (int x, int y)
2300	{	2107	{
2301	int	2108	int q;
2302	q;
2303		2109
2304	if (y)	2110	if (y)
2305	q = x * 100 / y;	2111	q = x * 100 / y;
2306	else if (x)	2112	else if (x)
2307	q = -300 * x;	2113	q = -300 * x;
…		…
2332		2138
2333	return 3;	2139	return 3;
2334	}	2140	}
2335		2141
2336	/*	2142	/*
2337	* absdir(int): Returns a number between 1 and 8, which represent
2338	* the "absolute" direction of a number (it actually takes care of
2339	* "overflow" in previous calculations of a direction).
2340	*/
2341
2342	int
2343	absdir (int d)
2344	{
2345	while (d < 1)
2346	d += 8;
2347	while (d > 8)
2348	d -= 8;
2349	return d;
2350	}
2351
2352	/*
2353	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2143	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2354	* between two directions (which are expected to be absolute (see absdir())	2144	* between two directions (which are expected to be absolute (see absdir())
2355	*/	2145	*/
2356
2357	int	2146	int
2358	dirdiff (int dir1, int dir2)	2147	dirdiff (int dir1, int dir2)
2359	{	2148	{
2360	int	2149	int d;
2361	d;
2362		2150
2363	d = abs (dir1 - dir2);	2151	d = abs (dir1 - dir2);
2364	if (d > 4)	2152	if (d > 4)
2365	d = 8 - d;	2153	d = 8 - d;
		2154
2366	return d;	2155	return d;
2367	}	2156	}
2368		2157
2369	/* peterm:	2158	/* peterm:
2370	* 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.
…		…
2373	* 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
2374	* 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.
2375	* 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
2376	* functions.	2165	* functions.
2377	*/	2166	*/
2378
2379	int
2380	reduction_dir[SIZEOFFREE][3] = {	2167	int reduction_dir[SIZEOFFREE][3] = {
2381	{0, 0, 0}, /* 0 */	2168	{0, 0, 0}, /* 0 */
2382	{0, 0, 0}, /* 1 */	2169	{0, 0, 0}, /* 1 */
2383	{0, 0, 0}, /* 2 */	2170	{0, 0, 0}, /* 2 */
2384	{0, 0, 0}, /* 3 */	2171	{0, 0, 0}, /* 3 */
2385	{0, 0, 0}, /* 4 */	2172	{0, 0, 0}, /* 4 */
…		…
2433	* find a path to that monster that we found. If not,	2220	* find a path to that monster that we found. If not,
2434	* we don't bother going toward it. Returns 1 if we	2221	* we don't bother going toward it. Returns 1 if we
2435	* can see a direct way to get it	2222	* can see a direct way to get it
2436	* Modified to be map tile aware -.MSW	2223	* Modified to be map tile aware -.MSW
2437	*/	2224	*/
2438
2439
2440	int	2225	int
2441	can_see_monsterP (maptile *m, int x, int y, int dir)	2226	can_see_monsterP (maptile *m, int x, int y, int dir)
2442	{	2227	{
2443	sint16 dx, dy;	2228	sint16 dx, dy;
2444	int
2445	mflags;	2229	int mflags;
2446		2230
2447	if (dir < 0)	2231	if (dir < 0)
2448	return 0; /* exit condition: invalid direction */	2232	return 0; /* exit condition: invalid direction */
2449		2233
2450	dx = x + freearr_x[dir];	2234	dx = x + freearr_x[dir];
…		…
2463	return 0;	2247	return 0;
2464		2248
2465	/* yes, can see. */	2249	/* yes, can see. */
2466	if (dir < 9)	2250	if (dir < 9)
2467	return 1;	2251	return 1;
		2252
2468	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2253	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2469	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]);
2470	}	2256	}
2471
2472
2473		2257
2474	/*	2258	/*
2475	* 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
2476	* picked up by the picker. Returnes 1 if it can be	2260	* picked up by the picker. Returnes 1 if it can be
2477	* picked up, otherwise 0.	2261	* picked up, otherwise 0.
…		…
2488	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2272	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2489	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2273	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2490	!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));
2491	}	2275	}
2492		2276
2493
2494	/*	2277	/*
2495	* create clone from object to another	2278	* create clone from object to another
2496	*/	2279	*/
2497	object *	2280	object *
2498	object_create_clone (object *asrc)	2281	object_create_clone (object *asrc)
…		…
2517	{	2300	{
2518	dst = tmp;	2301	dst = tmp;
2519	tmp->head = 0;	2302	tmp->head = 0;
2520	}	2303	}
2521	else	2304	else
2522	{
2523	tmp->head = dst;	2305	tmp->head = dst;
2524	}
2525		2306
2526	tmp->more = 0;	2307	tmp->more = 0;
2527		2308
2528	if (prev)	2309	if (prev)
2529	prev->more = tmp;	2310	prev->more = tmp;
…		…
2541	/* 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 */
2542	/* 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, */
2543	/* 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. */
2544	/* 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. */
2545	/* Also remember that multiparts objects are not supported for now. */	2326	/* Also remember that multiparts objects are not supported for now. */
2546
2547	object *	2327	object *
2548	load_object_str (const char *obstr)	2328	load_object_str (const char *obstr)
2549	{	2329	{
2550	object *op;	2330	object *op;
2551	char filename[MAX_BUF];	2331	char filename[MAX_BUF];
…		…
2581	* returns NULL if no match.	2361	* returns NULL if no match.
2582	*/	2362	*/
2583	object *	2363	object *
2584	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)
2585	{	2365	{
2586	object *tmp;
2587
2588	for (tmp = who->inv; tmp; tmp = tmp->below)	2366	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2589	if (tmp->type == type && tmp->subtype == subtype)	2367	if (tmp->type == type && tmp->subtype == subtype)
2590	return tmp;	2368	return tmp;
2591		2369
2592	return NULL;	2370	return 0;
2593	}	2371	}
2594		2372
2595	/* 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,
2596	* otherwise return NULL.	2374	* otherwise return NULL.
2597	*	2375	*
…		…
2599	* do the desired thing.	2377	* do the desired thing.
2600	*/	2378	*/
2601	key_value *	2379	key_value *
2602	get_ob_key_link (const object *ob, const char *key)	2380	get_ob_key_link (const object *ob, const char *key)
2603	{	2381	{
2604	key_value *link;
2605
2606	for (link = ob->key_values; link != NULL; link = link->next)	2382	for (key_value *link = ob->key_values; link; link = link->next)
2607	if (link->key == key)	2383	if (link->key == key)
2608	return link;	2384	return link;
2609		2385
2610	return NULL;	2386	return 0;
2611	}	2387	}
2612		2388
2613	/*	2389	/*
2614	* 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.
2615	*	2391	*
…		…
2655	* Returns TRUE on success.	2431	* Returns TRUE on success.
2656	*/	2432	*/
2657	int	2433	int
2658	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)
2659	{	2435	{
2660	key_value *
2661	field = NULL, *last = NULL;	2436	key_value *field = NULL, *last = NULL;
2662		2437
2663	for (field = op->key_values; field != NULL; field = field->next)	2438	for (field = op->key_values; field != NULL; field = field->next)
2664	{	2439	{
2665	if (field->key != canonical_key)	2440	if (field->key != canonical_key)
2666	{	2441	{
…		…
2694	/* IF we get here, key doesn't exist */	2469	/* IF we get here, key doesn't exist */
2695		2470
2696	/* No field, we'll have to add it. */	2471	/* No field, we'll have to add it. */
2697		2472
2698	if (!add_key)	2473	if (!add_key)
2699	{
2700	return FALSE;	2474	return FALSE;
2701	}	2475
2702	/* There isn't any good reason to store a null	2476	/* There isn't any good reason to store a null
2703	* value in the key/value list. If the archetype has	2477	* value in the key/value list. If the archetype has
2704	* this key, then we should also have it, so shouldn't	2478	* this key, then we should also have it, so shouldn't
2705	* be here. If user wants to store empty strings,	2479	* be here. If user wants to store empty strings,
2706	* should pass in ""	2480	* should pass in ""
…		…
2755	}	2529	}
2756	else	2530	else
2757	item = item->env;	2531	item = item->env;
2758	}	2532	}
2759		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
2760	// 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
2761	const char *	2564	const char *
2762	object::debug_desc (char *info) const	2565	object::debug_desc (char *info) const
2763	{	2566	{
		2567	char flagdesc[512];
2764	char info2[256 * 3];	2568	char info2[256 * 4];
2765	char *p = info;	2569	char *p = info;
2766		2570
2767	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}",
2768	count,	2572	count, uuid.seq,
2769	&name,	2573	&name,
2770	title ? " " : "",	2574	title ? "\",title:\"" : "",
2771	title ? (const char *)title : "");	2575	title ? (const char *)title : "",
		2576	flag_desc (flagdesc, 512), type);
2772		2577
2773	if (env)	2578	if (env)
2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2579	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2775		2580
2776	if (map)	2581	if (map)
2777	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);
2778		2583
2779	return info;	2584	return info;
2780	}	2585	}
2781		2586
2782	const char *	2587	const char *
2783	object::debug_desc () const	2588	object::debug_desc () const
2784	{	2589	{
2785	static char info[256 * 3];	2590	static char info[256 * 4];
2786	return debug_desc (info);	2591	return debug_desc (info);
2787	}	2592	}
2788		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