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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 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:
…		…
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
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
…		…
691	*/	611	*/
692	if (!op->map \|\| op->map->in_memory == MAP_SAVING)	612	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
693	return;	613	return;
694		614
695	/* make sure the object is within map boundaries */	615	/* make sure the object is within map boundaries */
696	if (op->x < 0 \|\| op->x >= MAP_WIDTH (op->map) \|\| op->y < 0 \|\| op->y >= MAP_HEIGHT (op->map))	616	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
697	{	617	{
698	LOG (llevError, "update_object() called for object out of map!\n");	618	LOG (llevError, "update_object() called for object out of map!\n");
699	#ifdef MANY_CORES	619	#ifdef MANY_CORES
700	abort ();	620	abort ();
701	#endif	621	#endif
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 ();
		690	}
777		691
778	/* Remove this object from the list of used objects */	692	void
779	if (prev) prev->next = next;	693	object::activate ()
780	if (next) next->prev = prev;	694	{
		695	/* If already on active list, don't do anything */
		696	if (active)
		697	return;
781		698
782	prev = 0;	699	if (has_active_speed ())
783	next = 0;	700	actives.insert (this);
		701	}
		702
		703	void
		704	object::activate_recursive ()
		705	{
		706	activate ();
		707
		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)
		743	{
		744	op->flag [flag] = value;
		745	op->set_flag_inv (flag, value);
		746	}
		747	}
		748
		749	/*
		750	* Remove and free all objects in the inventory of the given object.
		751	* object.c ?
		752	*/
		753	void
		754	object::destroy_inv (bool drop_to_ground)
		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
		761	if (!inv)
		762	return;
		763
		764	/* Only if the space blocks everything do we not process -
		765	* if some form of movement is allowed, let objects
		766	* drop on that space.
		767	*/
		768	if (!drop_to_ground
		769	\|\| !map
		770	\|\| map->in_memory != MAP_IN_MEMORY
		771	\|\| ms ().move_block == MOVE_ALL)
		772	{
		773	while (inv)
		774	{
		775	inv->destroy_inv (drop_to_ground);
		776	inv->destroy ();
		777	}
		778	}
		779	else
		780	{ /* Put objects in inventory onto this space */
		781	while (inv)
		782	{
		783	object *op = inv;
		784
		785	if (op->flag [FLAG_STARTEQUIP]
		786	\|\| op->flag [FLAG_NO_DROP]
		787	\|\| op->type == RUNE
		788	\|\| op->type == TRAP
		789	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		790	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
		791	op->destroy ();
		792	else
		793	map->insert (op, x, y);
		794	}
		795	}
784	}	796	}
785		797
786	object *object::create ()	798	object *object::create ()
787	{	799	{
788	object *op = new object;	800	object *op = new object;
789	op->link ();	801	op->link ();
790	return op;	802	return op;
791	}	803	}
792		804
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	805	void
804	object::do_destroy ()	806	object::do_destroy ()
805	{	807	{
806	attachable::do_destroy ();
807
808	if (flag [FLAG_IS_LINKED])	808	if (flag [FLAG_IS_LINKED])
809	remove_button_link (this);	809	remove_button_link (this);
810		810
811	if (flag [FLAG_FRIENDLY])	811	if (flag [FLAG_FRIENDLY])
812	remove_friendly_object (this);	812	remove_friendly_object (this);
…		…
815	remove ();	815	remove ();
816		816
817	if (flag [FLAG_FREED])	817	if (flag [FLAG_FREED])
818	return;	818	return;
819		819
		820	set_speed (0);
		821
820	flag [FLAG_FREED] = 1;	822	flag [FLAG_FREED] = 1;
		823
		824	attachable::do_destroy ();
		825
		826	destroy_inv (true);
		827	unlink ();
821		828
822	// hack to ensure that freed objects still have a valid map	829	// hack to ensure that freed objects still have a valid map
823	{	830	{
824	static maptile *freed_map; // freed objects are moved here to avoid crashes	831	static maptile *freed_map; // freed objects are moved here to avoid crashes
825		832
…		…
829		836
830	freed_map->name = "/internal/freed_objects_map";	837	freed_map->name = "/internal/freed_objects_map";
831	freed_map->width = 3;	838	freed_map->width = 3;
832	freed_map->height = 3;	839	freed_map->height = 3;
833		840
834	freed_map->allocate ();	841	freed_map->alloc ();
		842	freed_map->in_memory = MAP_IN_MEMORY;
835	}	843	}
836		844
837	map = freed_map;	845	map = freed_map;
838	x = 1;	846	x = 1;
839	y = 1;	847	y = 1;
840	}	848	}
841		849
842	more = 0;
843	head = 0;	850	head = 0;
844	inv = 0;	851
		852	if (more)
		853	{
		854	more->destroy ();
		855	more = 0;
		856	}
845		857
846	// clear those pointers that likely might have circular references to us	858	// clear those pointers that likely might have circular references to us
847	owner = 0;	859	owner = 0;
848	enemy = 0;	860	enemy = 0;
849	attacked_by = 0;	861	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	}
860
861	/*
862	* Remove and free all objects in the inventory of the given object.
863	* object.c ?
864	*/
865	void
866	object::destroy_inv (bool drop_to_ground)
867	{
868	if (!inv)
869	return;
870
871	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects
873	* drop on that space.
874	*/
875	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
876	{
877	while (inv)
878	{
879	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();
881	}
882	}
883	else
884	{ /* Put objects in inventory onto this space */
885	while (inv)
886	{
887	object *op = inv;
888
889	if (op->flag [FLAG_STARTEQUIP]
890	\|\| op->flag [FLAG_NO_DROP]
891	\|\| op->type == RUNE
892	\|\| op->type == TRAP
893	\|\| op->flag [FLAG_IS_A_TEMPLATE])
894	op->destroy ();
895	else
896	{
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	}
902	}
903	}
904	}	862	}
905		863
906	void	864	void
907	object::destroy (bool destroy_inventory)	865	object::destroy (bool destroy_inventory)
908	{	866	{
909	if (destroyed ())	867	if (destroyed ())
910	return;	868	return;
911		869
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)	870	if (destroy_inventory)
920	destroy_inv (true);	871	destroy_inv (false);
921		872
922	attachable::destroy ();	873	attachable::destroy ();
923	}	874	}
924		875
925	/*	876	/*
…		…
978	* to save cpu time.	929	* to save cpu time.
979	*/	930	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	931	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	932	otmp->update_stats ();
982		933
983	if (above != NULL)	934	if (above)
984	above->below = below;	935	above->below = below;
985	else	936	else
986	env->inv = below;	937	env->inv = below;
987		938
988	if (below != NULL)	939	if (below)
989	below->above = above;	940	below->above = above;
990		941
991	/* we set up values so that it could be inserted into	942	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	943	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	944	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	948	above = 0, below = 0;
998	env = 0;	949	env = 0;
999	}	950	}
1000	else if (map)	951	else if (map)
1001	{	952	{
1002	/* Re did the following section of code - it looks like it had	953	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	954	{
		955	--map->players;
		956	map->touch ();
		957	}
		958
		959	map->dirty = true;
1005		960
1006	/* link the object above us */	961	/* link the object above us */
1007	if (above)	962	if (above)
1008	above->below = below;	963	above->below = below;
1009	else	964	else
…		…
1027	dump = dump_object (GET_MAP_OB (map, x, y));	982	dump = dump_object (GET_MAP_OB (map, x, y));
1028	LOG (llevError, "%s\n", dump);	983	LOG (llevError, "%s\n", dump);
1029	free (dump);	984	free (dump);
1030	}	985	}
1031		986
1032	map->at (x, y).bottom = above; /* goes on above it. */	987	map->at (x, y).bot = above; /* goes on above it. */
1033	}	988	}
1034		989
1035	above = 0;	990	above = 0;
1036	below = 0;	991	below = 0;
1037		992
1038	if (map->in_memory == MAP_SAVING)	993	if (map->in_memory == MAP_SAVING)
1039	return;	994	return;
1040		995
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	996	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		997
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	998	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1044	{	999	{
1045	/* No point updating the players look faces if he is the object	1000	/* No point updating the players look faces if he is the object
1046	* being removed.	1001	* being removed.
1047	*/	1002	*/
1048		1003
…		…
1060		1015
1061	if (tmp->contr->ns)	1016	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();	1017	tmp->contr->ns->floorbox_update ();
1063	}	1018	}
1064		1019
1065	/* See if player moving off should effect something */	1020	/* See if object moving off should effect something */
1066	if (check_walk_off	1021	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1022	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1023	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1024	{
1070	move_apply (tmp, this, 0);	1025	move_apply (tmp, this, 0);
…		…
1072	if (destroyed ())	1027	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1028	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1029	}
1075		1030
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1031	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077		1032	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078	if (tmp->above == tmp)	1033	if (tmp->above == tmp)
1079	tmp->above = 0;	1034	tmp->above = 0;
1080		1035
1081	last = tmp;	1036	last = tmp;
1082	}	1037	}
1083		1038
1084	/* last == NULL of there are no objects on this space */	1039	/* last == NULL if there are no objects on this space */
		1040	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1041	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1042	map->at (x, y).flags_ = 0;
1087	else	1043	else
1088	update_object (last, UP_OBJ_REMOVE);	1044	update_object (last, UP_OBJ_REMOVE);
1089		1045
1090	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1046	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1091	update_all_los (map, x, y);	1047	update_all_los (map, x, y);
…		…
1134	* job preparing multi-part monsters	1090	* job preparing multi-part monsters
1135	*/	1091	*/
1136	object *	1092	object *
1137	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1093	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1138	{	1094	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1095	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1096	{
1146	tmp->x = x + tmp->arch->clone.x;	1097	tmp->x = x + tmp->arch->clone.x;
1147	tmp->y = y + tmp->arch->clone.y;	1098	tmp->y = y + tmp->arch->clone.y;
1148	}	1099	}
1149		1100
…		…
1180	{	1131	{
1181	LOG (llevError, "Trying to insert freed object!\n");	1132	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;	1133	return NULL;
1183	}	1134	}
1184		1135
1185	if (m == NULL)	1136	if (!m)
1186	{	1137	{
1187	char *dump = dump_object (op);	1138	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1139	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1189	free (dump);	1140	free (dump);
1190	return op;	1141	return op;
…		…
1217	{	1168	{
1218	/* The part may be on a different map. */	1169	/* The part may be on a different map. */
1219		1170
1220	object *more = op->more;	1171	object *more = op->more;
1221		1172
1222	/* We really need the caller to normalize coordinates - if	1173	/* We really need the caller to normalise coordinates - if
1223	* we set the map, that doesn't work if the location is within	1174	* 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	1175	* a map and this is straddling an edge. So only if coordinate
1225	* is clear wrong do we normalize it.	1176	* is clear wrong do we normalise it.
1226	*/	1177	*/
1227	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1178	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228	more->map = get_map_from_coord (m, &more->x, &more->y);	1179	more->map = get_map_from_coord (m, &more->x, &more->y);
1229	else if (!more->map)	1180	else if (!more->map)
1230	{	1181	{
…		…
1254	y = op->y;	1205	y = op->y;
1255		1206
1256	/* this has to be done after we translate the coordinates.	1207	/* this has to be done after we translate the coordinates.
1257	*/	1208	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1209	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1210	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1211	if (object::can_merge (op, tmp))
1261	{	1212	{
1262	op->nrof += tmp->nrof;	1213	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1214	tmp->destroy ();
1264	}	1215	}
…		…
1281	op->below = originator->below;	1232	op->below = originator->below;
1282		1233
1283	if (op->below)	1234	if (op->below)
1284	op->below->above = op;	1235	op->below->above = op;
1285	else	1236	else
1286	op->ms ().bottom = op;	1237	op->ms ().bot = op;
1287		1238
1288	/* since below originator, no need to update top */	1239	/* since below originator, no need to update top */
1289	originator->below = op;	1240	originator->below = op;
1290	}	1241	}
1291	else	1242	else
1292	{	1243	{
1293	/* If there are other objects, then */	1244	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1245	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1295	{	1246	{
1296	object *last = NULL;	1247	object *last = 0;
1297		1248
1298	/*	1249	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1250	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1251	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1252	* 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	1256	* 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	1257	* 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	1258	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1259	* that flying non pickable objects are spell objects.
1309	*/	1260	*/
1310
1311	while (top != NULL)	1261	while (top)
1312	{	1262	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1263	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1264	floor = top;
1315		1265
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1266	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);	1319	op->above = GET_MAP_OB (op->map, op->x, op->y);
1370		1320
1371	if (op->above)	1321	if (op->above)
1372	op->above->below = op;	1322	op->above->below = op;
1373		1323
1374	op->below = NULL;	1324	op->below = 0;
1375	op->ms ().bottom = op;	1325	op->ms ().bot = op;
1376	}	1326	}
1377	else	1327	else
1378	{ /* get inserted into the stack above top */	1328	{ /* get inserted into the stack above top */
1379	op->above = top->above;	1329	op->above = top->above;
1380		1330
…		…
1383		1333
1384	op->below = top;	1334	op->below = top;
1385	top->above = op;	1335	top->above = op;
1386	}	1336	}
1387		1337
1388	if (op->above == NULL)	1338	if (!op->above)
1389	op->ms ().top = op;	1339	op->ms ().top = op;
1390	} /* else not INS_BELOW_ORIGINATOR */	1340	} /* else not INS_BELOW_ORIGINATOR */
1391		1341
1392	if (op->type == PLAYER)	1342	if (op->type == PLAYER)
		1343	{
1393	op->contr->do_los = 1;	1344	op->contr->do_los = 1;
		1345	++op->map->players;
		1346	op->map->touch ();
		1347	}
		1348
		1349	op->map->dirty = true;
1394		1350
1395	/* If we have a floor, we know the player, if any, will be above	1351	/* 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.	1352	* it, so save a few ticks and start from there.
1397	*/	1353	*/
1398	if (!(flag & INS_MAP_LOAD))	1354	if (!(flag & INS_MAP_LOAD))
…		…
1404	* visible to others on this map. But update_all_los is really	1360	* 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	1361	* 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	1362	* on the map will get recalculated. The players could very well
1407	* be far away from this change and not affected in any way -	1363	* be far away from this change and not affected in any way -
1408	* this should get redone to only look for players within range,	1364	* this should get redone to only look for players within range,
1409	* or just updating the P_NEED_UPDATE for spaces within this area	1365	* or just updating the P_UPTODATE for spaces within this area
1410	* of effect may be sufficient.	1366	* of effect may be sufficient.
1411	*/	1367	*/
1412	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1368	if (op->map->darkness && (op->glow_radius != 0))
1413	update_all_los (op->map, op->x, op->y);	1369	update_all_los (op->map, op->x, op->y);
1414		1370
1415	/* updates flags (blocked, alive, no magic, etc) for this map space */	1371	/* updates flags (blocked, alive, no magic, etc) for this map space */
1416	update_object (op, UP_OBJ_INSERT);	1372	update_object (op, UP_OBJ_INSERT);
1417		1373
…		…
1452	{	1408	{
1453	object tmp, tmp1;	1409	object tmp, tmp1;
1454		1410
1455	/* first search for itself and remove any old instances */	1411	/* first search for itself and remove any old instances */
1456		1412
1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1413	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1414	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459	tmp->destroy ();	1415	tmp->destroy ();
1460		1416
1461	tmp1 = arch_to_object (archetype::find (arch_string));	1417	tmp1 = arch_to_object (archetype::find (arch_string));
1462		1418
1463	tmp1->x = op->x;	1419	tmp1->x = op->x;
1464	tmp1->y = op->y;	1420	tmp1->y = op->y;
1465	insert_ob_in_map (tmp1, op->map, op, 0);	1421	insert_ob_in_map (tmp1, op->map, op, 0);
		1422	}
		1423
		1424	object *
		1425	object::insert_at (object where, object originator, int flags)
		1426	{
		1427	where->map->insert (this, where->x, where->y, originator, flags);
1466	}	1428	}
1467		1429
1468	/*	1430	/*
1469	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1431	* 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	1432	* is returned contains nr objects, and the remaining parts contains
1471	* the rest (or is removed and freed if that number is 0).	1433	* the rest (or is removed and freed if that number is 0).
1472	* On failure, NULL is returned, and the reason put into the	1434	* On failure, NULL is returned, and the reason put into the
1473	* global static errmsg array.	1435	* global static errmsg array.
1474	*/	1436	*/
1475
1476	object *	1437	object *
1477	get_split_ob (object *orig_ob, uint32 nr)	1438	get_split_ob (object *orig_ob, uint32 nr)
1478	{	1439	{
1479	object *newob;	1440	object *newob;
1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1441	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1703	if ((op->glow_radius != 0) && map)	1664	if ((op->glow_radius != 0) && map)
1704	{	1665	{
1705	#ifdef DEBUG_LIGHTS	1666	#ifdef DEBUG_LIGHTS
1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1667	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707	#endif /* DEBUG_LIGHTS */	1668	#endif /* DEBUG_LIGHTS */
1708	if (MAP_DARKNESS (map))	1669	if (map->darkness)
1709	update_all_los (map, x, y);	1670	update_all_los (map, x, y);
1710	}	1671	}
1711		1672
1712	/* Client has no idea of ordering so lets not bother ordering it here.	1673	/* Client has no idea of ordering so lets not bother ordering it here.
1713	* It sure simplifies this function...	1674	* It sure simplifies this function...
…		…
1744	*	1705	*
1745	* MSW 2001-07-08: Check all objects on space, not just those below	1706	* 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	1707	* object being inserted. insert_ob_in_map may not put new objects
1747	* on top.	1708	* on top.
1748	*/	1709	*/
1749
1750	int	1710	int
1751	check_move_on (object op, object originator)	1711	check_move_on (object op, object originator)
1752	{	1712	{
1753	object *tmp;	1713	object *tmp;
1754	maptile *m = op->map;	1714	maptile *m = op->map;
…		…
1781		1741
1782	/* The objects have to be checked from top to bottom.	1742	/* The objects have to be checked from top to bottom.
1783	* Hence, we first go to the top:	1743	* Hence, we first go to the top:
1784	*/	1744	*/
1785		1745
1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1746	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787	{	1747	{
1788	/* Trim the search when we find the first other spell effect	1748	/* Trim the search when we find the first other spell effect
1789	* this helps performance so that if a space has 50 spell objects,	1749	* this helps performance so that if a space has 50 spell objects,
1790	* we don't need to check all of them.	1750	* we don't need to check all of them.
1791	*/	1751	*/
…		…
1846	/*	1806	/*
1847	* present_arch(arch, map, x, y) searches for any objects with	1807	* present_arch(arch, map, x, y) searches for any objects with
1848	* a matching archetype at the given map and coordinates.	1808	* a matching archetype at the given map and coordinates.
1849	* The first matching object is returned, or NULL if none.	1809	* The first matching object is returned, or NULL if none.
1850	*/	1810	*/
1851
1852	object *	1811	object *
1853	present_arch (const archetype at, maptile m, int x, int y)	1812	present_arch (const archetype at, maptile m, int x, int y)
1854	{	1813	{
1855	object *
1856	tmp;
1857
1858	if (m == NULL \|\| out_of_map (m, x, y))	1814	if (!m \|\| out_of_map (m, x, y))
1859	{	1815	{
1860	LOG (llevError, "Present_arch called outside map.\n");	1816	LOG (llevError, "Present_arch called outside map.\n");
1861	return NULL;	1817	return NULL;
1862	}	1818	}
1863	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1819
		1820	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1864	if (tmp->arch == at)	1821	if (tmp->arch == at)
1865	return tmp;	1822	return tmp;
		1823
1866	return NULL;	1824	return NULL;
1867	}	1825	}
1868		1826
1869	/*	1827	/*
1870	* present(type, map, x, y) searches for any objects with	1828	* present(type, map, x, y) searches for any objects with
1871	* a matching type variable at the given map and coordinates.	1829	* a matching type variable at the given map and coordinates.
1872	* The first matching object is returned, or NULL if none.	1830	* The first matching object is returned, or NULL if none.
1873	*/	1831	*/
1874
1875	object *	1832	object *
1876	present (unsigned char type, maptile *m, int x, int y)	1833	present (unsigned char type, maptile *m, int x, int y)
1877	{	1834	{
1878	object *
1879	tmp;
1880
1881	if (out_of_map (m, x, y))	1835	if (out_of_map (m, x, y))
1882	{	1836	{
1883	LOG (llevError, "Present called outside map.\n");	1837	LOG (llevError, "Present called outside map.\n");
1884	return NULL;	1838	return NULL;
1885	}	1839	}
1886	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1840
		1841	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1887	if (tmp->type == type)	1842	if (tmp->type == type)
1888	return tmp;	1843	return tmp;
		1844
1889	return NULL;	1845	return NULL;
1890	}	1846	}
1891		1847
1892	/*	1848	/*
1893	* present_in_ob(type, object) searches for any objects with	1849	* present_in_ob(type, object) searches for any objects with
1894	* a matching type variable in the inventory of the given object.	1850	* a matching type variable in the inventory of the given object.
1895	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
1896	*/	1852	*/
1897
1898	object *	1853	object *
1899	present_in_ob (unsigned char type, const object *op)	1854	present_in_ob (unsigned char type, const object *op)
1900	{	1855	{
1901	object *
1902	tmp;
1903
1904	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1856	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905	if (tmp->type == type)	1857	if (tmp->type == type)
1906	return tmp;	1858	return tmp;
		1859
1907	return NULL;	1860	return NULL;
1908	}	1861	}
1909		1862
1910	/*	1863	/*
1911	* present_in_ob (type, str, object) searches for any objects with	1864	* present_in_ob (type, str, object) searches for any objects with
…		…
1922	* to be unique.	1875	* to be unique.
1923	*/	1876	*/
1924	object *	1877	object *
1925	present_in_ob_by_name (int type, const char str, const object op)	1878	present_in_ob_by_name (int type, const char str, const object op)
1926	{	1879	{
1927	object *tmp;
1928
1929	for (tmp = op->inv; tmp; tmp = tmp->below)	1880	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930	if ((type == -1 \|\| tmp->type == type) && (!strcmp (str, tmp->name)))	1881	if ((type == -1 \|\| tmp->type == type) && (!strcmp (str, tmp->name)))
1931	return tmp;	1882	return tmp;
1932		1883
1933	return 0;	1884	return 0;
1934	}	1885	}
…		…
2143		2094
2144	if ((move_type & blocked) == move_type)	2095	if ((move_type & blocked) == move_type)
2145	max = maxfree[i];	2096	max = maxfree[i];
2146	else if (mflags & P_IS_ALIVE)	2097	else if (mflags & P_IS_ALIVE)
2147	{	2098	{
2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)	2099	for (tmp = ms.bot; tmp; tmp = tmp->above)
2149	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2100	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2150	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2101	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))
2151	break;	2102	break;
2152		2103
2153	if (tmp)	2104	if (tmp)
…		…
2620	}	2571	}
2621	else	2572	else
2622	item = item->env;	2573	item = item->env;
2623	}	2574	}
2624		2575
		2576
		2577	const char *
		2578	object::flag_desc (char *desc, int len) const
		2579	{
		2580	char *p = desc;
		2581	bool first = true;
		2582
		2583	*p = 0;
		2584
		2585	for (int i = 0; i < NUM_FLAGS; i++)
		2586	{
		2587	if (len <= 10) // magic constant!
		2588	{
		2589	snprintf (p, len, ",...");
		2590	break;
		2591	}
		2592
		2593	if (flag [i])
		2594	{
		2595	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2596	len -= cnt;
		2597	p += cnt;
		2598	first = false;
		2599	}
		2600	}
		2601
		2602	return desc;
		2603	}
		2604
2625	// return a suitable string describing an objetc in enough detail to find it	2605	// return a suitable string describing an object in enough detail to find it
2626	const char *	2606	const char *
2627	object::debug_desc (char *info) const	2607	object::debug_desc (char *info) const
2628	{	2608	{
		2609	char flagdesc[512];
2629	char info2[256 * 3];	2610	char info2[256 * 4];
2630	char *p = info;	2611	char *p = info;
2631		2612
2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2633	count,	2614	count, uuid.seq,
2634	&name,	2615	&name,
2635	title ? " " : "",	2616	title ? "\",title:" : "",
2636	title ? (const char *)title : "");	2617	title ? (const char *)title : "",
		2618	flag_desc (flagdesc, 512), type);
2637		2619
2638	if (env)	2620	if (env)
2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640		2622
2641	if (map)	2623	if (map)
2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643		2625
2644	return info;	2626	return info;
2645	}	2627	}
2646		2628
2647	const char *	2629	const char *
2648	object::debug_desc () const	2630	object::debug_desc () const
2649	{	2631	{
2650	static char info[256 * 3];	2632	static char info[256 * 4];
2651	return debug_desc (info);	2633	return debug_desc (info);
2652	}	2634	}
2653		2635

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs. Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC