[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.131 by root, Sat Feb 10 15:20:23 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	unlink ();
		676
751	free_key_values (this);	677	free_key_values (this);
752	}	678	}
753		679
		680	static int object_count;
		681
754	void object::link ()	682	void object::link ()
755	{	683	{
756	count = ++ob_count;	684	assert (!index);//D
757	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
758		687
759	prev = 0;	688	refcnt_inc ();
760	next = object::first;	689	objects.insert (this);
761
762	if (object::first)
763	object::first->prev = this;
764
765	object::first = this;
766	}	690	}
767		691
768	void object::unlink ()	692	void object::unlink ()
769	{	693	{
770	if (this == object::first)	694	if (!index)
771	object::first = next;	695	return;
772		696
773	/* Remove this object from the list of used objects */	697	objects.erase (this);
774	if (prev) prev->next = next;	698	refcnt_dec ();
775	if (next) next->prev = prev;	699	}
776		700
777	prev = 0;	701	void
778	next = 0;	702	object::activate ()
		703	{
		704	/* If already on active list, don't do anything */
		705	if (active)
		706	return;
		707
		708	if (has_active_speed ())
		709	actives.insert (this);
		710	}
		711
		712	void
		713	object::activate_recursive ()
		714	{
		715	activate ();
		716
		717	for (object *op = inv; op; op = op->below)
		718	op->activate_recursive ();
		719	}
		720
		721	/* This function removes object 'op' from the list of active
		722	* objects.
		723	* This should only be used for style maps or other such
		724	* reference maps where you don't want an object that isn't
		725	* in play chewing up cpu time getting processed.
		726	* The reverse of this is to call update_ob_speed, which
		727	* will do the right thing based on the speed of the object.
		728	*/
		729	void
		730	object::deactivate ()
		731	{
		732	/* If not on the active list, nothing needs to be done */
		733	if (!active)
		734	return;
		735
		736	actives.erase (this);
		737	}
		738
		739	void
		740	object::deactivate_recursive ()
		741	{
		742	for (object *op = inv; op; op = op->below)
		743	op->deactivate_recursive ();
		744
		745	deactivate ();
		746	}
		747
		748	void
		749	object::set_flag_inv (int flag, int value)
		750	{
		751	for (object *op = inv; op; op = op->below)
		752	{
		753	op->flag [flag] = value;
		754	op->set_flag_inv (flag, value);
		755	}
		756	}
		757
		758	/*
		759	* Remove and free all objects in the inventory of the given object.
		760	* object.c ?
		761	*/
		762	void
		763	object::destroy_inv (bool drop_to_ground)
		764	{
		765	// need to check first, because the checks below might segfault
		766	// as we might be on an invalid mapspace and crossfire code
		767	// is too buggy to ensure that the inventory is empty.
		768	// corollary: if you create arrows etc. with stuff in tis inventory,
		769	// cf will crash below with off-map x and y
		770	if (!inv)
		771	return;
		772
		773	/* Only if the space blocks everything do we not process -
		774	* if some form of movement is allowed, let objects
		775	* drop on that space.
		776	*/
		777	if (!drop_to_ground
		778	\|\| !map
		779	\|\| map->in_memory != MAP_IN_MEMORY
		780	\|\| map->nodrop
		781	\|\| ms ().move_block == MOVE_ALL)
		782	{
		783	while (inv)
		784	{
		785	inv->destroy_inv (drop_to_ground);
		786	inv->destroy ();
		787	}
		788	}
		789	else
		790	{ /* Put objects in inventory onto this space */
		791	while (inv)
		792	{
		793	object *op = inv;
		794
		795	if (op->flag [FLAG_STARTEQUIP]
		796	\|\| op->flag [FLAG_NO_DROP]
		797	\|\| op->type == RUNE
		798	\|\| op->type == TRAP
		799	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		800	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
		801	op->destroy ();
		802	else
		803	map->insert (op, x, y);
		804	}
		805	}
779	}	806	}
780		807
781	object *object::create ()	808	object *object::create ()
782	{	809	{
783	object *op = new object;	810	object *op = new object;
784	op->link ();	811	op->link ();
785	return op;	812	return op;
786	}	813	}
787		814
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	815	void
799	object::do_destroy ()	816	object::do_destroy ()
800	{	817	{
801	attachable::do_destroy ();	818	attachable::do_destroy ();
802		819
803	if (flag [FLAG_IS_LINKED])	820	if (flag [FLAG_IS_LINKED])
804	remove_button_link (this);	821	remove_button_link (this);
805		822
806	if (flag [FLAG_FRIENDLY])	823	if (flag [FLAG_FRIENDLY])
		824	{
807	remove_friendly_object (this);	825	remove_friendly_object (this);
		826
		827	if (type == GOLEM
		828	&& owner
		829	&& owner->type == PLAYER
		830	&& owner->contr->ranges[range_golem] == this)
		831	owner->contr->ranges[range_golem] = 0;
		832	}
808		833
809	if (!flag [FLAG_REMOVED])	834	if (!flag [FLAG_REMOVED])
810	remove ();	835	remove ();
811		836
812	if (flag [FLAG_FREED])	837	destroy_inv (true);
813	return;	838
		839	deactivate ();
		840	unlink ();
814		841
815	flag [FLAG_FREED] = 1;	842	flag [FLAG_FREED] = 1;
816		843
817	// hack to ensure that freed objects still have a valid map	844	// hack to ensure that freed objects still have a valid map
818	{	845	{
…		…
824		851
825	freed_map->name = "/internal/freed_objects_map";	852	freed_map->name = "/internal/freed_objects_map";
826	freed_map->width = 3;	853	freed_map->width = 3;
827	freed_map->height = 3;	854	freed_map->height = 3;
828		855
829	freed_map->allocate ();	856	freed_map->alloc ();
		857	freed_map->in_memory = MAP_IN_MEMORY;
830	}	858	}
831		859
832	map = freed_map;	860	map = freed_map;
833	x = 1;	861	x = 1;
834	y = 1;	862	y = 1;
835	}	863	}
836		864
837	more = 0;
838	head = 0;	865	head = 0;
839	inv = 0;	866
		867	if (more)
		868	{
		869	more->destroy ();
		870	more = 0;
		871	}
840		872
841	// clear those pointers that likely might have circular references to us	873	// clear those pointers that likely might have circular references to us
842	owner = 0;	874	owner = 0;
843	enemy = 0;	875	enemy = 0;
844	attacked_by = 0;	876	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	}
855
856	/*
857	* Remove and free all objects in the inventory of the given object.
858	* object.c ?
859	*/
860	void
861	object::destroy_inv (bool drop_to_ground)
862	{
863	if (!inv)
864	return;
865
866	/* Only if the space blocks everything do we not process -
867	* if some form of movement is allowed, let objects
868	* drop on that space.
869	*/
870	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871	{
872	while (inv)
873	{
874	inv->destroy_inv (drop_to_ground);
875	inv->destroy ();
876	}
877	}
878	else
879	{ /* Put objects in inventory onto this space */
880	while (inv)
881	{
882	object *op = inv;
883
884	if (op->flag [FLAG_STARTEQUIP]
885	\|\| op->flag [FLAG_NO_DROP]
886	\|\| op->type == RUNE
887	\|\| op->type == TRAP
888	\|\| op->flag [FLAG_IS_A_TEMPLATE])
889	op->destroy ();
890	else
891	{
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	}
898	}
899	}	877	}
900		878
901	void	879	void
902	object::destroy (bool destroy_inventory)	880	object::destroy (bool destroy_inventory)
903	{	881	{
904	if (destroyed ())	882	if (destroyed ())
905	return;	883	return;
906		884
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)	885	if (destroy_inventory)
915	destroy_inv (true);	886	destroy_inv (false);
916		887
917	attachable::destroy ();	888	attachable::destroy ();
918	}	889	}
919		890
920	/*	891	/*
…		…
938	* This function removes the object op from the linked list of objects	909	* This function removes the object op from the linked list of objects
939	* which it is currently tied to. When this function is done, the	910	* which it is currently tied to. When this function is done, the
940	* object will have no environment. If the object previously had an	911	* object will have no environment. If the object previously had an
941	* environment, the x and y coordinates will be updated to	912	* environment, the x and y coordinates will be updated to
942	* the previous environment.	913	* the previous environment.
943	* Beware: This function is called from the editor as well!
944	*/	914	*/
945	void	915	void
946	object::remove ()	916	object::do_remove ()
947	{	917	{
948	object tmp, last = 0;	918	object tmp, last = 0;
949	object *otmp;	919	object *otmp;
950		920
951	if (QUERY_FLAG (this, FLAG_REMOVED))	921	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
973	* to save cpu time.	943	* to save cpu time.
974	*/	944	*/
975	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	945	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976	otmp->update_stats ();	946	otmp->update_stats ();
977		947
978	if (above != NULL)	948	if (above)
979	above->below = below;	949	above->below = below;
980	else	950	else
981	env->inv = below;	951	env->inv = below;
982		952
983	if (below != NULL)	953	if (below)
984	below->above = above;	954	below->above = above;
985		955
986	/* we set up values so that it could be inserted into	956	/* we set up values so that it could be inserted into
987	* the map, but we don't actually do that - it is up	957	* the map, but we don't actually do that - it is up
988	* to the caller to decide what we want to do.	958	* to the caller to decide what we want to do.
…		…
992	above = 0, below = 0;	962	above = 0, below = 0;
993	env = 0;	963	env = 0;
994	}	964	}
995	else if (map)	965	else if (map)
996	{	966	{
997	/* Re did the following section of code - it looks like it had	967	if (type == PLAYER)
998	* lots of logic for things we no longer care about
999	*/	968	{
		969	// leaving a spot always closes any open container on the ground
		970	if (container && !container->env)
		971	// this causes spurious floorbox updates, but it ensures
		972	// that the CLOSE event is being sent.
		973	close_container ();
		974
		975	--map->players;
		976	map->touch ();
		977	}
		978
		979	map->dirty = true;
		980	mapspace &ms = this->ms ();
1000		981
1001	/* link the object above us */	982	/* link the object above us */
1002	if (above)	983	if (above)
1003	above->below = below;	984	above->below = below;
1004	else	985	else
1005	map->at (x, y).top = below; /* we were top, set new top */	986	ms.top = below; /* we were top, set new top */
1006		987
1007	/* Relink the object below us, if there is one */	988	/* Relink the object below us, if there is one */
1008	if (below)	989	if (below)
1009	below->above = above;	990	below->above = above;
1010	else	991	else
…		…
1012	/* Nothing below, which means we need to relink map object for this space	993	/* 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	994	* use translated coordinates in case some oddness with map tiling is
1014	* evident	995	* evident
1015	*/	996	*/
1016	if (GET_MAP_OB (map, x, y) != this)	997	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);	998	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		999
1027	map->at (x, y).bot = above; /* goes on above it. */	1000	ms.bot = above; /* goes on above it. */
1028	}	1001	}
1029		1002
1030	above = 0;	1003	above = 0;
1031	below = 0;	1004	below = 0;
1032		1005
1033	if (map->in_memory == MAP_SAVING)	1006	if (map->in_memory == MAP_SAVING)
1034	return;	1007	return;
1035		1008
1036	int check_walk_off = !flag [FLAG_NO_APPLY];	1009	int check_walk_off = !flag [FLAG_NO_APPLY];
1037		1010
1038	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1011	for (tmp = ms.bot; tmp; tmp = tmp->above)
1039	{	1012	{
1040	/* No point updating the players look faces if he is the object	1013	/* No point updating the players look faces if he is the object
1041	* being removed.	1014	* being removed.
1042	*/	1015	*/
1043		1016
…		…
1055		1028
1056	if (tmp->contr->ns)	1029	if (tmp->contr->ns)
1057	tmp->contr->ns->floorbox_update ();	1030	tmp->contr->ns->floorbox_update ();
1058	}	1031	}
1059		1032
1060	/* See if player moving off should effect something */	1033	/* See if object moving off should effect something */
1061	if (check_walk_off	1034	if (check_walk_off
1062	&& ((move_type & tmp->move_off)	1035	&& ((move_type & tmp->move_off)
1063	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1036	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064	{	1037	{
1065	move_apply (tmp, this, 0);	1038	move_apply (tmp, this, 0);
…		…
1067	if (destroyed ())	1040	if (destroyed ())
1068	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1041	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069	}	1042	}
1070		1043
1071	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1044	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072		1045	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073	if (tmp->above == tmp)	1046	if (tmp->above == tmp)
1074	tmp->above = 0;	1047	tmp->above = 0;
1075		1048
1076	last = tmp;	1049	last = tmp;
1077	}	1050	}
1078		1051
1079	/* last == NULL of there are no objects on this space */	1052	/* last == NULL if there are no objects on this space */
		1053	//TODO: this makes little sense, why only update the topmost object?
1080	if (!last)	1054	if (!last)
1081	map->at (x, y).flags_ = P_NEED_UPDATE;	1055	map->at (x, y).flags_ = 0;
1082	else	1056	else
1083	update_object (last, UP_OBJ_REMOVE);	1057	update_object (last, UP_OBJ_REMOVE);
1084		1058
1085	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1059	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1086	update_all_los (map, x, y);	1060	update_all_los (map, x, y);
…		…
1123		1097
1124	return 0;	1098	return 0;
1125	}	1099	}
1126		1100
1127	/*	1101	/*
1128	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1102	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1129	* job preparing multi-part monsters	1103	* job preparing multi-part monsters.
1130	*/	1104	*/
1131	object *	1105	object *
1132	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1106	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1133	{	1107	{
1134	object *tmp;
1135
1136	if (op->head)
1137	op = op->head;
1138
1139	for (tmp = op; tmp; tmp = tmp->more)	1108	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140	{	1109	{
1141	tmp->x = x + tmp->arch->clone.x;	1110	tmp->x = x + tmp->arch->clone.x;
1142	tmp->y = y + tmp->arch->clone.y;	1111	tmp->y = y + tmp->arch->clone.y;
1143	}	1112	}
1144		1113
…		…
1167	*/	1136	*/
1168	object *	1137	object *
1169	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1138	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1170	{	1139	{
1171	object tmp, top, *floor = NULL;	1140	object tmp, top, *floor = NULL;
1172	sint16 x, y;
1173		1141
1174	if (QUERY_FLAG (op, FLAG_FREED))	1142	if (QUERY_FLAG (op, FLAG_FREED))
1175	{	1143	{
1176	LOG (llevError, "Trying to insert freed object!\n");	1144	LOG (llevError, "Trying to insert freed object!\n");
1177	return NULL;	1145	return NULL;
1178	}	1146	}
1179		1147
1180	if (m == NULL)	1148	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1149	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1150
		1151	op->remove ();
		1152
		1153	if (!m)
1181	{	1154	{
1182	char *dump = dump_object (op);	1155	char *dump = dump_object (op);
1183	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1156	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1184	free (dump);	1157	free (dump);
1185	return op;	1158	return op;
…		…
1198	#endif	1171	#endif
1199	free (dump);	1172	free (dump);
1200	return op;	1173	return op;
1201	}	1174	}
1202		1175
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;	1176	if (object *more = op->more)
1216		1177	{
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)	1178	if (!insert_ob_in_map (more, m, originator, flag))
1233	{	1179	{
1234	if (!op->head)	1180	if (!op->head)
1235	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1181	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236		1182
1237	return 0;	1183	return 0;
…		…
1242		1188
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1189	/* 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	1190	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1191	* need extra work
1246	*/	1192	*/
1247	op->map = get_map_from_coord (m, &op->x, &op->y);	1193	if (!xy_normalise (m, op->x, op->y))
1248	x = op->x;	1194	return 0;
1249	y = op->y;	1195
		1196	op->map = m;
		1197	mapspace &ms = op->ms ();
1250		1198
1251	/* this has to be done after we translate the coordinates.	1199	/* this has to be done after we translate the coordinates.
1252	*/	1200	*/
1253	if (op->nrof && !(flag & INS_NO_MERGE))	1201	if (op->nrof && !(flag & INS_NO_MERGE))
1254	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1202	for (tmp = ms.bot; tmp; tmp = tmp->above)
1255	if (object::can_merge (op, tmp))	1203	if (object::can_merge (op, tmp))
1256	{	1204	{
1257	op->nrof += tmp->nrof;	1205	op->nrof += tmp->nrof;
1258	tmp->destroy ();	1206	tmp->destroy ();
1259	}	1207	}
…		…
1276	op->below = originator->below;	1224	op->below = originator->below;
1277		1225
1278	if (op->below)	1226	if (op->below)
1279	op->below->above = op;	1227	op->below->above = op;
1280	else	1228	else
1281	op->ms ().bot = op;	1229	ms.bot = op;
1282		1230
1283	/* since below originator, no need to update top */	1231	/* since below originator, no need to update top */
1284	originator->below = op;	1232	originator->below = op;
1285	}	1233	}
1286	else	1234	else
1287	{	1235	{
		1236	top = ms.bot;
		1237
1288	/* If there are other objects, then */	1238	/* If there are other objects, then */
1289	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1239	if ((!(flag & INS_MAP_LOAD)) && top)
1290	{	1240	{
1291	object *last = NULL;	1241	object *last = 0;
1292		1242
1293	/*	1243	/*
1294	* If there are multiple objects on this space, we do some trickier handling.	1244	* If there are multiple objects on this space, we do some trickier handling.
1295	* We've already dealt with merging if appropriate.	1245	* We've already dealt with merging if appropriate.
1296	* Generally, we want to put the new object on top. But if	1246	* 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	1250	* 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	1251	* 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	1252	* when lots of spells are cast in one area. Currently, it is presumed
1303	* that flying non pickable objects are spell objects.	1253	* that flying non pickable objects are spell objects.
1304	*/	1254	*/
1305		1255	for (top = ms.bot; top; top = top->above)
1306	while (top != NULL)
1307	{	1256	{
1308	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1257	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309	floor = top;	1258	floor = top;
1310		1259
1311	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1260	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;	1263	top = top->below;
1315	break;	1264	break;
1316	}	1265	}
1317		1266
1318	last = top;	1267	last = top;
1319	top = top->above;
1320	}	1268	}
1321		1269
1322	/* Don't want top to be NULL, so set it to the last valid object */	1270	/* Don't want top to be NULL, so set it to the last valid object */
1323	top = last;	1271	top = last;
1324		1272
…		…
1331	* Unless those objects are exits, type 66	1279	* Unless those objects are exits, type 66
1332	* If INS_ON_TOP is used, don't do this processing	1280	* If INS_ON_TOP is used, don't do this processing
1333	* Need to find the object that in fact blocks view, otherwise	1281	* Need to find the object that in fact blocks view, otherwise
1334	* stacking is a bit odd.	1282	* stacking is a bit odd.
1335	*/	1283	*/
1336	if (!(flag & INS_ON_TOP) &&	1284	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))	1285	&& ms.flags () & P_BLOCKSVIEW
		1286	&& (op->face && !op->face->visibility))
1338	{	1287	{
1339	for (last = top; last != floor; last = last->below)	1288	for (last = top; last != floor; last = last->below)
1340	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1289	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341	break;	1290	break;
		1291
1342	/* Check to see if we found the object that blocks view,	1292	/* Check to see if we found the object that blocks view,
1343	* and make sure we have a below pointer for it so that	1293	* and make sure we have a below pointer for it so that
1344	* we can get inserted below this one, which requires we	1294	* we can get inserted below this one, which requires we
1345	* set top to the object below us.	1295	* set top to the object below us.
1346	*/	1296	*/
…		…
1348	top = last->below;	1298	top = last->below;
1349	}	1299	}
1350	} /* If objects on this space */	1300	} /* If objects on this space */
1351		1301
1352	if (flag & INS_MAP_LOAD)	1302	if (flag & INS_MAP_LOAD)
1353	top = GET_MAP_TOP (op->map, op->x, op->y);	1303	top = ms.top;
1354		1304
1355	if (flag & INS_ABOVE_FLOOR_ONLY)	1305	if (flag & INS_ABOVE_FLOOR_ONLY)
1356	top = floor;	1306	top = floor;
1357		1307
1358	/* Top is the object that our object (op) is going to get inserted above.	1308	/* Top is the object that our object (op) is going to get inserted above.
1359	*/	1309	*/
1360		1310
1361	/* First object on this space */	1311	/* First object on this space */
1362	if (!top)	1312	if (!top)
1363	{	1313	{
1364	op->above = GET_MAP_OB (op->map, op->x, op->y);	1314	op->above = ms.bot;
1365		1315
1366	if (op->above)	1316	if (op->above)
1367	op->above->below = op;	1317	op->above->below = op;
1368		1318
1369	op->below = NULL;	1319	op->below = 0;
1370	op->ms ().bot = op;	1320	ms.bot = op;
1371	}	1321	}
1372	else	1322	else
1373	{ /* get inserted into the stack above top */	1323	{ /* get inserted into the stack above top */
1374	op->above = top->above;	1324	op->above = top->above;
1375		1325
…		…
1378		1328
1379	op->below = top;	1329	op->below = top;
1380	top->above = op;	1330	top->above = op;
1381	}	1331	}
1382		1332
1383	if (op->above == NULL)	1333	if (!op->above)
1384	op->ms ().top = op;	1334	ms.top = op;
1385	} /* else not INS_BELOW_ORIGINATOR */	1335	} /* else not INS_BELOW_ORIGINATOR */
1386		1336
1387	if (op->type == PLAYER)	1337	if (op->type == PLAYER)
		1338	{
1388	op->contr->do_los = 1;	1339	op->contr->do_los = 1;
		1340	++op->map->players;
		1341	op->map->touch ();
		1342	}
		1343
		1344	op->map->dirty = true;
1389		1345
1390	/* If we have a floor, we know the player, if any, will be above	1346	/* 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.	1347	* it, so save a few ticks and start from there.
1392	*/	1348	*/
1393	if (!(flag & INS_MAP_LOAD))	1349	if (!(flag & INS_MAP_LOAD))
1394	if (object *pl = op->ms ().player ())	1350	if (object *pl = ms.player ())
1395	if (pl->contr->ns)	1351	if (pl->contr->ns)
1396	pl->contr->ns->floorbox_update ();	1352	pl->contr->ns->floorbox_update ();
1397		1353
1398	/* If this object glows, it may affect lighting conditions that are	1354	/* If this object glows, it may affect lighting conditions that are
1399	* visible to others on this map. But update_all_los is really	1355	* 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	1356	* 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	1357	* on the map will get recalculated. The players could very well
1402	* be far away from this change and not affected in any way -	1358	* be far away from this change and not affected in any way -
1403	* this should get redone to only look for players within range,	1359	* this should get redone to only look for players within range,
1404	* or just updating the P_NEED_UPDATE for spaces within this area	1360	* or just updating the P_UPTODATE for spaces within this area
1405	* of effect may be sufficient.	1361	* of effect may be sufficient.
1406	*/	1362	*/
1407	if (op->map->darkness && (op->glow_radius != 0))	1363	if (op->map->darkness && (op->glow_radius != 0))
1408	update_all_los (op->map, op->x, op->y);	1364	update_all_los (op->map, op->x, op->y);
1409		1365
…		…
1447	{	1403	{
1448	object tmp, tmp1;	1404	object tmp, tmp1;
1449		1405
1450	/* first search for itself and remove any old instances */	1406	/* first search for itself and remove any old instances */
1451		1407
1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1408	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1409	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454	tmp->destroy ();	1410	tmp->destroy ();
1455		1411
1456	tmp1 = arch_to_object (archetype::find (arch_string));	1412	tmp1 = arch_to_object (archetype::find (arch_string));
1457		1413
1458	tmp1->x = op->x;	1414	tmp1->x = op->x;
1459	tmp1->y = op->y;	1415	tmp1->y = op->y;
1460	insert_ob_in_map (tmp1, op->map, op, 0);	1416	insert_ob_in_map (tmp1, op->map, op, 0);
		1417	}
		1418
		1419	object *
		1420	object::insert_at (object where, object originator, int flags)
		1421	{
		1422	where->map->insert (this, where->x, where->y, originator, flags);
1461	}	1423	}
1462		1424
1463	/*	1425	/*
1464	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1426	* 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	1427	* is returned contains nr objects, and the remaining parts contains
1466	* the rest (or is removed and freed if that number is 0).	1428	* the rest (or is removed and freed if that number is 0).
1467	* On failure, NULL is returned, and the reason put into the	1429	* On failure, NULL is returned, and the reason put into the
1468	* global static errmsg array.	1430	* global static errmsg array.
1469	*/	1431	*/
1470
1471	object *	1432	object *
1472	get_split_ob (object *orig_ob, uint32 nr)	1433	get_split_ob (object *orig_ob, uint32 nr)
1473	{	1434	{
1474	object *newob;	1435	object *newob;
1475	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1436	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1739	*	1700	*
1740	* MSW 2001-07-08: Check all objects on space, not just those below	1701	* 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	1702	* object being inserted. insert_ob_in_map may not put new objects
1742	* on top.	1703	* on top.
1743	*/	1704	*/
1744
1745	int	1705	int
1746	check_move_on (object op, object originator)	1706	check_move_on (object op, object originator)
1747	{	1707	{
1748	object *tmp;	1708	object *tmp;
1749	maptile *m = op->map;	1709	maptile *m = op->map;
…		…
1776		1736
1777	/* The objects have to be checked from top to bottom.	1737	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1738	* Hence, we first go to the top:
1779	*/	1739	*/
1780		1740
1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1741	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782	{	1742	{
1783	/* Trim the search when we find the first other spell effect	1743	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1744	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1745	* we don't need to check all of them.
1786	*/	1746	*/
…		…
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1764	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))	1765	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1766	{
1807		1767
1808	float	1768	float
1809	diff = tmp->move_slow_penalty * FABS (op->speed);	1769	diff = tmp->move_slow_penalty * fabs (op->speed);
1810		1770
1811	if (op->type == PLAYER)	1771	if (op->type == PLAYER)
1812	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1772	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)))	1773	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814	diff /= 4.0;	1774	diff /= 4.0;
…		…
1844	* The first matching object is returned, or NULL if none.	1804	* The first matching object is returned, or NULL if none.
1845	*/	1805	*/
1846	object *	1806	object *
1847	present_arch (const archetype at, maptile m, int x, int y)	1807	present_arch (const archetype at, maptile m, int x, int y)
1848	{	1808	{
1849	if (m == NULL \|\| out_of_map (m, x, y))	1809	if (!m \|\| out_of_map (m, x, y))
1850	{	1810	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1811	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1812	return NULL;
1853	}	1813	}
1854		1814
1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1815	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856	if (tmp->arch == at)	1816	if (tmp->arch == at)
1857	return tmp;	1817	return tmp;
1858		1818
1859	return NULL;	1819	return NULL;
1860	}	1820	}
…		…
1871	{	1831	{
1872	LOG (llevError, "Present called outside map.\n");	1832	LOG (llevError, "Present called outside map.\n");
1873	return NULL;	1833	return NULL;
1874	}	1834	}
1875		1835
1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1836	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1837	if (tmp->type == type)
1878	return tmp;	1838	return tmp;
1879		1839
1880	return NULL;	1840	return NULL;
1881	}	1841	}
…		…
2021	}	1981	}
2022		1982
2023	if (!index)	1983	if (!index)
2024	return -1;	1984	return -1;
2025		1985
2026	return altern[RANDOM () % index];	1986	return altern [rndm (index)];
2027	}	1987	}
2028		1988
2029	/*	1989	/*
2030	* find_first_free_spot(archetype, maptile, x, y) works like	1990	* find_first_free_spot(archetype, maptile, x, y) works like
2031	* find_free_spot(), but it will search max number of squares.	1991	* find_free_spot(), but it will search max number of squares.
…		…
2052	{	2012	{
2053	arr += begin;	2013	arr += begin;
2054	end -= begin;	2014	end -= begin;
2055		2015
2056	while (--end)	2016	while (--end)
2057	swap (arr [end], arr [RANDOM () % (end + 1)]);	2017	swap (arr [end], arr [rndm (end + 1)]);
2058	}	2018	}
2059		2019
2060	/* new function to make monster searching more efficient, and effective!	2020	/* new function to make monster searching more efficient, and effective!
2061	* This basically returns a randomized array (in the passed pointer) of	2021	* This basically returns a randomized array (in the passed pointer) of
2062	* the spaces to find monsters. In this way, it won't always look for	2022	* the spaces to find monsters. In this way, it won't always look for
…		…
2196		2156
2197	return 3;	2157	return 3;
2198	}	2158	}
2199		2159
2200	/*	2160	/*
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	2161	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220	* between two directions (which are expected to be absolute (see absdir())	2162	* between two directions (which are expected to be absolute (see absdir())
2221	*/	2163	*/
2222
2223	int	2164	int
2224	dirdiff (int dir1, int dir2)	2165	dirdiff (int dir1, int dir2)
2225	{	2166	{
2226	int d;	2167	int d;
2227		2168
…		…
2606	}	2547	}
2607	else	2548	else
2608	item = item->env;	2549	item = item->env;
2609	}	2550	}
2610		2551
		2552
		2553	const char *
		2554	object::flag_desc (char *desc, int len) const
		2555	{
		2556	char *p = desc;
		2557	bool first = true;
		2558
		2559	*p = 0;
		2560
		2561	for (int i = 0; i < NUM_FLAGS; i++)
		2562	{
		2563	if (len <= 10) // magic constant!
		2564	{
		2565	snprintf (p, len, ",...");
		2566	break;
		2567	}
		2568
		2569	if (flag [i])
		2570	{
		2571	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2572	len -= cnt;
		2573	p += cnt;
		2574	first = false;
		2575	}
		2576	}
		2577
		2578	return desc;
		2579	}
		2580
2611	// return a suitable string describing an objetc in enough detail to find it	2581	// return a suitable string describing an object in enough detail to find it
2612	const char *	2582	const char *
2613	object::debug_desc (char *info) const	2583	object::debug_desc (char *info) const
2614	{	2584	{
		2585	char flagdesc[512];
2615	char info2[256 * 3];	2586	char info2[256 * 4];
2616	char *p = info;	2587	char *p = info;
2617		2588
2618	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619	count,	2590	count, uuid.seq,
2620	&name,	2591	&name,
2621	title ? " " : "",	2592	title ? "\",title:\"" : "",
2622	title ? (const char *)title : "");	2593	title ? (const char *)title : "",
		2594	flag_desc (flagdesc, 512), type);
2623		2595
2624	if (env)	2596	if (env)
2625	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626		2598
2627	if (map)	2599	if (map)
2628	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2600	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629		2601
2630	return info;	2602	return info;
2631	}	2603	}
2632		2604
2633	const char *	2605	const char *
2634	object::debug_desc () const	2606	object::debug_desc () const
2635	{	2607	{
2636	static char info[256 * 3];	2608	static char info[256 * 4];
2637	return debug_desc (info);	2609	return debug_desc (info);
2638	}	2610	}
2639		2611
		2612	const char *
		2613	object::debug_desc2 () const
		2614	{
		2615	static char info[256 * 4];
		2616	return debug_desc (info);
		2617	}
		2618
		2619	struct region *
		2620	object::region () const
		2621	{
		2622	return map ? map->region (x, y)
		2623	: region::default_region ();
		2624	}
		2625
		2626	const materialtype_t *
		2627	object::dominant_material () const
		2628	{
		2629	if (materialtype_t *mat = name_to_material (materialname))
		2630	return mat;
		2631
		2632	// omfg this is slow, this has to be temporary :)
		2633	shstr unknown ("unknown");
		2634
		2635	return name_to_material (unknown);
		2636	}
		2637
		2638	void
		2639	object::open_container (object *new_container)
		2640	{
		2641	if (container == new_container)
		2642	return;
		2643
		2644	if (contr && contr->ns)
		2645	contr->ns->floorbox_reset ();
		2646
		2647	if (object *old_container = container)
		2648	{
		2649	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2650	return;
		2651
		2652	#if 0
		2653	// remove the "Close old_container" object.
		2654	if (object *closer = old_container->inv)
		2655	if (closer->type == CLOSE_CON)
		2656	closer->destroy ();
		2657	#endif
		2658
		2659	old_container->flag [FLAG_APPLIED] = 0;
		2660	container = 0;
		2661
		2662	esrv_update_item (UPD_FLAGS, this, old_container);
		2663	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2664	}
		2665
		2666	if (new_container)
		2667	{
		2668	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	// TODO: this does not seem to serve any purpose anymore?
		2672	#if 0
		2673	// insert the "Close Container" object.
		2674	if (archetype *closer = new_container->other_arch)
		2675	{
		2676	object *closer = arch_to_object (new_container->other_arch);
		2677	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2678	new_container->insert (closer);
		2679	}
		2680	#endif
		2681
		2682	new_container->flag [FLAG_APPLIED] = 1;
		2683	container = new_container;
		2684
		2685	esrv_update_item (UPD_FLAGS, this, new_container);
		2686	esrv_send_inventory (this, new_container);
		2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2688	}
		2689	}
		2690
		2691

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.131 by root, Sat Feb 10 15:20:23 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.131 by root, Sat Feb 10 15:20:23 2007 UTC