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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.85 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object active_objects; / List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable before calling can_merge()	192	* Check nrof variable before calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object ob1, object ob2)	197	bool object::can_merge_slow (object ob1, object ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	\|\| ob1->type != ob2->type	201	\|\| ob1->type != ob2->type
…		…
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	return ((unsigned int)i) < objects.size ()
401	if (op->count == i)	401	? objects [i]
402	return op;	402	: 0;
403
404	return 0;
405	}	403	}
406		404
407	/*	405	/*
408	* Returns the first object which has a name equal to the argument.	406	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	407	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	408	* Enables features like "patch <name-of-other-player> food 999"
411	*/	409	*/
412
413	object *	410	object *
414	find_object_name (const char *str)	411	find_object_name (const char *str)
415	{	412	{
416	shstr_cmp str_ (str);	413	shstr_cmp str_ (str);
417	object *op;	414	object *op;
418		415
419	for (op = object::first; op != NULL; op = op->next)	416	for_all_objects (op)
420	if (op->name == str_)	417	if (op->name == str_)
421	break;	418	break;
422		419
423	return op;	420	return op;
424	}	421	}
…		…
522	tail = new_link;	519	tail = new_link;
523	}	520	}
524	}	521	}
525	}	522	}
526		523
527	update_ob_speed (dst);	524	dst->set_speed (dst->speed);
528	}	525	}
529		526
530	object *	527	object *
531	object::clone ()	528	object::clone ()
532	{	529	{
…		…
538	/*	535	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	536	* 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	537	* 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.	538	* be called to update the face variable, _and_ how it looks on the map.
542	*/	539	*/
543
544	void	540	void
545	update_turn_face (object *op)	541	update_turn_face (object *op)
546	{	542	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| op->arch == NULL)	543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)
548	return;	544	return;
		545
549	SET_ANIMATION (op, op->direction);	546	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	547	update_object (op, UP_OBJ_FACE);
551	}	548	}
552		549
553	/*	550	/*
554	* Updates the speed of an object. If the speed changes from 0 to another	551	* 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.	552	* 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.	553	* This function needs to be called whenever the speed of an object changes.
557	*/	554	*/
558	void	555	void
559	update_ob_speed (object *op)	556	object::set_speed (float speed)
560	{	557	{
561	extern int arch_init;	558	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
567	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568	{	559	{
569	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
570	#ifdef MANY_CORES
571	abort ();
572	#else
573	op->speed = 0;	561	speed = 0;
574	#endif
575	}
576
577	if (arch_init)
578	return;
579
580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581	{	562	}
582	/* If already on active list, don't do anything */
583	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
584	return;
585		563
586	/* process_events() expects us to insert the object at the beginning	564	this->speed = speed;
587	* of the list. */
588	op->active_next = active_objects;
589		565
590	if (op->active_next != NULL)	566	if (has_active_speed ())
591	op->active_next->active_prev = op;	567	activate ();
592
593	active_objects = op;
594	}
595	else	568	else
596	{	569	deactivate ();
597	/* If not on the active list, nothing needs to be done */
598	if (!op->active_next && !op->active_prev && op != active_objects)
599	return;
600
601	if (op->active_prev == NULL)
602	{
603	active_objects = op->active_next;
604
605	if (op->active_next != NULL)
606	op->active_next->active_prev = NULL;
607	}
608	else
609	{
610	op->active_prev->active_next = op->active_next;
611
612	if (op->active_next)
613	op->active_next->active_prev = op->active_prev;
614	}
615
616	op->active_next = NULL;
617	op->active_prev = NULL;
618	}
619	}
620
621	/* This function removes object 'op' from the list of active
622	* objects.
623	* This should only be used for style maps or other such
624	* reference maps where you don't want an object that isn't
625	* in play chewing up cpu time getting processed.
626	* The reverse of this is to call update_ob_speed, which
627	* will do the right thing based on the speed of the object.
628	*/
629	void
630	remove_from_active_list (object *op)
631	{
632	/* If not on the active list, nothing needs to be done */
633	if (!op->active_next && !op->active_prev && op != active_objects)
634	return;
635
636	if (op->active_prev == NULL)
637	{
638	active_objects = op->active_next;
639	if (op->active_next != NULL)
640	op->active_next->active_prev = NULL;
641	}
642	else
643	{
644	op->active_prev->active_next = op->active_next;
645	if (op->active_next)
646	op->active_next->active_prev = op->active_prev;
647	}
648	op->active_next = NULL;
649	op->active_prev = NULL;
650	}	570	}
651		571
652	/*	572	/*
653	* update_object() updates the the map.	573	* update_object() updates the the map.
654	* It takes into account invisible objects (and represent squares covered	574	* It takes into account invisible objects (and represent squares covered
…		…
702	return;	622	return;
703	}	623	}
704		624
705	mapspace &m = op->ms ();	625	mapspace &m = op->ms ();
706		626
707	if (m.flags_ & P_NEED_UPDATE)	627	if (!(m.flags_ & P_UPTODATE))
708	/* nop */;	628	/* nop */;
709	else if (action == UP_OBJ_INSERT)	629	else if (action == UP_OBJ_INSERT)
710	{	630	{
711	// this is likely overkill, TODO: revisit (schmorp)	631	// this is likely overkill, TODO: revisit (schmorp)
712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
721	/* This isn't perfect, but I don't expect a lot of objects to	641	/* This isn't perfect, but I don't expect a lot of objects to
722	* to have move_allow right now.	642	* to have move_allow right now.
723	*/	643	*/
724	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	644	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
725	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	645	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726	m.flags_ = P_NEED_UPDATE;	646	m.flags_ = 0;
727	}	647	}
728	/* if the object is being removed, we can't make intelligent	648	/* if the object is being removed, we can't make intelligent
729	* decisions, because remove_ob can't really pass the object	649	* decisions, because remove_ob can't really pass the object
730	* that is being removed.	650	* that is being removed.
731	*/	651	*/
732	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	652	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
733	m.flags_ = P_NEED_UPDATE;	653	m.flags_ = 0;
734	else if (action == UP_OBJ_FACE)	654	else if (action == UP_OBJ_FACE)
735	/* Nothing to do for that case */ ;	655	/* Nothing to do for that case */ ;
736	else	656	else
737	LOG (llevError, "update_object called with invalid action: %d\n", action);	657	LOG (llevError, "update_object called with invalid action: %d\n", action);
738		658
739	if (op->more)	659	if (op->more)
740	update_object (op->more, action);	660	update_object (op->more, action);
741	}	661	}
742		662
743	object::vector object::objects; // not yet used
744	object *object::first;	663	object *object::first;
745		664
746	object::object ()	665	object::object ()
747	{	666	{
748	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
…		…
756	free_key_values (this);	675	free_key_values (this);
757	}	676	}
758		677
759	void object::link ()	678	void object::link ()
760	{	679	{
761	count = ++ob_count;
762	uuid = gen_uuid ();	680	uuid = gen_uuid ();
763		681
764	prev = 0;	682	refcnt_inc ();
765	next = object::first;	683	objects.insert (this);
766
767	if (object::first)
768	object::first->prev = this;
769
770	object::first = this;
771	}	684	}
772		685
773	void object::unlink ()	686	void object::unlink ()
774	{	687	{
775	if (this == object::first)	688	objects.erase (this);
776	object::first = next;	689	refcnt_dec ();
777
778	/* Remove this object from the list of used objects */
779	if (prev) prev->next = next;
780	if (next) next->prev = prev;
781
782	prev = 0;
783	next = 0;
784	}	690	}
785		691
786	object *object::create ()
787	{
788	object *op = new object;
789	op->link ();
790	return op;
791	}
792
793	/*
794	* free_object() frees everything allocated by an object, removes
795	* it from the list of used objects, and puts it on the list of
796	* free objects. The IS_FREED() flag is set in the object.
797	* The object must have been removed by remove_ob() first for
798	* this function to succeed.
799	*
800	* If destroy_inventory is set, free inventory as well. Else drop items in
801	* inventory to the ground.
802	*/
803	void	692	void
804	object::do_destroy ()	693	object::activate ()
805	{	694	{
806	attachable::do_destroy ();	695	/* If already on active list, don't do anything */
807		696	if (active)
808	if (flag [FLAG_IS_LINKED])
809	remove_button_link (this);
810
811	if (flag [FLAG_FRIENDLY])
812	remove_friendly_object (this);
813
814	if (!flag [FLAG_REMOVED])
815	remove ();
816
817	if (flag [FLAG_FREED])
818	return;	697	return;
819		698
820	flag [FLAG_FREED] = 1;	699	if (has_active_speed ())
		700	actives.insert (this);
		701	}
821		702
822	// hack to ensure that freed objects still have a valid map	703	void
823	{	704	object::activate_recursive ()
824	static maptile *freed_map; // freed objects are moved here to avoid crashes	705	{
		706	activate ();
825		707
826	if (!freed_map)	708	for (object *op = inv; op; op = op->below)
		709	op->activate_recursive ();
		710	}
		711
		712	/* This function removes object 'op' from the list of active
		713	* objects.
		714	* This should only be used for style maps or other such
		715	* reference maps where you don't want an object that isn't
		716	* in play chewing up cpu time getting processed.
		717	* The reverse of this is to call update_ob_speed, which
		718	* will do the right thing based on the speed of the object.
		719	*/
		720	void
		721	object::deactivate ()
		722	{
		723	/* If not on the active list, nothing needs to be done */
		724	if (!active)
		725	return;
		726
		727	actives.erase (this);
		728	}
		729
		730	void
		731	object::deactivate_recursive ()
		732	{
		733	for (object *op = inv; op; op = op->below)
		734	op->deactivate_recursive ();
		735
		736	deactivate ();
		737	}
		738
		739	void
		740	object::set_flag_inv (int flag, int value)
		741	{
		742	for (object *op = inv; op; op = op->below)
827	{	743	{
828	freed_map = new maptile;	744	op->flag [flag] = value;
829		745	op->set_flag_inv (flag, value);
830	freed_map->name = "/internal/freed_objects_map";
831	freed_map->width = 3;
832	freed_map->height = 3;
833
834	freed_map->allocate ();
835	}	746	}
836
837	map = freed_map;
838	x = 1;
839	y = 1;
840	}
841
842	more = 0;
843	head = 0;
844	inv = 0;
845
846	// clear those pointers that likely might have circular references to us
847	owner = 0;
848	enemy = 0;
849	attacked_by = 0;
850
851	// only relevant for players(?), but make sure of it anyways
852	contr = 0;
853
854	/* Remove object from the active list */
855	speed = 0;
856	update_ob_speed (this);
857
858	unlink ();
859	}	747	}
860		748
861	/*	749	/*
862	* Remove and free all objects in the inventory of the given object.	750	* Remove and free all objects in the inventory of the given object.
863	* object.c ?	751	* object.c ?
864	*/	752	*/
865	void	753	void
866	object::destroy_inv (bool drop_to_ground)	754	object::destroy_inv (bool drop_to_ground)
867	{	755	{
		756	// need to check first, because the checks below might segfault
		757	// as we might be on an invalid mapspace and crossfire code
		758	// is too buggy to ensure that the inventory is empty.
		759	// corollary: if you create arrows etc. with stuff in tis inventory,
		760	// cf will crash below with off-map x and y
868	if (!inv)	761	if (!inv)
869	return;	762	return;
870		763
871	/* Only if the space blocks everything do we not process -	764	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects	765	* if some form of movement is allowed, let objects
873	* drop on that space.	766	* drop on that space.
874	*/	767	*/
875	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	768	if (!drop_to_ground
		769	\|\| !map
		770	\|\| map->in_memory != MAP_IN_MEMORY
		771	\|\| ms ().move_block == MOVE_ALL)
876	{	772	{
877	while (inv)	773	while (inv)
878	{	774	{
879	inv->destroy_inv (drop_to_ground);	775	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();	776	inv->destroy ();
…		…
891	\|\| op->type == RUNE	787	\|\| op->type == RUNE
892	\|\| op->type == TRAP	788	\|\| op->type == TRAP
893	\|\| op->flag [FLAG_IS_A_TEMPLATE])	789	\|\| op->flag [FLAG_IS_A_TEMPLATE])
894	op->destroy ();	790	op->destroy ();
895	else	791	else
896	{	792	map->insert (op, x, y);
897	op->remove ();
898	op->x = x;
899	op->y = y;
900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901	}	793	}
		794	}
		795	}
		796
		797	object *object::create ()
		798	{
		799	object *op = new object;
		800	op->link ();
		801	return op;
		802	}
		803
		804	void
		805	object::do_destroy ()
		806	{
		807	if (flag [FLAG_IS_LINKED])
		808	remove_button_link (this);
		809
		810	if (flag [FLAG_FRIENDLY])
		811	remove_friendly_object (this);
		812
		813	if (!flag [FLAG_REMOVED])
		814	remove ();
		815
		816	if (flag [FLAG_FREED])
		817	return;
		818
		819	set_speed (0);
		820
		821	flag [FLAG_FREED] = 1;
		822
		823	attachable::do_destroy ();
		824
		825	destroy_inv (true);
		826	unlink ();
		827
		828	// hack to ensure that freed objects still have a valid map
		829	{
		830	static maptile *freed_map; // freed objects are moved here to avoid crashes
		831
		832	if (!freed_map)
		833	{
		834	freed_map = new maptile;
		835
		836	freed_map->name = "/internal/freed_objects_map";
		837	freed_map->width = 3;
		838	freed_map->height = 3;
		839
		840	freed_map->alloc ();
		841	freed_map->in_memory = MAP_IN_MEMORY;
902	}	842	}
		843
		844	map = freed_map;
		845	x = 1;
		846	y = 1;
		847	}
		848
		849	head = 0;
		850
		851	if (more)
903	}	852	{
		853	more->destroy ();
		854	more = 0;
		855	}
		856
		857	// clear those pointers that likely might have circular references to us
		858	owner = 0;
		859	enemy = 0;
		860	attacked_by = 0;
904	}	861	}
905		862
906	void	863	void
907	object::destroy (bool destroy_inventory)	864	object::destroy (bool destroy_inventory)
908	{	865	{
909	if (destroyed ())	866	if (destroyed ())
910	return;	867	return;
911		868
912	if (more)
913	{
914	//TODO: non-head objects must not have inventory
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918
919	if (destroy_inventory)	869	if (destroy_inventory)
920	destroy_inv (true);	870	destroy_inv (false);
921		871
922	attachable::destroy ();	872	attachable::destroy ();
923	}	873	}
924		874
925	/*	875	/*
…		…
978	* to save cpu time.	928	* to save cpu time.
979	*/	929	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	930	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	931	otmp->update_stats ();
982		932
983	if (above != NULL)	933	if (above)
984	above->below = below;	934	above->below = below;
985	else	935	else
986	env->inv = below;	936	env->inv = below;
987		937
988	if (below != NULL)	938	if (below)
989	below->above = above;	939	below->above = above;
990		940
991	/* we set up values so that it could be inserted into	941	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	942	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	943	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	947	above = 0, below = 0;
998	env = 0;	948	env = 0;
999	}	949	}
1000	else if (map)	950	else if (map)
1001	{	951	{
1002	/* Re did the following section of code - it looks like it had	952	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	953	{
		954	--map->players;
		955	map->touch ();
		956	}
		957
		958	map->dirty = true;
1005		959
1006	/* link the object above us */	960	/* link the object above us */
1007	if (above)	961	if (above)
1008	above->below = below;	962	above->below = below;
1009	else	963	else
…		…
1038	if (map->in_memory == MAP_SAVING)	992	if (map->in_memory == MAP_SAVING)
1039	return;	993	return;
1040		994
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	995	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		996
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	997	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1044	{	998	{
1045	/* No point updating the players look faces if he is the object	999	/* No point updating the players look faces if he is the object
1046	* being removed.	1000	* being removed.
1047	*/	1001	*/
1048		1002
…		…
1060		1014
1061	if (tmp->contr->ns)	1015	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();	1016	tmp->contr->ns->floorbox_update ();
1063	}	1017	}
1064		1018
1065	/* See if player moving off should effect something */	1019	/* See if object moving off should effect something */
1066	if (check_walk_off	1020	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1021	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1022	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1023	{
1070	move_apply (tmp, this, 0);	1024	move_apply (tmp, this, 0);
…		…
1072	if (destroyed ())	1026	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1027	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1028	}
1075		1029
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1030	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077		1031	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078	if (tmp->above == tmp)	1032	if (tmp->above == tmp)
1079	tmp->above = 0;	1033	tmp->above = 0;
1080		1034
1081	last = tmp;	1035	last = tmp;
1082	}	1036	}
1083		1037
1084	/* last == NULL of there are no objects on this space */	1038	/* last == NULL if there are no objects on this space */
		1039	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1040	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1041	map->at (x, y).flags_ = 0;
1087	else	1042	else
1088	update_object (last, UP_OBJ_REMOVE);	1043	update_object (last, UP_OBJ_REMOVE);
1089		1044
1090	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1045	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1091	update_all_los (map, x, y);	1046	update_all_los (map, x, y);
…		…
1134	* job preparing multi-part monsters	1089	* job preparing multi-part monsters
1135	*/	1090	*/
1136	object *	1091	object *
1137	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1092	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1138	{	1093	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1094	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1095	{
1146	tmp->x = x + tmp->arch->clone.x;	1096	tmp->x = x + tmp->arch->clone.x;
1147	tmp->y = y + tmp->arch->clone.y;	1097	tmp->y = y + tmp->arch->clone.y;
1148	}	1098	}
1149		1099
…		…
1180	{	1130	{
1181	LOG (llevError, "Trying to insert freed object!\n");	1131	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;	1132	return NULL;
1183	}	1133	}
1184		1134
1185	if (m == NULL)	1135	if (!m)
1186	{	1136	{
1187	char *dump = dump_object (op);	1137	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1138	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1189	free (dump);	1139	free (dump);
1190	return op;	1140	return op;
…		…
1217	{	1167	{
1218	/* The part may be on a different map. */	1168	/* The part may be on a different map. */
1219		1169
1220	object *more = op->more;	1170	object *more = op->more;
1221		1171
1222	/* We really need the caller to normalize coordinates - if	1172	/* We really need the caller to normalise coordinates - if
1223	* we set the map, that doesn't work if the location is within	1173	* we set the map, that doesn't work if the location is within
1224	* a map and this is straddling an edge. So only if coordinate	1174	* a map and this is straddling an edge. So only if coordinate
1225	* is clear wrong do we normalize it.	1175	* is clear wrong do we normalise it.
1226	*/	1176	*/
1227	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1177	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228	more->map = get_map_from_coord (m, &more->x, &more->y);	1178	more->map = get_map_from_coord (m, &more->x, &more->y);
1229	else if (!more->map)	1179	else if (!more->map)
1230	{	1180	{
…		…
1254	y = op->y;	1204	y = op->y;
1255		1205
1256	/* this has to be done after we translate the coordinates.	1206	/* this has to be done after we translate the coordinates.
1257	*/	1207	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1208	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1209	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1210	if (object::can_merge (op, tmp))
1261	{	1211	{
1262	op->nrof += tmp->nrof;	1212	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1213	tmp->destroy ();
1264	}	1214	}
…		…
1291	else	1241	else
1292	{	1242	{
1293	/* If there are other objects, then */	1243	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1244	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1295	{	1245	{
1296	object *last = NULL;	1246	object *last = 0;
1297		1247
1298	/*	1248	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1249	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1250	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1251	* Generally, we want to put the new object on top. But if
…		…
1305	* once we get to them. This reduces the need to traverse over all of	1255	* once we get to them. This reduces the need to traverse over all of
1306	* them when adding another one - this saves quite a bit of cpu time	1256	* them when adding another one - this saves quite a bit of cpu time
1307	* when lots of spells are cast in one area. Currently, it is presumed	1257	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1258	* that flying non pickable objects are spell objects.
1309	*/	1259	*/
1310
1311	while (top != NULL)	1260	while (top)
1312	{	1261	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1262	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1263	floor = top;
1315		1264
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1369	op->above = GET_MAP_OB (op->map, op->x, op->y);	1318	op->above = GET_MAP_OB (op->map, op->x, op->y);
1370		1319
1371	if (op->above)	1320	if (op->above)
1372	op->above->below = op;	1321	op->above->below = op;
1373		1322
1374	op->below = NULL;	1323	op->below = 0;
1375	op->ms ().bot = op;	1324	op->ms ().bot = op;
1376	}	1325	}
1377	else	1326	else
1378	{ /* get inserted into the stack above top */	1327	{ /* get inserted into the stack above top */
1379	op->above = top->above;	1328	op->above = top->above;
…		…
1383		1332
1384	op->below = top;	1333	op->below = top;
1385	top->above = op;	1334	top->above = op;
1386	}	1335	}
1387		1336
1388	if (op->above == NULL)	1337	if (!op->above)
1389	op->ms ().top = op;	1338	op->ms ().top = op;
1390	} /* else not INS_BELOW_ORIGINATOR */	1339	} /* else not INS_BELOW_ORIGINATOR */
1391		1340
1392	if (op->type == PLAYER)	1341	if (op->type == PLAYER)
		1342	{
1393	op->contr->do_los = 1;	1343	op->contr->do_los = 1;
		1344	++op->map->players;
		1345	op->map->touch ();
		1346	}
		1347
		1348	op->map->dirty = true;
1394		1349
1395	/* If we have a floor, we know the player, if any, will be above	1350	/* If we have a floor, we know the player, if any, will be above
1396	* it, so save a few ticks and start from there.	1351	* it, so save a few ticks and start from there.
1397	*/	1352	*/
1398	if (!(flag & INS_MAP_LOAD))	1353	if (!(flag & INS_MAP_LOAD))
…		…
1404	* visible to others on this map. But update_all_los is really	1359	* visible to others on this map. But update_all_los is really
1405	* an inefficient way to do this, as it means los for all players	1360	* an inefficient way to do this, as it means los for all players
1406	* on the map will get recalculated. The players could very well	1361	* on the map will get recalculated. The players could very well
1407	* be far away from this change and not affected in any way -	1362	* be far away from this change and not affected in any way -
1408	* this should get redone to only look for players within range,	1363	* this should get redone to only look for players within range,
1409	* or just updating the P_NEED_UPDATE for spaces within this area	1364	* or just updating the P_UPTODATE for spaces within this area
1410	* of effect may be sufficient.	1365	* of effect may be sufficient.
1411	*/	1366	*/
1412	if (op->map->darkness && (op->glow_radius != 0))	1367	if (op->map->darkness && (op->glow_radius != 0))
1413	update_all_los (op->map, op->x, op->y);	1368	update_all_los (op->map, op->x, op->y);
1414		1369
…		…
1452	{	1407	{
1453	object tmp, tmp1;	1408	object tmp, tmp1;
1454		1409
1455	/* first search for itself and remove any old instances */	1410	/* first search for itself and remove any old instances */
1456		1411
1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1412	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1413	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459	tmp->destroy ();	1414	tmp->destroy ();
1460		1415
1461	tmp1 = arch_to_object (archetype::find (arch_string));	1416	tmp1 = arch_to_object (archetype::find (arch_string));
1462		1417
1463	tmp1->x = op->x;	1418	tmp1->x = op->x;
1464	tmp1->y = op->y;	1419	tmp1->y = op->y;
1465	insert_ob_in_map (tmp1, op->map, op, 0);	1420	insert_ob_in_map (tmp1, op->map, op, 0);
		1421	}
		1422
		1423	object *
		1424	object::insert_at (object where, object originator, int flags)
		1425	{
		1426	where->map->insert (this, where->x, where->y, originator, flags);
1466	}	1427	}
1467		1428
1468	/*	1429	/*
1469	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1430	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1470	* is returned contains nr objects, and the remaining parts contains	1431	* is returned contains nr objects, and the remaining parts contains
1471	* the rest (or is removed and freed if that number is 0).	1432	* the rest (or is removed and freed if that number is 0).
1472	* On failure, NULL is returned, and the reason put into the	1433	* On failure, NULL is returned, and the reason put into the
1473	* global static errmsg array.	1434	* global static errmsg array.
1474	*/	1435	*/
1475
1476	object *	1436	object *
1477	get_split_ob (object *orig_ob, uint32 nr)	1437	get_split_ob (object *orig_ob, uint32 nr)
1478	{	1438	{
1479	object *newob;	1439	object *newob;
1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1440	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1744	*	1704	*
1745	* MSW 2001-07-08: Check all objects on space, not just those below	1705	* MSW 2001-07-08: Check all objects on space, not just those below
1746	* object being inserted. insert_ob_in_map may not put new objects	1706	* object being inserted. insert_ob_in_map may not put new objects
1747	* on top.	1707	* on top.
1748	*/	1708	*/
1749
1750	int	1709	int
1751	check_move_on (object op, object originator)	1710	check_move_on (object op, object originator)
1752	{	1711	{
1753	object *tmp;	1712	object *tmp;
1754	maptile *m = op->map;	1713	maptile *m = op->map;
…		…
1781		1740
1782	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1783	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1784	*/	1743	*/
1785		1744
1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1745	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787	{	1746	{
1788	/* Trim the search when we find the first other spell effect	1747	/* Trim the search when we find the first other spell effect
1789	* this helps performance so that if a space has 50 spell objects,	1748	* this helps performance so that if a space has 50 spell objects,
1790	* we don't need to check all of them.	1749	* we don't need to check all of them.
1791	*/	1750	*/
…		…
1849	* The first matching object is returned, or NULL if none.	1808	* The first matching object is returned, or NULL if none.
1850	*/	1809	*/
1851	object *	1810	object *
1852	present_arch (const archetype at, maptile m, int x, int y)	1811	present_arch (const archetype at, maptile m, int x, int y)
1853	{	1812	{
1854	if (m == NULL \|\| out_of_map (m, x, y))	1813	if (!m \|\| out_of_map (m, x, y))
1855	{	1814	{
1856	LOG (llevError, "Present_arch called outside map.\n");	1815	LOG (llevError, "Present_arch called outside map.\n");
1857	return NULL;	1816	return NULL;
1858	}	1817	}
1859		1818
1860	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1861	if (tmp->arch == at)	1820	if (tmp->arch == at)
1862	return tmp;	1821	return tmp;
1863		1822
1864	return NULL;	1823	return NULL;
1865	}	1824	}
…		…
1876	{	1835	{
1877	LOG (llevError, "Present called outside map.\n");	1836	LOG (llevError, "Present called outside map.\n");
1878	return NULL;	1837	return NULL;
1879	}	1838	}
1880		1839
1881	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1840	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1882	if (tmp->type == type)	1841	if (tmp->type == type)
1883	return tmp;	1842	return tmp;
1884		1843
1885	return NULL;	1844	return NULL;
1886	}	1845	}
…		…
2611	}	2570	}
2612	else	2571	else
2613	item = item->env;	2572	item = item->env;
2614	}	2573	}
2615		2574
		2575
		2576	const char *
		2577	object::flag_desc (char *desc, int len) const
		2578	{
		2579	char *p = desc;
		2580	bool first = true;
		2581
		2582	*p = 0;
		2583
		2584	for (int i = 0; i < NUM_FLAGS; i++)
		2585	{
		2586	if (len <= 10) // magic constant!
		2587	{
		2588	snprintf (p, len, ",...");
		2589	break;
		2590	}
		2591
		2592	if (flag [i])
		2593	{
		2594	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2595	len -= cnt;
		2596	p += cnt;
		2597	first = false;
		2598	}
		2599	}
		2600
		2601	return desc;
		2602	}
		2603
2616	// return a suitable string describing an objetc in enough detail to find it	2604	// return a suitable string describing an object in enough detail to find it
2617	const char *	2605	const char *
2618	object::debug_desc (char *info) const	2606	object::debug_desc (char *info) const
2619	{	2607	{
		2608	char flagdesc[512];
2620	char info2[256 * 3];	2609	char info2[256 * 4];
2621	char *p = info;	2610	char *p = info;
2622		2611
2623	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2624	count,	2613	count, uuid.seq,
2625	&name,	2614	&name,
2626	title ? " " : "",	2615	title ? "\",title:" : "",
2627	title ? (const char *)title : "");	2616	title ? (const char *)title : "",
		2617	flag_desc (flagdesc, 512), type);
2628		2618
2629	if (env)	2619	if (env)
2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2631		2621
2632	if (map)	2622	if (map)
2633	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2634		2624
2635	return info;	2625	return info;
2636	}	2626	}
2637		2627
2638	const char *	2628	const char *
2639	object::debug_desc () const	2629	object::debug_desc () const
2640	{	2630	{
2641	static char info[256 * 3];	2631	static char info[256 * 4];
2642	return debug_desc (info);	2632	return debug_desc (info);
2643	}	2633	}
2644		2634

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.85 by root, Mon Dec 25 17:11:16 2006 UTC vs. Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.85 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC