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

Diff Legend

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