[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC vs.
Revision 1.120 by root, Sun Jan 21 21:28:27 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,
…		…
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
…		…
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:
…		…
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	}
…		…
490		489
491	if (is_removed)	490	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
493		492
494	if (speed < 0)	493	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - rndm ();
496		495
497	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
498	if (key_values)	497	if (key_values)
499	{	498	{
500	key_value *tail = 0;	499	key_value *tail = 0;
…		…
522	tail = new_link;	521	tail = new_link;
523	}	522	}
524	}	523	}
525	}	524	}
526		525
527	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
528	}	527	}
529		528
530	object *	529	object *
531	object::clone ()	530	object::clone ()
532	{	531	{
…		…
538	/*	537	/*
539	* 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
540	* 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
541	* 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.
542	*/	541	*/
543
544	void	542	void
545	update_turn_face (object *op)	543	update_turn_face (object *op)
546	{	544	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)
548	return;	546	return;
		547
549	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
551	}	550	}
552		551
553	/*	552	/*
554	* 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
555	* 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.
556	* 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.
557	*/	556	*/
558	void	557	void
559	update_ob_speed (object *op)	558	object::set_speed (float speed)
560	{	559	{
561	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
567	{	561	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	op->speed = 0;	563	speed = 0;
570	}
571
572	if (arch_init)
573	return;
574
575	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576	{	564	}
577	/* If already on active list, don't do anything */
578	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
579	return;
580		565
581	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
582	* of the list. */
583	op->active_next = active_objects;
584		567
585	if (op->active_next != NULL)	568	if (has_active_speed ())
586	op->active_next->active_prev = op;	569	activate ();
587
588	active_objects = op;
589	}
590	else	570	else
591	{	571	deactivate ();
592	/* If not on the active list, nothing needs to be done */
593	if (!op->active_next && !op->active_prev && op != active_objects)
594	return;
595
596	if (op->active_prev == NULL)
597	{
598	active_objects = op->active_next;
599
600	if (op->active_next != NULL)
601	op->active_next->active_prev = NULL;
602	}
603	else
604	{
605	op->active_prev->active_next = op->active_next;
606
607	if (op->active_next)
608	op->active_next->active_prev = op->active_prev;
609	}
610
611	op->active_next = NULL;
612	op->active_prev = NULL;
613	}
614	}
615
616	/* This function removes object 'op' from the list of active
617	* objects.
618	* This should only be used for style maps or other such
619	* reference maps where you don't want an object that isn't
620	* in play chewing up cpu time getting processed.
621	* The reverse of this is to call update_ob_speed, which
622	* will do the right thing based on the speed of the object.
623	*/
624	void
625	remove_from_active_list (object *op)
626	{
627	/* If not on the active list, nothing needs to be done */
628	if (!op->active_next && !op->active_prev && op != active_objects)
629	return;
630
631	if (op->active_prev == NULL)
632	{
633	active_objects = op->active_next;
634	if (op->active_next != NULL)
635	op->active_next->active_prev = NULL;
636	}
637	else
638	{
639	op->active_prev->active_next = op->active_next;
640	if (op->active_next)
641	op->active_next->active_prev = op->active_prev;
642	}
643	op->active_next = NULL;
644	op->active_prev = NULL;
645	}	572	}
646		573
647	/*	574	/*
648	* update_object() updates the the map.	575	* update_object() updates the the map.
649	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
697	return;	624	return;
698	}	625	}
699		626
700	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
701		628
702	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
703	/* nop */;	630	/* nop */;
704	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
705	{	632	{
706	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
707	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
716	/* 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
717	* to have move_allow right now.	644	* to have move_allow right now.
718	*/	645	*/
719	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	646	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
720	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	647	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
722	}	649	}
723	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
724	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
725	* that is being removed.	652	* that is being removed.
726	*/	653	*/
727	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
728	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
729	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
730	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
731	else	658	else
732	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
733		660
734	if (op->more)	661	if (op->more)
735	update_object (op->more, action);	662	update_object (op->more, action);
736	}	663	}
737		664
738	object::vector object::objects; // not yet used
739	object *object::first;
740
741	object::object ()	665	object::object ()
742	{	666	{
743	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
744		668
745	expmul = 1.0;	669	expmul = 1.0;
746	face = blank_face;	670	face = blank_face;
747	}	671	}
748		672
749	object::~object ()	673	object::~object ()
750	{	674	{
		675	if (index)
		676	unlink ();
		677
751	free_key_values (this);	678	free_key_values (this);
752	}	679	}
753		680
		681	static int object_count;
		682
754	void object::link ()	683	void object::link ()
755	{	684	{
756	count = ++ob_count;	685	assert (!index);//D
757	uuid = gen_uuid ();	686	uuid = gen_uuid ();
		687	count = ++object_count;
758		688
759	prev = 0;	689	refcnt_inc ();
760	next = object::first;	690	objects.insert (this);
761
762	if (object::first)
763	object::first->prev = this;
764
765	object::first = this;
766	}	691	}
767		692
768	void object::unlink ()	693	void object::unlink ()
769	{	694	{
770	if (this == object::first)	695	assert (index);//D
771	object::first = next;	696	objects.erase (this);
772		697	refcnt_dec ();
773	/* Remove this object from the list of used objects */
774	if (prev) prev->next = next;
775	if (next) next->prev = prev;
776
777	prev = 0;
778	next = 0;
779	}	698	}
780		699
781	object *object::create ()
782	{
783	object *op = new object;
784	op->link ();
785	return op;
786	}
787
788	/*
789	* free_object() frees everything allocated by an object, removes
790	* it from the list of used objects, and puts it on the list of
791	* free objects. The IS_FREED() flag is set in the object.
792	* The object must have been removed by remove_ob() first for
793	* this function to succeed.
794	*
795	* If destroy_inventory is set, free inventory as well. Else drop items in
796	* inventory to the ground.
797	*/
798	void	700	void
799	object::do_destroy ()	701	object::activate ()
800	{	702	{
801	attachable::do_destroy ();	703	/* If already on active list, don't do anything */
802		704	if (active)
803	if (flag [FLAG_IS_LINKED])
804	remove_button_link (this);
805
806	if (flag [FLAG_FRIENDLY])
807	remove_friendly_object (this);
808
809	if (!flag [FLAG_REMOVED])
810	remove ();
811
812	if (flag [FLAG_FREED])
813	return;	705	return;
814		706
815	flag [FLAG_FREED] = 1;	707	if (has_active_speed ())
		708	actives.insert (this);
		709	}
816		710
817	// hack to ensure that freed objects still have a valid map	711	void
818	{	712	object::activate_recursive ()
819	static maptile *freed_map; // freed objects are moved here to avoid crashes	713	{
		714	activate ();
820		715
821	if (!freed_map)	716	for (object *op = inv; op; op = op->below)
		717	op->activate_recursive ();
		718	}
		719
		720	/* This function removes object 'op' from the list of active
		721	* objects.
		722	* This should only be used for style maps or other such
		723	* reference maps where you don't want an object that isn't
		724	* in play chewing up cpu time getting processed.
		725	* The reverse of this is to call update_ob_speed, which
		726	* will do the right thing based on the speed of the object.
		727	*/
		728	void
		729	object::deactivate ()
		730	{
		731	/* If not on the active list, nothing needs to be done */
		732	if (!active)
		733	return;
		734
		735	actives.erase (this);
		736	}
		737
		738	void
		739	object::deactivate_recursive ()
		740	{
		741	for (object *op = inv; op; op = op->below)
		742	op->deactivate_recursive ();
		743
		744	deactivate ();
		745	}
		746
		747	void
		748	object::set_flag_inv (int flag, int value)
		749	{
		750	for (object *op = inv; op; op = op->below)
822	{	751	{
823	freed_map = new maptile;	752	op->flag [flag] = value;
824		753	op->set_flag_inv (flag, value);
825	freed_map->name = "/internal/freed_objects_map";
826	freed_map->width = 3;
827	freed_map->height = 3;
828
829	freed_map->allocate ();
830	}	754	}
831
832	map = freed_map;
833	x = 1;
834	y = 1;
835	}
836
837	more = 0;
838	head = 0;
839	inv = 0;
840
841	// clear those pointers that likely might have circular references to us
842	owner = 0;
843	enemy = 0;
844	attacked_by = 0;
845
846	// only relevant for players(?), but make sure of it anyways
847	contr = 0;
848
849	/* Remove object from the active list */
850	speed = 0;
851	update_ob_speed (this);
852
853	unlink ();
854	}	755	}
855		756
856	/*	757	/*
857	* Remove and free all objects in the inventory of the given object.	758	* Remove and free all objects in the inventory of the given object.
858	* object.c ?	759	* object.c ?
859	*/	760	*/
860	void	761	void
861	object::destroy_inv (bool drop_to_ground)	762	object::destroy_inv (bool drop_to_ground)
862	{	763	{
		764	// need to check first, because the checks below might segfault
		765	// as we might be on an invalid mapspace and crossfire code
		766	// is too buggy to ensure that the inventory is empty.
		767	// corollary: if you create arrows etc. with stuff in tis inventory,
		768	// cf will crash below with off-map x and y
863	if (!inv)	769	if (!inv)
864	return;	770	return;
865		771
866	/* Only if the space blocks everything do we not process -	772	/* Only if the space blocks everything do we not process -
867	* if some form of movement is allowed, let objects	773	* if some form of movement is allowed, let objects
868	* drop on that space.	774	* drop on that space.
869	*/	775	*/
870	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	776	if (!drop_to_ground
		777	\|\| !map
		778	\|\| map->in_memory != MAP_IN_MEMORY
		779	\|\| ms ().move_block == MOVE_ALL)
871	{	780	{
872	while (inv)	781	while (inv)
873	{	782	{
874	inv->destroy_inv (drop_to_ground);	783	inv->destroy_inv (drop_to_ground);
875	inv->destroy ();	784	inv->destroy ();
…		…
883		792
884	if (op->flag [FLAG_STARTEQUIP]	793	if (op->flag [FLAG_STARTEQUIP]
885	\|\| op->flag [FLAG_NO_DROP]	794	\|\| op->flag [FLAG_NO_DROP]
886	\|\| op->type == RUNE	795	\|\| op->type == RUNE
887	\|\| op->type == TRAP	796	\|\| op->type == TRAP
888	\|\| op->flag [FLAG_IS_A_TEMPLATE])	797	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		798	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
889	op->destroy ();	799	op->destroy ();
890	else	800	else
891	{	801	map->insert (op, x, y);
892	op->remove ();
893	op->x = x;
894	op->y = y;
895	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896	}
897	}	802	}
898	}	803	}
		804	}
		805
		806	object *object::create ()
		807	{
		808	object *op = new object;
		809	op->link ();
		810	return op;
		811	}
		812
		813	void
		814	object::do_destroy ()
		815	{
		816	attachable::do_destroy ();
		817
		818	if (flag [FLAG_IS_LINKED])
		819	remove_button_link (this);
		820
		821	if (flag [FLAG_FRIENDLY])
		822	remove_friendly_object (this);
		823
		824	if (!flag [FLAG_REMOVED])
		825	remove ();
		826
		827	destroy_inv (true);
		828
		829	deactivate ();
		830	unlink ();
		831
		832	flag [FLAG_FREED] = 1;
		833
		834	// hack to ensure that freed objects still have a valid map
		835	{
		836	static maptile *freed_map; // freed objects are moved here to avoid crashes
		837
		838	if (!freed_map)
		839	{
		840	freed_map = new maptile;
		841
		842	freed_map->name = "/internal/freed_objects_map";
		843	freed_map->width = 3;
		844	freed_map->height = 3;
		845
		846	freed_map->alloc ();
		847	freed_map->in_memory = MAP_IN_MEMORY;
		848	}
		849
		850	map = freed_map;
		851	x = 1;
		852	y = 1;
		853	}
		854
		855	head = 0;
		856
		857	if (more)
		858	{
		859	more->destroy ();
		860	more = 0;
		861	}
		862
		863	// clear those pointers that likely might have circular references to us
		864	owner = 0;
		865	enemy = 0;
		866	attacked_by = 0;
899	}	867	}
900		868
901	void	869	void
902	object::destroy (bool destroy_inventory)	870	object::destroy (bool destroy_inventory)
903	{	871	{
904	if (destroyed ())	872	if (destroyed ())
905	return;	873	return;
906		874
907	if (more)
908	{
909	//TODO: non-head objects must not have inventory
910	more->destroy (destroy_inventory);
911	more = 0;
912	}
913
914	if (destroy_inventory)	875	if (destroy_inventory)
915	destroy_inv (true);	876	destroy_inv (false);
916		877
917	attachable::destroy ();	878	attachable::destroy ();
918	}	879	}
919		880
920	/*	881	/*
…		…
941	* environment, the x and y coordinates will be updated to	902	* environment, the x and y coordinates will be updated to
942	* the previous environment.	903	* the previous environment.
943	* Beware: This function is called from the editor as well!	904	* Beware: This function is called from the editor as well!
944	*/	905	*/
945	void	906	void
946	object::remove ()	907	object::remove_slow ()
947	{	908	{
948	object tmp, last = 0;	909	object tmp, last = 0;
949	object *otmp;	910	object *otmp;
950		911
951	if (QUERY_FLAG (this, FLAG_REMOVED))	912	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
973	* to save cpu time.	934	* to save cpu time.
974	*/	935	*/
975	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	936	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976	otmp->update_stats ();	937	otmp->update_stats ();
977		938
978	if (above != NULL)	939	if (above)
979	above->below = below;	940	above->below = below;
980	else	941	else
981	env->inv = below;	942	env->inv = below;
982		943
983	if (below != NULL)	944	if (below)
984	below->above = above;	945	below->above = above;
985		946
986	/* we set up values so that it could be inserted into	947	/* we set up values so that it could be inserted into
987	* the map, but we don't actually do that - it is up	948	* the map, but we don't actually do that - it is up
988	* to the caller to decide what we want to do.	949	* to the caller to decide what we want to do.
…		…
992	above = 0, below = 0;	953	above = 0, below = 0;
993	env = 0;	954	env = 0;
994	}	955	}
995	else if (map)	956	else if (map)
996	{	957	{
997	/* Re did the following section of code - it looks like it had	958	if (type == PLAYER)
998	* lots of logic for things we no longer care about
999	*/	959	{
		960	--map->players;
		961	map->touch ();
		962	}
		963
		964	map->dirty = true;
		965	mapspace &ms = this->ms ();
1000		966
1001	/* link the object above us */	967	/* link the object above us */
1002	if (above)	968	if (above)
1003	above->below = below;	969	above->below = below;
1004	else	970	else
1005	map->at (x, y).top = below; /* we were top, set new top */	971	ms.top = below; /* we were top, set new top */
1006		972
1007	/* Relink the object below us, if there is one */	973	/* Relink the object below us, if there is one */
1008	if (below)	974	if (below)
1009	below->above = above;	975	below->above = above;
1010	else	976	else
…		…
1012	/* Nothing below, which means we need to relink map object for this space	978	/* Nothing below, which means we need to relink map object for this space
1013	* use translated coordinates in case some oddness with map tiling is	979	* use translated coordinates in case some oddness with map tiling is
1014	* evident	980	* evident
1015	*/	981	*/
1016	if (GET_MAP_OB (map, x, y) != this)	982	if (GET_MAP_OB (map, x, y) != this)
1017	{
1018	char *dump = dump_object (this);
1019	LOG (llevError,
1020	"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);	983	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 ());
1021	free (dump);
1022	dump = dump_object (GET_MAP_OB (map, x, y));
1023	LOG (llevError, "%s\n", dump);
1024	free (dump);
1025	}
1026		984
1027	map->at (x, y).bot = above; /* goes on above it. */	985	ms.bot = above; /* goes on above it. */
1028	}	986	}
1029		987
1030	above = 0;	988	above = 0;
1031	below = 0;	989	below = 0;
1032		990
1033	if (map->in_memory == MAP_SAVING)	991	if (map->in_memory == MAP_SAVING)
1034	return;	992	return;
1035		993
1036	int check_walk_off = !flag [FLAG_NO_APPLY];	994	int check_walk_off = !flag [FLAG_NO_APPLY];
1037		995
1038	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	996	for (tmp = ms.bot; tmp; tmp = tmp->above)
1039	{	997	{
1040	/* No point updating the players look faces if he is the object	998	/* No point updating the players look faces if he is the object
1041	* being removed.	999	* being removed.
1042	*/	1000	*/
1043		1001
…		…
1055		1013
1056	if (tmp->contr->ns)	1014	if (tmp->contr->ns)
1057	tmp->contr->ns->floorbox_update ();	1015	tmp->contr->ns->floorbox_update ();
1058	}	1016	}
1059		1017
1060	/* See if player moving off should effect something */	1018	/* See if object moving off should effect something */
1061	if (check_walk_off	1019	if (check_walk_off
1062	&& ((move_type & tmp->move_off)	1020	&& ((move_type & tmp->move_off)
1063	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1021	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064	{	1022	{
1065	move_apply (tmp, this, 0);	1023	move_apply (tmp, this, 0);
…		…
1067	if (destroyed ())	1025	if (destroyed ())
1068	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1026	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069	}	1027	}
1070		1028
1071	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1029	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072		1030	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073	if (tmp->above == tmp)	1031	if (tmp->above == tmp)
1074	tmp->above = 0;	1032	tmp->above = 0;
1075		1033
1076	last = tmp;	1034	last = tmp;
1077	}	1035	}
1078		1036
1079	/* last == NULL of there are no objects on this space */	1037	/* last == NULL if there are no objects on this space */
		1038	//TODO: this makes little sense, why only update the topmost object?
1080	if (!last)	1039	if (!last)
1081	map->at (x, y).flags_ = P_NEED_UPDATE;	1040	map->at (x, y).flags_ = 0;
1082	else	1041	else
1083	update_object (last, UP_OBJ_REMOVE);	1042	update_object (last, UP_OBJ_REMOVE);
1084		1043
1085	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1044	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1086	update_all_los (map, x, y);	1045	update_all_los (map, x, y);
…		…
1123		1082
1124	return 0;	1083	return 0;
1125	}	1084	}
1126		1085
1127	/*	1086	/*
1128	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1087	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1129	* job preparing multi-part monsters	1088	* job preparing multi-part monsters.
1130	*/	1089	*/
1131	object *	1090	object *
1132	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1091	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1133	{	1092	{
1134	object *tmp;
1135
1136	if (op->head)
1137	op = op->head;
1138
1139	for (tmp = op; tmp; tmp = tmp->more)	1093	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140	{	1094	{
1141	tmp->x = x + tmp->arch->clone.x;	1095	tmp->x = x + tmp->arch->clone.x;
1142	tmp->y = y + tmp->arch->clone.y;	1096	tmp->y = y + tmp->arch->clone.y;
1143	}	1097	}
1144		1098
…		…
1167	*/	1121	*/
1168	object *	1122	object *
1169	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1123	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1170	{	1124	{
1171	object tmp, top, *floor = NULL;	1125	object tmp, top, *floor = NULL;
1172	sint16 x, y;
1173		1126
1174	if (QUERY_FLAG (op, FLAG_FREED))	1127	if (QUERY_FLAG (op, FLAG_FREED))
1175	{	1128	{
1176	LOG (llevError, "Trying to insert freed object!\n");	1129	LOG (llevError, "Trying to insert freed object!\n");
1177	return NULL;	1130	return NULL;
1178	}	1131	}
1179		1132
1180	if (m == NULL)	1133	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1134	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1135
		1136	op->remove ();
		1137
		1138	if (!m)
1181	{	1139	{
1182	char *dump = dump_object (op);	1140	char *dump = dump_object (op);
1183	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);
1184	free (dump);	1142	free (dump);
1185	return op;	1143	return op;
…		…
1198	#endif	1156	#endif
1199	free (dump);	1157	free (dump);
1200	return op;	1158	return op;
1201	}	1159	}
1202		1160
1203	if (!QUERY_FLAG (op, FLAG_REMOVED))
1204	{
1205	char *dump = dump_object (op);
1206	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1207	free (dump);
1208	return op;
1209	}
1210
1211	if (op->more)
1212	{
1213	/* The part may be on a different map. */
1214
1215	object *more = op->more;	1161	if (object *more = op->more)
1216		1162	{
1217	/* We really need the caller to normalize coordinates - if
1218	* we set the map, that doesn't work if the location is within
1219	* a map and this is straddling an edge. So only if coordinate
1220	* is clear wrong do we normalize it.
1221	*/
1222	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1223	more->map = get_map_from_coord (m, &more->x, &more->y);
1224	else if (!more->map)
1225	{
1226	/* For backwards compatibility - when not dealing with tiled maps,
1227	* more->map should always point to the parent.
1228	*/
1229	more->map = m;
1230	}
1231
1232	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1163	if (!insert_ob_in_map (more, m, originator, flag))
1233	{	1164	{
1234	if (!op->head)	1165	if (!op->head)
1235	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1166	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236		1167
1237	return 0;	1168	return 0;
…		…
1242		1173
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1174	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1175	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1176	* need extra work
1246	*/	1177	*/
1247	op->map = get_map_from_coord (m, &op->x, &op->y);	1178	if (!xy_normalise (m, op->x, op->y))
1248	x = op->x;	1179	return 0;
1249	y = op->y;	1180
		1181	op->map = m;
		1182	mapspace &ms = op->ms ();
1250		1183
1251	/* this has to be done after we translate the coordinates.	1184	/* this has to be done after we translate the coordinates.
1252	*/	1185	*/
1253	if (op->nrof && !(flag & INS_NO_MERGE))	1186	if (op->nrof && !(flag & INS_NO_MERGE))
1254	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1187	for (tmp = ms.bot; tmp; tmp = tmp->above)
1255	if (object::can_merge (op, tmp))	1188	if (object::can_merge (op, tmp))
1256	{	1189	{
1257	op->nrof += tmp->nrof;	1190	op->nrof += tmp->nrof;
1258	tmp->destroy ();	1191	tmp->destroy ();
1259	}	1192	}
…		…
1276	op->below = originator->below;	1209	op->below = originator->below;
1277		1210
1278	if (op->below)	1211	if (op->below)
1279	op->below->above = op;	1212	op->below->above = op;
1280	else	1213	else
1281	op->ms ().bot = op;	1214	ms.bot = op;
1282		1215
1283	/* since below originator, no need to update top */	1216	/* since below originator, no need to update top */
1284	originator->below = op;	1217	originator->below = op;
1285	}	1218	}
1286	else	1219	else
1287	{	1220	{
		1221	top = ms.bot;
		1222
1288	/* If there are other objects, then */	1223	/* If there are other objects, then */
1289	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1224	if ((!(flag & INS_MAP_LOAD)) && top)
1290	{	1225	{
1291	object *last = NULL;	1226	object *last = 0;
1292		1227
1293	/*	1228	/*
1294	* If there are multiple objects on this space, we do some trickier handling.	1229	* If there are multiple objects on this space, we do some trickier handling.
1295	* We've already dealt with merging if appropriate.	1230	* We've already dealt with merging if appropriate.
1296	* Generally, we want to put the new object on top. But if	1231	* Generally, we want to put the new object on top. But if
…		…
1300	* once we get to them. This reduces the need to traverse over all of	1235	* once we get to them. This reduces the need to traverse over all of
1301	* them when adding another one - this saves quite a bit of cpu time	1236	* them when adding another one - this saves quite a bit of cpu time
1302	* when lots of spells are cast in one area. Currently, it is presumed	1237	* when lots of spells are cast in one area. Currently, it is presumed
1303	* that flying non pickable objects are spell objects.	1238	* that flying non pickable objects are spell objects.
1304	*/	1239	*/
1305		1240	for (top = ms.bot; top; top = top->above)
1306	while (top != NULL)
1307	{	1241	{
1308	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1242	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309	floor = top;	1243	floor = top;
1310		1244
1311	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1245	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1314	top = top->below;	1248	top = top->below;
1315	break;	1249	break;
1316	}	1250	}
1317		1251
1318	last = top;	1252	last = top;
1319	top = top->above;
1320	}	1253	}
1321		1254
1322	/* Don't want top to be NULL, so set it to the last valid object */	1255	/* Don't want top to be NULL, so set it to the last valid object */
1323	top = last;	1256	top = last;
1324		1257
…		…
1331	* Unless those objects are exits, type 66	1264	* Unless those objects are exits, type 66
1332	* If INS_ON_TOP is used, don't do this processing	1265	* If INS_ON_TOP is used, don't do this processing
1333	* Need to find the object that in fact blocks view, otherwise	1266	* Need to find the object that in fact blocks view, otherwise
1334	* stacking is a bit odd.	1267	* stacking is a bit odd.
1335	*/	1268	*/
1336	if (!(flag & INS_ON_TOP) &&	1269	if (!(flag & INS_ON_TOP)
1337	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1270	&& ms.flags () & P_BLOCKSVIEW
		1271	&& (op->face && !op->face->visibility))
1338	{	1272	{
1339	for (last = top; last != floor; last = last->below)	1273	for (last = top; last != floor; last = last->below)
1340	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1274	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341	break;	1275	break;
		1276
1342	/* Check to see if we found the object that blocks view,	1277	/* Check to see if we found the object that blocks view,
1343	* and make sure we have a below pointer for it so that	1278	* and make sure we have a below pointer for it so that
1344	* we can get inserted below this one, which requires we	1279	* we can get inserted below this one, which requires we
1345	* set top to the object below us.	1280	* set top to the object below us.
1346	*/	1281	*/
…		…
1348	top = last->below;	1283	top = last->below;
1349	}	1284	}
1350	} /* If objects on this space */	1285	} /* If objects on this space */
1351		1286
1352	if (flag & INS_MAP_LOAD)	1287	if (flag & INS_MAP_LOAD)
1353	top = GET_MAP_TOP (op->map, op->x, op->y);	1288	top = ms.top;
1354		1289
1355	if (flag & INS_ABOVE_FLOOR_ONLY)	1290	if (flag & INS_ABOVE_FLOOR_ONLY)
1356	top = floor;	1291	top = floor;
1357		1292
1358	/* Top is the object that our object (op) is going to get inserted above.	1293	/* Top is the object that our object (op) is going to get inserted above.
1359	*/	1294	*/
1360		1295
1361	/* First object on this space */	1296	/* First object on this space */
1362	if (!top)	1297	if (!top)
1363	{	1298	{
1364	op->above = GET_MAP_OB (op->map, op->x, op->y);	1299	op->above = ms.bot;
1365		1300
1366	if (op->above)	1301	if (op->above)
1367	op->above->below = op;	1302	op->above->below = op;
1368		1303
1369	op->below = NULL;	1304	op->below = 0;
1370	op->ms ().bot = op;	1305	ms.bot = op;
1371	}	1306	}
1372	else	1307	else
1373	{ /* get inserted into the stack above top */	1308	{ /* get inserted into the stack above top */
1374	op->above = top->above;	1309	op->above = top->above;
1375		1310
…		…
1378		1313
1379	op->below = top;	1314	op->below = top;
1380	top->above = op;	1315	top->above = op;
1381	}	1316	}
1382		1317
1383	if (op->above == NULL)	1318	if (!op->above)
1384	op->ms ().top = op;	1319	ms.top = op;
1385	} /* else not INS_BELOW_ORIGINATOR */	1320	} /* else not INS_BELOW_ORIGINATOR */
1386		1321
1387	if (op->type == PLAYER)	1322	if (op->type == PLAYER)
		1323	{
1388	op->contr->do_los = 1;	1324	op->contr->do_los = 1;
		1325	++op->map->players;
		1326	op->map->touch ();
		1327	}
		1328
		1329	op->map->dirty = true;
1389		1330
1390	/* If we have a floor, we know the player, if any, will be above	1331	/* If we have a floor, we know the player, if any, will be above
1391	* it, so save a few ticks and start from there.	1332	* it, so save a few ticks and start from there.
1392	*/	1333	*/
1393	if (!(flag & INS_MAP_LOAD))	1334	if (!(flag & INS_MAP_LOAD))
1394	if (object *pl = op->ms ().player ())	1335	if (object *pl = ms.player ())
1395	if (pl->contr->ns)	1336	if (pl->contr->ns)
1396	pl->contr->ns->floorbox_update ();	1337	pl->contr->ns->floorbox_update ();
1397		1338
1398	/* If this object glows, it may affect lighting conditions that are	1339	/* If this object glows, it may affect lighting conditions that are
1399	* visible to others on this map. But update_all_los is really	1340	* visible to others on this map. But update_all_los is really
1400	* an inefficient way to do this, as it means los for all players	1341	* an inefficient way to do this, as it means los for all players
1401	* on the map will get recalculated. The players could very well	1342	* on the map will get recalculated. The players could very well
1402	* be far away from this change and not affected in any way -	1343	* be far away from this change and not affected in any way -
1403	* this should get redone to only look for players within range,	1344	* this should get redone to only look for players within range,
1404	* or just updating the P_NEED_UPDATE for spaces within this area	1345	* or just updating the P_UPTODATE for spaces within this area
1405	* of effect may be sufficient.	1346	* of effect may be sufficient.
1406	*/	1347	*/
1407	if (op->map->darkness && (op->glow_radius != 0))	1348	if (op->map->darkness && (op->glow_radius != 0))
1408	update_all_los (op->map, op->x, op->y);	1349	update_all_los (op->map, op->x, op->y);
1409		1350
…		…
1447	{	1388	{
1448	object tmp, tmp1;	1389	object tmp, tmp1;
1449		1390
1450	/* first search for itself and remove any old instances */	1391	/* first search for itself and remove any old instances */
1451		1392
1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1393	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1394	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454	tmp->destroy ();	1395	tmp->destroy ();
1455		1396
1456	tmp1 = arch_to_object (archetype::find (arch_string));	1397	tmp1 = arch_to_object (archetype::find (arch_string));
1457		1398
1458	tmp1->x = op->x;	1399	tmp1->x = op->x;
1459	tmp1->y = op->y;	1400	tmp1->y = op->y;
1460	insert_ob_in_map (tmp1, op->map, op, 0);	1401	insert_ob_in_map (tmp1, op->map, op, 0);
		1402	}
		1403
		1404	object *
		1405	object::insert_at (object where, object originator, int flags)
		1406	{
		1407	where->map->insert (this, where->x, where->y, originator, flags);
1461	}	1408	}
1462		1409
1463	/*	1410	/*
1464	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1411	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1465	* is returned contains nr objects, and the remaining parts contains	1412	* is returned contains nr objects, and the remaining parts contains
1466	* the rest (or is removed and freed if that number is 0).	1413	* the rest (or is removed and freed if that number is 0).
1467	* On failure, NULL is returned, and the reason put into the	1414	* On failure, NULL is returned, and the reason put into the
1468	* global static errmsg array.	1415	* global static errmsg array.
1469	*/	1416	*/
1470
1471	object *	1417	object *
1472	get_split_ob (object *orig_ob, uint32 nr)	1418	get_split_ob (object *orig_ob, uint32 nr)
1473	{	1419	{
1474	object *newob;	1420	object *newob;
1475	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1421	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1739	*	1685	*
1740	* MSW 2001-07-08: Check all objects on space, not just those below	1686	* MSW 2001-07-08: Check all objects on space, not just those below
1741	* object being inserted. insert_ob_in_map may not put new objects	1687	* object being inserted. insert_ob_in_map may not put new objects
1742	* on top.	1688	* on top.
1743	*/	1689	*/
1744
1745	int	1690	int
1746	check_move_on (object op, object originator)	1691	check_move_on (object op, object originator)
1747	{	1692	{
1748	object *tmp;	1693	object *tmp;
1749	maptile *m = op->map;	1694	maptile *m = op->map;
…		…
1776		1721
1777	/* The objects have to be checked from top to bottom.	1722	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1723	* Hence, we first go to the top:
1779	*/	1724	*/
1780		1725
1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1726	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782	{	1727	{
1783	/* Trim the search when we find the first other spell effect	1728	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1729	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1730	* we don't need to check all of them.
1786	*/	1731	*/
…		…
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1749	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1805	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1750	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1751	{
1807		1752
1808	float	1753	float
1809	diff = tmp->move_slow_penalty * FABS (op->speed);	1754	diff = tmp->move_slow_penalty * fabs (op->speed);
1810		1755
1811	if (op->type == PLAYER)	1756	if (op->type == PLAYER)
1812	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1757	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1813	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1758	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814	diff /= 4.0;	1759	diff /= 4.0;
…		…
1844	* The first matching object is returned, or NULL if none.	1789	* The first matching object is returned, or NULL if none.
1845	*/	1790	*/
1846	object *	1791	object *
1847	present_arch (const archetype at, maptile m, int x, int y)	1792	present_arch (const archetype at, maptile m, int x, int y)
1848	{	1793	{
1849	if (m == NULL \|\| out_of_map (m, x, y))	1794	if (!m \|\| out_of_map (m, x, y))
1850	{	1795	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1796	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1797	return NULL;
1853	}	1798	}
1854		1799
1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1800	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856	if (tmp->arch == at)	1801	if (tmp->arch == at)
1857	return tmp;	1802	return tmp;
1858		1803
1859	return NULL;	1804	return NULL;
1860	}	1805	}
…		…
1871	{	1816	{
1872	LOG (llevError, "Present called outside map.\n");	1817	LOG (llevError, "Present called outside map.\n");
1873	return NULL;	1818	return NULL;
1874	}	1819	}
1875		1820
1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1822	if (tmp->type == type)
1878	return tmp;	1823	return tmp;
1879		1824
1880	return NULL;	1825	return NULL;
1881	}	1826	}
…		…
2196		2141
2197	return 3;	2142	return 3;
2198	}	2143	}
2199		2144
2200	/*	2145	/*
2201	* absdir(int): Returns a number between 1 and 8, which represent
2202	* the "absolute" direction of a number (it actually takes care of
2203	* "overflow" in previous calculations of a direction).
2204	*/
2205
2206	int
2207	absdir (int d)
2208	{
2209	while (d < 1)
2210	d += 8;
2211
2212	while (d > 8)
2213	d -= 8;
2214
2215	return d;
2216	}
2217
2218	/*
2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2146	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220	* between two directions (which are expected to be absolute (see absdir())	2147	* between two directions (which are expected to be absolute (see absdir())
2221	*/	2148	*/
2222
2223	int	2149	int
2224	dirdiff (int dir1, int dir2)	2150	dirdiff (int dir1, int dir2)
2225	{	2151	{
2226	int d;	2152	int d;
2227		2153
…		…
2606	}	2532	}
2607	else	2533	else
2608	item = item->env;	2534	item = item->env;
2609	}	2535	}
2610		2536
		2537
		2538	const char *
		2539	object::flag_desc (char *desc, int len) const
		2540	{
		2541	char *p = desc;
		2542	bool first = true;
		2543
		2544	*p = 0;
		2545
		2546	for (int i = 0; i < NUM_FLAGS; i++)
		2547	{
		2548	if (len <= 10) // magic constant!
		2549	{
		2550	snprintf (p, len, ",...");
		2551	break;
		2552	}
		2553
		2554	if (flag [i])
		2555	{
		2556	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2557	len -= cnt;
		2558	p += cnt;
		2559	first = false;
		2560	}
		2561	}
		2562
		2563	return desc;
		2564	}
		2565
2611	// return a suitable string describing an objetc in enough detail to find it	2566	// return a suitable string describing an object in enough detail to find it
2612	const char *	2567	const char *
2613	object::debug_desc (char *info) const	2568	object::debug_desc (char *info) const
2614	{	2569	{
		2570	char flagdesc[512];
2615	char info2[256 * 3];	2571	char info2[256 * 4];
2616	char *p = info;	2572	char *p = info;
2617		2573
2618	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2574	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619	count,	2575	count, uuid.seq,
2620	&name,	2576	&name,
2621	title ? " " : "",	2577	title ? "\",title:\"" : "",
2622	title ? (const char *)title : "");	2578	title ? (const char *)title : "",
		2579	flag_desc (flagdesc, 512), type);
2623		2580
2624	if (env)	2581	if (env)
2625	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2582	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626		2583
2627	if (map)	2584	if (map)
2628	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2585	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629		2586
2630	return info;	2587	return info;
2631	}	2588	}
2632		2589
2633	const char *	2590	const char *
2634	object::debug_desc () const	2591	object::debug_desc () const
2635	{	2592	{
2636	static char info[256 * 3];	2593	static char info[256 * 4];
2637	return debug_desc (info);	2594	return debug_desc (info);
2638	}	2595	}
2639		2596
		2597	const char *
		2598	object::debug_desc2 () const
		2599	{
		2600	static char info[256 * 4];
		2601	return debug_desc (info);
		2602	}
		2603

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC vs. Revision 1.120 by root, Sun Jan 21 21:28:27 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC vs.
Revision 1.120 by root, Sun Jan 21 21:28:27 2007 UTC