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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.114 by root, Sun Jan 14 22:06:05 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;
742
743	object::object ()	665	object::object ()
744	{	666	{
745	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
746		668
747	expmul = 1.0;	669	expmul = 1.0;
…		…
751	object::~object ()	673	object::~object ()
752	{	674	{
753	free_key_values (this);	675	free_key_values (this);
754	}	676	}
755		677
		678	static int object_count;
		679
756	void object::link ()	680	void object::link ()
757	{	681	{
758	count = ++ob_count;	682	assert (!index);//D
759	uuid = gen_uuid ();	683	uuid = gen_uuid ();
		684	count = ++object_count;
760		685
761	prev = 0;	686	refcnt_inc ();
762	next = object::first;	687	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	688	}
769		689
770	void object::unlink ()	690	void object::unlink ()
771	{	691	{
772	if (this == object::first)	692	assert (index);//D
773	object::first = next;	693	objects.erase (this);
		694	refcnt_dec ();
		695	}
774		696
775	/* Remove this object from the list of used objects */	697	void
776	if (prev) prev->next = next;	698	object::activate ()
777	if (next) next->prev = prev;	699	{
		700	/* If already on active list, don't do anything */
		701	if (active)
		702	return;
778		703
779	prev = 0;	704	if (has_active_speed ())
780	next = 0;	705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
		748	{
		749	op->flag [flag] = value;
		750	op->set_flag_inv (flag, value);
		751	}
		752	}
		753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	\|\| !map
		775	\|\| map->in_memory != MAP_IN_MEMORY
		776	\|\| ms ().move_block == MOVE_ALL)
		777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
		789
		790	if (op->flag [FLAG_STARTEQUIP]
		791	\|\| op->flag [FLAG_NO_DROP]
		792	\|\| op->type == RUNE
		793	\|\| op->type == TRAP
		794	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		795	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
781	}	801	}
782		802
783	object *object::create ()	803	object *object::create ()
784	{	804	{
785	object *op = new object;	805	object *op = new object;
…		…
799	remove_friendly_object (this);	819	remove_friendly_object (this);
800		820
801	if (!flag [FLAG_REMOVED])	821	if (!flag [FLAG_REMOVED])
802	remove ();	822	remove ();
803		823
804	if (flag [FLAG_FREED])	824	destroy_inv (true);
805	return;	825
		826	deactivate ();
		827	unlink ();
806		828
807	flag [FLAG_FREED] = 1;	829	flag [FLAG_FREED] = 1;
808
809	while (inv)
810	inv->destroy ();
811
812	set_speed (0);
813	unlink ();
814		830
815	// hack to ensure that freed objects still have a valid map	831	// hack to ensure that freed objects still have a valid map
816	{	832	{
817	static maptile *freed_map; // freed objects are moved here to avoid crashes	833	static maptile *freed_map; // freed objects are moved here to avoid crashes
818		834
…		…
822		838
823	freed_map->name = "/internal/freed_objects_map";	839	freed_map->name = "/internal/freed_objects_map";
824	freed_map->width = 3;	840	freed_map->width = 3;
825	freed_map->height = 3;	841	freed_map->height = 3;
826		842
827	freed_map->allocate ();	843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
828	}	845	}
829		846
830	map = freed_map;	847	map = freed_map;
831	x = 1;	848	x = 1;
832	y = 1;	849	y = 1;
…		…
842		859
843	// clear those pointers that likely might have circular references to us	860	// clear those pointers that likely might have circular references to us
844	owner = 0;	861	owner = 0;
845	enemy = 0;	862	enemy = 0;
846	attacked_by = 0;	863	attacked_by = 0;
847
848	// only relevant for players(?), but make sure of it anyways
849	contr = 0;
850	}
851
852	/*
853	* Remove and free all objects in the inventory of the given object.
854	* object.c ?
855	*/
856	void
857	object::destroy_inv (bool drop_to_ground)
858	{
859	/* Only if the space blocks everything do we not process -
860	* if some form of movement is allowed, let objects
861	* drop on that space.
862	*/
863	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
864	{
865	while (inv)
866	inv->destroy ();
867	}
868	else
869	{ /* Put objects in inventory onto this space */
870	while (inv)
871	{
872	object *op = inv;
873
874	if (op->flag [FLAG_STARTEQUIP]
875	\|\| op->flag [FLAG_NO_DROP]
876	\|\| op->type == RUNE
877	\|\| op->type == TRAP
878	\|\| op->flag [FLAG_IS_A_TEMPLATE])
879	op->destroy ();
880	else
881	{
882	op->remove ();
883	op->x = x;
884	op->y = y;
885	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
886	}
887	}
888	}
889	}	864	}
890		865
891	void	866	void
892	object::destroy (bool destroy_inventory)	867	object::destroy (bool destroy_inventory)
893	{	868	{
894	if (destroyed ())	869	if (destroyed ())
895	return;	870	return;
896		871
897	if (destroy_inventory)	872	if (destroy_inventory)
898	destroy_inv (true);	873	destroy_inv (false);
899		874
900	attachable::destroy ();	875	attachable::destroy ();
901	}	876	}
902		877
903	/*	878	/*
…		…
956	* to save cpu time.	931	* to save cpu time.
957	*/	932	*/
958	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
959	otmp->update_stats ();	934	otmp->update_stats ();
960		935
961	if (above != NULL)	936	if (above)
962	above->below = below;	937	above->below = below;
963	else	938	else
964	env->inv = below;	939	env->inv = below;
965		940
966	if (below != NULL)	941	if (below)
967	below->above = above;	942	below->above = above;
968		943
969	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
970	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
971	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
…		…
975	above = 0, below = 0;	950	above = 0, below = 0;
976	env = 0;	951	env = 0;
977	}	952	}
978	else if (map)	953	else if (map)
979	{	954	{
980	/* Re did the following section of code - it looks like it had	955	if (type == PLAYER)
981	* lots of logic for things we no longer care about
982	*/	956	{
		957	--map->players;
		958	map->touch ();
		959	}
		960
		961	map->dirty = true;
983		962
984	/* link the object above us */	963	/* link the object above us */
985	if (above)	964	if (above)
986	above->below = below;	965	above->below = below;
987	else	966	else
…		…
1016	if (map->in_memory == MAP_SAVING)	995	if (map->in_memory == MAP_SAVING)
1017	return;	996	return;
1018		997
1019	int check_walk_off = !flag [FLAG_NO_APPLY];	998	int check_walk_off = !flag [FLAG_NO_APPLY];
1020		999
1021	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1022	{	1001	{
1023	/* No point updating the players look faces if he is the object	1002	/* No point updating the players look faces if he is the object
1024	* being removed.	1003	* being removed.
1025	*/	1004	*/
1026		1005
…		…
1038		1017
1039	if (tmp->contr->ns)	1018	if (tmp->contr->ns)
1040	tmp->contr->ns->floorbox_update ();	1019	tmp->contr->ns->floorbox_update ();
1041	}	1020	}
1042		1021
1043	/* See if player moving off should effect something */	1022	/* See if object moving off should effect something */
1044	if (check_walk_off	1023	if (check_walk_off
1045	&& ((move_type & tmp->move_off)	1024	&& ((move_type & tmp->move_off)
1046	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1025	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1047	{	1026	{
1048	move_apply (tmp, this, 0);	1027	move_apply (tmp, this, 0);
…		…
1050	if (destroyed ())	1029	if (destroyed ())
1051	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1052	}	1031	}
1053		1032
1054	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1055		1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1056	if (tmp->above == tmp)	1035	if (tmp->above == tmp)
1057	tmp->above = 0;	1036	tmp->above = 0;
1058		1037
1059	last = tmp;	1038	last = tmp;
1060	}	1039	}
1061		1040
1062	/* last == NULL of there are no objects on this space */	1041	/* last == NULL if there are no objects on this space */
		1042	//TODO: this makes little sense, why only update the topmost object?
1063	if (!last)	1043	if (!last)
1064	map->at (x, y).flags_ = P_NEED_UPDATE;	1044	map->at (x, y).flags_ = 0;
1065	else	1045	else
1066	update_object (last, UP_OBJ_REMOVE);	1046	update_object (last, UP_OBJ_REMOVE);
1067		1047
1068	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1048	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1069	update_all_los (map, x, y);	1049	update_all_los (map, x, y);
…		…
1112	* job preparing multi-part monsters	1092	* job preparing multi-part monsters
1113	*/	1093	*/
1114	object *	1094	object *
1115	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1095	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1116	{	1096	{
1117	object *tmp;
1118
1119	if (op->head)
1120	op = op->head;
1121
1122	for (tmp = op; tmp; tmp = tmp->more)	1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1123	{	1098	{
1124	tmp->x = x + tmp->arch->clone.x;	1099	tmp->x = x + tmp->arch->clone.x;
1125	tmp->y = y + tmp->arch->clone.y;	1100	tmp->y = y + tmp->arch->clone.y;
1126	}	1101	}
1127		1102
…		…
1158	{	1133	{
1159	LOG (llevError, "Trying to insert freed object!\n");	1134	LOG (llevError, "Trying to insert freed object!\n");
1160	return NULL;	1135	return NULL;
1161	}	1136	}
1162		1137
1163	if (m == NULL)	1138	if (!m)
1164	{	1139	{
1165	char *dump = dump_object (op);	1140	char *dump = dump_object (op);
1166	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1167	free (dump);	1142	free (dump);
1168	return op;	1143	return op;
…		…
1195	{	1170	{
1196	/* The part may be on a different map. */	1171	/* The part may be on a different map. */
1197		1172
1198	object *more = op->more;	1173	object *more = op->more;
1199		1174
1200	/* We really need the caller to normalize coordinates - if	1175	/* We really need the caller to normalise coordinates - if
1201	* we set the map, that doesn't work if the location is within	1176	* we set the map, that doesn't work if the location is within
1202	* a map and this is straddling an edge. So only if coordinate	1177	* a map and this is straddling an edge. So only if coordinate
1203	* is clear wrong do we normalize it.	1178	* is clear wrong do we normalise it.
1204	*/	1179	*/
1205	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1206	more->map = get_map_from_coord (m, &more->x, &more->y);	1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1207	else if (!more->map)	1182	else if (!more->map)
1208	{	1183	{
…		…
1232	y = op->y;	1207	y = op->y;
1233		1208
1234	/* this has to be done after we translate the coordinates.	1209	/* this has to be done after we translate the coordinates.
1235	*/	1210	*/
1236	if (op->nrof && !(flag & INS_NO_MERGE))	1211	if (op->nrof && !(flag & INS_NO_MERGE))
1237	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1238	if (object::can_merge (op, tmp))	1213	if (object::can_merge (op, tmp))
1239	{	1214	{
1240	op->nrof += tmp->nrof;	1215	op->nrof += tmp->nrof;
1241	tmp->destroy ();	1216	tmp->destroy ();
1242	}	1217	}
…		…
1269	else	1244	else
1270	{	1245	{
1271	/* If there are other objects, then */	1246	/* If there are other objects, then */
1272	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1273	{	1248	{
1274	object *last = NULL;	1249	object *last = 0;
1275		1250
1276	/*	1251	/*
1277	* If there are multiple objects on this space, we do some trickier handling.	1252	* If there are multiple objects on this space, we do some trickier handling.
1278	* We've already dealt with merging if appropriate.	1253	* We've already dealt with merging if appropriate.
1279	* Generally, we want to put the new object on top. But if	1254	* Generally, we want to put the new object on top. But if
…		…
1283	* once we get to them. This reduces the need to traverse over all of	1258	* once we get to them. This reduces the need to traverse over all of
1284	* them when adding another one - this saves quite a bit of cpu time	1259	* them when adding another one - this saves quite a bit of cpu time
1285	* when lots of spells are cast in one area. Currently, it is presumed	1260	* when lots of spells are cast in one area. Currently, it is presumed
1286	* that flying non pickable objects are spell objects.	1261	* that flying non pickable objects are spell objects.
1287	*/	1262	*/
1288
1289	while (top != NULL)	1263	while (top)
1290	{	1264	{
1291	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1292	floor = top;	1266	floor = top;
1293		1267
1294	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1347	op->above = GET_MAP_OB (op->map, op->x, op->y);	1321	op->above = GET_MAP_OB (op->map, op->x, op->y);
1348		1322
1349	if (op->above)	1323	if (op->above)
1350	op->above->below = op;	1324	op->above->below = op;
1351		1325
1352	op->below = NULL;	1326	op->below = 0;
1353	op->ms ().bot = op;	1327	op->ms ().bot = op;
1354	}	1328	}
1355	else	1329	else
1356	{ /* get inserted into the stack above top */	1330	{ /* get inserted into the stack above top */
1357	op->above = top->above;	1331	op->above = top->above;
…		…
1361		1335
1362	op->below = top;	1336	op->below = top;
1363	top->above = op;	1337	top->above = op;
1364	}	1338	}
1365		1339
1366	if (op->above == NULL)	1340	if (!op->above)
1367	op->ms ().top = op;	1341	op->ms ().top = op;
1368	} /* else not INS_BELOW_ORIGINATOR */	1342	} /* else not INS_BELOW_ORIGINATOR */
1369		1343
1370	if (op->type == PLAYER)	1344	if (op->type == PLAYER)
		1345	{
1371	op->contr->do_los = 1;	1346	op->contr->do_los = 1;
		1347	++op->map->players;
		1348	op->map->touch ();
		1349	}
		1350
		1351	op->map->dirty = true;
1372		1352
1373	/* If we have a floor, we know the player, if any, will be above	1353	/* If we have a floor, we know the player, if any, will be above
1374	* it, so save a few ticks and start from there.	1354	* it, so save a few ticks and start from there.
1375	*/	1355	*/
1376	if (!(flag & INS_MAP_LOAD))	1356	if (!(flag & INS_MAP_LOAD))
…		…
1382	* visible to others on this map. But update_all_los is really	1362	* visible to others on this map. But update_all_los is really
1383	* an inefficient way to do this, as it means los for all players	1363	* an inefficient way to do this, as it means los for all players
1384	* on the map will get recalculated. The players could very well	1364	* on the map will get recalculated. The players could very well
1385	* be far away from this change and not affected in any way -	1365	* be far away from this change and not affected in any way -
1386	* this should get redone to only look for players within range,	1366	* this should get redone to only look for players within range,
1387	* or just updating the P_NEED_UPDATE for spaces within this area	1367	* or just updating the P_UPTODATE for spaces within this area
1388	* of effect may be sufficient.	1368	* of effect may be sufficient.
1389	*/	1369	*/
1390	if (op->map->darkness && (op->glow_radius != 0))	1370	if (op->map->darkness && (op->glow_radius != 0))
1391	update_all_los (op->map, op->x, op->y);	1371	update_all_los (op->map, op->x, op->y);
1392		1372
…		…
1430	{	1410	{
1431	object tmp, tmp1;	1411	object tmp, tmp1;
1432		1412
1433	/* first search for itself and remove any old instances */	1413	/* first search for itself and remove any old instances */
1434		1414
1435	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1436	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1437	tmp->destroy ();	1417	tmp->destroy ();
1438		1418
1439	tmp1 = arch_to_object (archetype::find (arch_string));	1419	tmp1 = arch_to_object (archetype::find (arch_string));
1440		1420
1441	tmp1->x = op->x;	1421	tmp1->x = op->x;
1442	tmp1->y = op->y;	1422	tmp1->y = op->y;
1443	insert_ob_in_map (tmp1, op->map, op, 0);	1423	insert_ob_in_map (tmp1, op->map, op, 0);
		1424	}
		1425
		1426	object *
		1427	object::insert_at (object where, object originator, int flags)
		1428	{
		1429	where->map->insert (this, where->x, where->y, originator, flags);
1444	}	1430	}
1445		1431
1446	/*	1432	/*
1447	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1448	* is returned contains nr objects, and the remaining parts contains	1434	* is returned contains nr objects, and the remaining parts contains
1449	* the rest (or is removed and freed if that number is 0).	1435	* the rest (or is removed and freed if that number is 0).
1450	* On failure, NULL is returned, and the reason put into the	1436	* On failure, NULL is returned, and the reason put into the
1451	* global static errmsg array.	1437	* global static errmsg array.
1452	*/	1438	*/
1453
1454	object *	1439	object *
1455	get_split_ob (object *orig_ob, uint32 nr)	1440	get_split_ob (object *orig_ob, uint32 nr)
1456	{	1441	{
1457	object *newob;	1442	object *newob;
1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1443	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1722	*	1707	*
1723	* MSW 2001-07-08: Check all objects on space, not just those below	1708	* MSW 2001-07-08: Check all objects on space, not just those below
1724	* object being inserted. insert_ob_in_map may not put new objects	1709	* object being inserted. insert_ob_in_map may not put new objects
1725	* on top.	1710	* on top.
1726	*/	1711	*/
1727
1728	int	1712	int
1729	check_move_on (object op, object originator)	1713	check_move_on (object op, object originator)
1730	{	1714	{
1731	object *tmp;	1715	object *tmp;
1732	maptile *m = op->map;	1716	maptile *m = op->map;
…		…
1759		1743
1760	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
1761	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
1762	*/	1746	*/
1763		1747
1764	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1765	{	1749	{
1766	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
1767	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
1768	* we don't need to check all of them.	1752	* we don't need to check all of them.
1769	*/	1753	*/
…		…
1827	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
1828	*/	1812	*/
1829	object *	1813	object *
1830	present_arch (const archetype at, maptile m, int x, int y)	1814	present_arch (const archetype at, maptile m, int x, int y)
1831	{	1815	{
1832	if (m == NULL \|\| out_of_map (m, x, y))	1816	if (!m \|\| out_of_map (m, x, y))
1833	{	1817	{
1834	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1835	return NULL;	1819	return NULL;
1836	}	1820	}
1837		1821
1838	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1839	if (tmp->arch == at)	1823	if (tmp->arch == at)
1840	return tmp;	1824	return tmp;
1841		1825
1842	return NULL;	1826	return NULL;
1843	}	1827	}
…		…
1854	{	1838	{
1855	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
1856	return NULL;	1840	return NULL;
1857	}	1841	}
1858		1842
1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1860	if (tmp->type == type)	1844	if (tmp->type == type)
1861	return tmp;	1845	return tmp;
1862		1846
1863	return NULL;	1847	return NULL;
1864	}	1848	}
…		…
2589	}	2573	}
2590	else	2574	else
2591	item = item->env;	2575	item = item->env;
2592	}	2576	}
2593		2577
		2578
		2579	const char *
		2580	object::flag_desc (char *desc, int len) const
		2581	{
		2582	char *p = desc;
		2583	bool first = true;
		2584
		2585	*p = 0;
		2586
		2587	for (int i = 0; i < NUM_FLAGS; i++)
		2588	{
		2589	if (len <= 10) // magic constant!
		2590	{
		2591	snprintf (p, len, ",...");
		2592	break;
		2593	}
		2594
		2595	if (flag [i])
		2596	{
		2597	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2598	len -= cnt;
		2599	p += cnt;
		2600	first = false;
		2601	}
		2602	}
		2603
		2604	return desc;
		2605	}
		2606
2594	// return a suitable string describing an objetc in enough detail to find it	2607	// return a suitable string describing an object in enough detail to find it
2595	const char *	2608	const char *
2596	object::debug_desc (char *info) const	2609	object::debug_desc (char *info) const
2597	{	2610	{
		2611	char flagdesc[512];
2598	char info2[256 * 3];	2612	char info2[256 * 4];
2599	char *p = info;	2613	char *p = info;
2600		2614
2601	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2602	count,	2616	count, uuid.seq,
2603	&name,	2617	&name,
2604	title ? " " : "",	2618	title ? "\",title:" : "",
2605	title ? (const char *)title : "");	2619	title ? (const char *)title : "",
		2620	flag_desc (flagdesc, 512), type);
2606		2621
2607	if (env)	2622	if (env)
2608	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2609		2624
2610	if (map)	2625	if (map)
2611	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2612		2627
2613	return info;	2628	return info;
2614	}	2629	}
2615		2630
2616	const char *	2631	const char *
2617	object::debug_desc () const	2632	object::debug_desc () const
2618	{	2633	{
2619	static char info[256 * 3];	2634	static char info[256 * 4];
2620	return debug_desc (info);	2635	return debug_desc (info);
2621	}	2636	}
2622		2637
		2638	const char *
		2639	object::debug_desc2 () const
		2640	{
		2641	static char info[256 * 4];
		2642	return debug_desc (info);
		2643	}
		2644

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs. Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC