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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.93 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object active_objects; / List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
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	}
…		…
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	/*
…		…
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	object::set_speed (float speed)	558	object::set_speed (float speed)
560	{	559	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	560	if (flag [FLAG_FREED] && speed)
567	{	561	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	563	speed = 0;
570	}	564	}
571		565
572	this->speed = speed;	566	this->speed = speed;
573		567
574	if (arch_init)	568	if (has_active_speed ())
575	return;	569	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next \|\| active_prev \|\| this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	570	else
593	{	571	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	572	}
648		573
649	/*	574	/*
650	* update_object() updates the the map.	575	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
…		…
699	return;	624	return;
700	}	625	}
701		626
702	mapspace &m = op->ms ();	627	mapspace &m = op->ms ();
703		628
704	if (m.flags_ & P_NEED_UPDATE)	629	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	630	/* nop */;
706	else if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
707	{	632	{
708	// this is likely overkill, TODO: revisit (schmorp)	633	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* 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
719	* to have move_allow right now.	644	* to have move_allow right now.
720	*/	645	*/
721	\|\| ((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
722	\|\| 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)
723	m.flags_ = P_NEED_UPDATE;	648	m.flags_ = 0;
724	}	649	}
725	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	652	* that is being removed.
728	*/	653	*/
729	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	655	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
733	else	658	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		660
736	if (op->more)	661	if (op->more)
737	update_object (op->more, action);	662	update_object (op->more, action);
738	}	663	}
739		664
740	object::vector object::objects; // not yet used
741	object *object::first;	665	object *object::first;
742		666
743	object::object ()	667	object::object ()
744	{	668	{
745	SET_FLAG (this, FLAG_REMOVED);	669	SET_FLAG (this, FLAG_REMOVED);
…		…
751	object::~object ()	675	object::~object ()
752	{	676	{
753	free_key_values (this);	677	free_key_values (this);
754	}	678	}
755		679
		680	static int object_count;
		681
756	void object::link ()	682	void object::link ()
757	{	683	{
758	count = ++ob_count;	684	assert (!index);//D
759	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
760		687
761	prev = 0;	688	refcnt_inc ();
762	next = object::first;	689	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	690	}
769		691
770	void object::unlink ()	692	void object::unlink ()
771	{	693	{
772	if (this == object::first)	694	assert (index);//D
773	object::first = next;	695	objects.erase (this);
		696	refcnt_dec ();
		697	}
774		698
775	/* Remove this object from the list of used objects */	699	void
776	if (prev) prev->next = next;	700	object::activate ()
777	if (next) next->prev = prev;	701	{
		702	/* If already on active list, don't do anything */
		703	if (active)
		704	return;
778		705
779	prev = 0;	706	if (has_active_speed ())
780	next = 0;	707	actives.insert (this);
		708	}
		709
		710	void
		711	object::activate_recursive ()
		712	{
		713	activate ();
		714
		715	for (object *op = inv; op; op = op->below)
		716	op->activate_recursive ();
		717	}
		718
		719	/* This function removes object 'op' from the list of active
		720	* objects.
		721	* This should only be used for style maps or other such
		722	* reference maps where you don't want an object that isn't
		723	* in play chewing up cpu time getting processed.
		724	* The reverse of this is to call update_ob_speed, which
		725	* will do the right thing based on the speed of the object.
		726	*/
		727	void
		728	object::deactivate ()
		729	{
		730	/* If not on the active list, nothing needs to be done */
		731	if (!active)
		732	return;
		733
		734	actives.erase (this);
		735	}
		736
		737	void
		738	object::deactivate_recursive ()
		739	{
		740	for (object *op = inv; op; op = op->below)
		741	op->deactivate_recursive ();
		742
		743	deactivate ();
		744	}
		745
		746	void
		747	object::set_flag_inv (int flag, int value)
		748	{
		749	for (object *op = inv; op; op = op->below)
		750	{
		751	op->flag [flag] = value;
		752	op->set_flag_inv (flag, value);
		753	}
781	}	754	}
782		755
783	/*	756	/*
784	* Remove and free all objects in the inventory of the given object.	757	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	758	* object.c ?
786	*/	759	*/
787	void	760	void
788	object::destroy_inv (bool drop_to_ground)	761	object::destroy_inv (bool drop_to_ground)
789	{	762	{
		763	// need to check first, because the checks below might segfault
		764	// as we might be on an invalid mapspace and crossfire code
		765	// is too buggy to ensure that the inventory is empty.
		766	// corollary: if you create arrows etc. with stuff in tis inventory,
		767	// cf will crash below with off-map x and y
		768	if (!inv)
		769	return;
		770
790	/* Only if the space blocks everything do we not process -	771	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	772	* if some form of movement is allowed, let objects
792	* drop on that space.	773	* drop on that space.
793	*/	774	*/
794	if (!drop_to_ground	775	if (!drop_to_ground
795	\|\| !map	776	\|\| !map
796	\|\| map->in_memory != MAP_IN_MEMORY	777	\|\| map->in_memory != MAP_IN_MEMORY
797	\|\| map->at (x, y).move_block == MOVE_ALL)	778	\|\| ms ().move_block == MOVE_ALL)
798	{	779	{
799	while (inv)	780	while (inv)
800	{	781	{
801	inv->destroy_inv (drop_to_ground);	782	inv->destroy_inv (drop_to_ground);
802	inv->destroy ();	783	inv->destroy ();
…		…
810		791
811	if (op->flag [FLAG_STARTEQUIP]	792	if (op->flag [FLAG_STARTEQUIP]
812	\|\| op->flag [FLAG_NO_DROP]	793	\|\| op->flag [FLAG_NO_DROP]
813	\|\| op->type == RUNE	794	\|\| op->type == RUNE
814	\|\| op->type == TRAP	795	\|\| op->type == TRAP
815	\|\| op->flag [FLAG_IS_A_TEMPLATE])	796	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		797	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
816	op->destroy ();	798	op->destroy ();
817	else	799	else
818	map->insert (op, x, y);	800	map->insert (op, x, y);
819	}	801	}
820	}	802	}
…		…
828	}	810	}
829		811
830	void	812	void
831	object::do_destroy ()	813	object::do_destroy ()
832	{	814	{
		815	attachable::do_destroy ();
		816
833	if (flag [FLAG_IS_LINKED])	817	if (flag [FLAG_IS_LINKED])
834	remove_button_link (this);	818	remove_button_link (this);
835		819
836	if (flag [FLAG_FRIENDLY])	820	if (flag [FLAG_FRIENDLY])
837	remove_friendly_object (this);	821	remove_friendly_object (this);
838		822
839	if (!flag [FLAG_REMOVED])	823	if (!flag [FLAG_REMOVED])
840	remove ();	824	remove ();
841		825
842	if (flag [FLAG_FREED])	826	destroy_inv (true);
843	return;
844		827
845	set_speed (0);	828	deactivate ();
		829	unlink ();
846		830
847	flag [FLAG_FREED] = 1;	831	flag [FLAG_FREED] = 1;
848
849	attachable::do_destroy ();
850
851	destroy_inv (true);
852	unlink ();
853		832
854	// hack to ensure that freed objects still have a valid map	833	// hack to ensure that freed objects still have a valid map
855	{	834	{
856	static maptile *freed_map; // freed objects are moved here to avoid crashes	835	static maptile *freed_map; // freed objects are moved here to avoid crashes
857		836
…		…
861		840
862	freed_map->name = "/internal/freed_objects_map";	841	freed_map->name = "/internal/freed_objects_map";
863	freed_map->width = 3;	842	freed_map->width = 3;
864	freed_map->height = 3;	843	freed_map->height = 3;
865		844
866	freed_map->allocate ();	845	freed_map->alloc ();
		846	freed_map->in_memory = MAP_IN_MEMORY;
867	}	847	}
868		848
869	map = freed_map;	849	map = freed_map;
870	x = 1;	850	x = 1;
871	y = 1;	851	y = 1;
…		…
881		861
882	// clear those pointers that likely might have circular references to us	862	// clear those pointers that likely might have circular references to us
883	owner = 0;	863	owner = 0;
884	enemy = 0;	864	enemy = 0;
885	attacked_by = 0;	865	attacked_by = 0;
886
887	// only relevant for players(?), but make sure of it anyways
888	contr = 0;
889	}	866	}
890		867
891	void	868	void
892	object::destroy (bool destroy_inventory)	869	object::destroy (bool destroy_inventory)
893	{	870	{
…		…
956	* to save cpu time.	933	* to save cpu time.
957	*/	934	*/
958	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	935	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
959	otmp->update_stats ();	936	otmp->update_stats ();
960		937
961	if (above != NULL)	938	if (above)
962	above->below = below;	939	above->below = below;
963	else	940	else
964	env->inv = below;	941	env->inv = below;
965		942
966	if (below != NULL)	943	if (below)
967	below->above = above;	944	below->above = above;
968		945
969	/* we set up values so that it could be inserted into	946	/* we set up values so that it could be inserted into
970	* the map, but we don't actually do that - it is up	947	* the map, but we don't actually do that - it is up
971	* to the caller to decide what we want to do.	948	* to the caller to decide what we want to do.
…		…
975	above = 0, below = 0;	952	above = 0, below = 0;
976	env = 0;	953	env = 0;
977	}	954	}
978	else if (map)	955	else if (map)
979	{	956	{
980	/* Re did the following section of code - it looks like it had	957	if (type == PLAYER)
981	* lots of logic for things we no longer care about
982	*/	958	{
		959	--map->players;
		960	map->touch ();
		961	}
		962
		963	map->dirty = true;
983		964
984	/* link the object above us */	965	/* link the object above us */
985	if (above)	966	if (above)
986	above->below = below;	967	above->below = below;
987	else	968	else
…		…
1038		1019
1039	if (tmp->contr->ns)	1020	if (tmp->contr->ns)
1040	tmp->contr->ns->floorbox_update ();	1021	tmp->contr->ns->floorbox_update ();
1041	}	1022	}
1042		1023
1043	/* See if player moving off should effect something */	1024	/* See if object moving off should effect something */
1044	if (check_walk_off	1025	if (check_walk_off
1045	&& ((move_type & tmp->move_off)	1026	&& ((move_type & tmp->move_off)
1046	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1027	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1047	{	1028	{
1048	move_apply (tmp, this, 0);	1029	move_apply (tmp, this, 0);
…		…
1050	if (destroyed ())	1031	if (destroyed ())
1051	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1032	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1052	}	1033	}
1053		1034
1054	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1035	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1055		1036	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1056	if (tmp->above == tmp)	1037	if (tmp->above == tmp)
1057	tmp->above = 0;	1038	tmp->above = 0;
1058		1039
1059	last = tmp;	1040	last = tmp;
1060	}	1041	}
1061		1042
1062	/* last == NULL of there are no objects on this space */	1043	/* last == NULL if there are no objects on this space */
		1044	//TODO: this makes little sense, why only update the topmost object?
1063	if (!last)	1045	if (!last)
1064	map->at (x, y).flags_ = P_NEED_UPDATE;	1046	map->at (x, y).flags_ = 0;
1065	else	1047	else
1066	update_object (last, UP_OBJ_REMOVE);	1048	update_object (last, UP_OBJ_REMOVE);
1067		1049
1068	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1050	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1069	update_all_los (map, x, y);	1051	update_all_los (map, x, y);
…		…
1153	{	1135	{
1154	LOG (llevError, "Trying to insert freed object!\n");	1136	LOG (llevError, "Trying to insert freed object!\n");
1155	return NULL;	1137	return NULL;
1156	}	1138	}
1157		1139
1158	if (m == NULL)	1140	if (!m)
1159	{	1141	{
1160	char *dump = dump_object (op);	1142	char *dump = dump_object (op);
1161	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1143	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1162	free (dump);	1144	free (dump);
1163	return op;	1145	return op;
…		…
1190	{	1172	{
1191	/* The part may be on a different map. */	1173	/* The part may be on a different map. */
1192		1174
1193	object *more = op->more;	1175	object *more = op->more;
1194		1176
1195	/* We really need the caller to normalize coordinates - if	1177	/* We really need the caller to normalise coordinates - if
1196	* we set the map, that doesn't work if the location is within	1178	* we set the map, that doesn't work if the location is within
1197	* a map and this is straddling an edge. So only if coordinate	1179	* a map and this is straddling an edge. So only if coordinate
1198	* is clear wrong do we normalize it.	1180	* is clear wrong do we normalise it.
1199	*/	1181	*/
1200	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1182	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1201	more->map = get_map_from_coord (m, &more->x, &more->y);	1183	more->map = get_map_from_coord (m, &more->x, &more->y);
1202	else if (!more->map)	1184	else if (!more->map)
1203	{	1185	{
…		…
1227	y = op->y;	1209	y = op->y;
1228		1210
1229	/* this has to be done after we translate the coordinates.	1211	/* this has to be done after we translate the coordinates.
1230	*/	1212	*/
1231	if (op->nrof && !(flag & INS_NO_MERGE))	1213	if (op->nrof && !(flag & INS_NO_MERGE))
1232	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1214	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1233	if (object::can_merge (op, tmp))	1215	if (object::can_merge (op, tmp))
1234	{	1216	{
1235	op->nrof += tmp->nrof;	1217	op->nrof += tmp->nrof;
1236	tmp->destroy ();	1218	tmp->destroy ();
1237	}	1219	}
…		…
1264	else	1246	else
1265	{	1247	{
1266	/* If there are other objects, then */	1248	/* If there are other objects, then */
1267	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1249	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1268	{	1250	{
1269	object *last = NULL;	1251	object *last = 0;
1270		1252
1271	/*	1253	/*
1272	* If there are multiple objects on this space, we do some trickier handling.	1254	* If there are multiple objects on this space, we do some trickier handling.
1273	* We've already dealt with merging if appropriate.	1255	* We've already dealt with merging if appropriate.
1274	* Generally, we want to put the new object on top. But if	1256	* Generally, we want to put the new object on top. But if
…		…
1278	* once we get to them. This reduces the need to traverse over all of	1260	* once we get to them. This reduces the need to traverse over all of
1279	* them when adding another one - this saves quite a bit of cpu time	1261	* them when adding another one - this saves quite a bit of cpu time
1280	* when lots of spells are cast in one area. Currently, it is presumed	1262	* when lots of spells are cast in one area. Currently, it is presumed
1281	* that flying non pickable objects are spell objects.	1263	* that flying non pickable objects are spell objects.
1282	*/	1264	*/
1283
1284	while (top != NULL)	1265	while (top)
1285	{	1266	{
1286	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1267	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1287	floor = top;	1268	floor = top;
1288		1269
1289	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1270	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1342	op->above = GET_MAP_OB (op->map, op->x, op->y);	1323	op->above = GET_MAP_OB (op->map, op->x, op->y);
1343		1324
1344	if (op->above)	1325	if (op->above)
1345	op->above->below = op;	1326	op->above->below = op;
1346		1327
1347	op->below = NULL;	1328	op->below = 0;
1348	op->ms ().bot = op;	1329	op->ms ().bot = op;
1349	}	1330	}
1350	else	1331	else
1351	{ /* get inserted into the stack above top */	1332	{ /* get inserted into the stack above top */
1352	op->above = top->above;	1333	op->above = top->above;
…		…
1356		1337
1357	op->below = top;	1338	op->below = top;
1358	top->above = op;	1339	top->above = op;
1359	}	1340	}
1360		1341
1361	if (op->above == NULL)	1342	if (!op->above)
1362	op->ms ().top = op;	1343	op->ms ().top = op;
1363	} /* else not INS_BELOW_ORIGINATOR */	1344	} /* else not INS_BELOW_ORIGINATOR */
1364		1345
1365	if (op->type == PLAYER)	1346	if (op->type == PLAYER)
		1347	{
1366	op->contr->do_los = 1;	1348	op->contr->do_los = 1;
		1349	++op->map->players;
		1350	op->map->touch ();
		1351	}
		1352
		1353	op->map->dirty = true;
1367		1354
1368	/* If we have a floor, we know the player, if any, will be above	1355	/* If we have a floor, we know the player, if any, will be above
1369	* it, so save a few ticks and start from there.	1356	* it, so save a few ticks and start from there.
1370	*/	1357	*/
1371	if (!(flag & INS_MAP_LOAD))	1358	if (!(flag & INS_MAP_LOAD))
…		…
1377	* visible to others on this map. But update_all_los is really	1364	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1365	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1366	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1367	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1368	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1369	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1370	* of effect may be sufficient.
1384	*/	1371	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1372	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1373	update_all_los (op->map, op->x, op->y);
1387		1374
…		…
1425	{	1412	{
1426	object tmp, tmp1;	1413	object tmp, tmp1;
1427		1414
1428	/* first search for itself and remove any old instances */	1415	/* first search for itself and remove any old instances */
1429		1416
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1417	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1418	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1432	tmp->destroy ();	1419	tmp->destroy ();
1433		1420
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1421	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1422
…		…
1758		1745
1759	/* The objects have to be checked from top to bottom.	1746	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1747	* Hence, we first go to the top:
1761	*/	1748	*/
1762		1749
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1750	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1751	{
1765	/* Trim the search when we find the first other spell effect	1752	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1753	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1754	* we don't need to check all of them.
1768	*/	1755	*/
…		…
1826	* The first matching object is returned, or NULL if none.	1813	* The first matching object is returned, or NULL if none.
1827	*/	1814	*/
1828	object *	1815	object *
1829	present_arch (const archetype at, maptile m, int x, int y)	1816	present_arch (const archetype at, maptile m, int x, int y)
1830	{	1817	{
1831	if (m == NULL \|\| out_of_map (m, x, y))	1818	if (!m \|\| out_of_map (m, x, y))
1832	{	1819	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1820	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1821	return NULL;
1835	}	1822	}
1836		1823
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1824	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1825	if (tmp->arch == at)
1839	return tmp;	1826	return tmp;
1840		1827
1841	return NULL;	1828	return NULL;
1842	}	1829	}
…		…
1853	{	1840	{
1854	LOG (llevError, "Present called outside map.\n");	1841	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1842	return NULL;
1856	}	1843	}
1857		1844
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1845	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1846	if (tmp->type == type)
1860	return tmp;	1847	return tmp;
1861		1848
1862	return NULL;	1849	return NULL;
1863	}	1850	}
…		…
2588	}	2575	}
2589	else	2576	else
2590	item = item->env;	2577	item = item->env;
2591	}	2578	}
2592		2579
		2580
		2581	const char *
		2582	object::flag_desc (char *desc, int len) const
		2583	{
		2584	char *p = desc;
		2585	bool first = true;
		2586
		2587	*p = 0;
		2588
		2589	for (int i = 0; i < NUM_FLAGS; i++)
		2590	{
		2591	if (len <= 10) // magic constant!
		2592	{
		2593	snprintf (p, len, ",...");
		2594	break;
		2595	}
		2596
		2597	if (flag [i])
		2598	{
		2599	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2600	len -= cnt;
		2601	p += cnt;
		2602	first = false;
		2603	}
		2604	}
		2605
		2606	return desc;
		2607	}
		2608
2593	// return a suitable string describing an objetc in enough detail to find it	2609	// return a suitable string describing an object in enough detail to find it
2594	const char *	2610	const char *
2595	object::debug_desc (char *info) const	2611	object::debug_desc (char *info) const
2596	{	2612	{
		2613	char flagdesc[512];
2597	char info2[256 * 3];	2614	char info2[256 * 4];
2598	char *p = info;	2615	char *p = info;
2599		2616
2600	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2617	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2601	count,	2618	count, uuid.seq,
2602	&name,	2619	&name,
2603	title ? " " : "",	2620	title ? "\",title:" : "",
2604	title ? (const char *)title : "");	2621	title ? (const char *)title : "",
		2622	flag_desc (flagdesc, 512), type);
2605		2623
2606	if (env)	2624	if (env)
2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2625	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2608		2626
2609	if (map)	2627	if (map)
2610	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2628	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2611		2629
2612	return info;	2630	return info;
2613	}	2631	}
2614		2632
2615	const char *	2633	const char *
2616	object::debug_desc () const	2634	object::debug_desc () const
2617	{	2635	{
2618	static char info[256 * 3];	2636	static char info[256 * 4];
2619	return debug_desc (info);	2637	return debug_desc (info);
2620	}	2638	}
2621		2639

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.93 by root, Tue Dec 26 20:04:09 2006 UTC vs. Revision 1.112 by root, Mon Jan 8 14:11:04 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.93 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 2007 UTC