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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object active_objects; / List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
322	sum_weight (object *op)	324	sum_weight (object *op)
323	{	325	{
324	long sum;	326	long sum;
325	object *inv;	327	object *inv;
326		328
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
328	{	330	{
329	if (inv->inv)	331	if (inv->inv)
330	sum_weight (inv);	332	sum_weight (inv);
		333
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332	}	335	}
333		336
334	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	/*	358	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	360	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
359	*/	362	*/
360
361	char *	363	char *
362	dump_object (object *op)	364	dump_object (object *op)
363	{	365	{
364	if (!op)	366	if (!op)
365	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
366		368
367	object_freezer freezer;	369	object_freezer freezer;
368	save_object (freezer, op, 1);	370	op->write (freezer);
369	return freezer.as_string ();	371	return freezer.as_string ();
370	}	372	}
371		373
372	/*	374	/*
373	* 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
…		…
390	}	392	}
391		393
392	/*	394	/*
393	* 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.
394	*/	396	*/
395
396	object *	397	object *
397	find_object (tag_t i)	398	find_object (tag_t i)
398	{	399	{
399	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
400	if (op->count == i)	401	if (op->count == i)
401	return op;	402	return op;
402		403
403	return 0;	404	return 0;
404	}	405	}
405		406
406	/*	407	/*
407	* 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.
408	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
410	*/	411	*/
411
412	object *	412	object *
413	find_object_name (const char *str)	413	find_object_name (const char *str)
414	{	414	{
415	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
416	object *op;	416	object *op;
417		417
418	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
419	if (op->name == str_)	419	if (op->name == str_)
420	break;	420	break;
421		421
422	return op;	422	return op;
423	}	423	}
…		…
455	* refcounts and freeing the links.	455	* refcounts and freeing the links.
456	*/	456	*/
457	static void	457	static void
458	free_key_values (object *op)	458	free_key_values (object *op)
459	{	459	{
460	for (key_value *i = op->key_values; i != 0;)	460	for (key_value *i = op->key_values; i; )
461	{	461	{
462	key_value *next = i->next;	462	key_value *next = i->next;
463	delete i;	463	delete i;
464		464
465	i = next;	465	i = next;
466	}	466	}
467		467
468	op->key_values = 0;	468	op->key_values = 0;
469	}	469	}
470		470
471	/*	471	object &
472	* copy_to first frees everything allocated by the dst object,	472	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	473	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	474	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	475	bool is_removed = flag [FLAG_REMOVED];
484		476
485	(object_copy )dst = *this;	477	(object_copy )this = src;
486		478
487	if (is_freed)	479	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	480	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		481
496	/* Copy over key_values, if any. */	482	/* Copy over key_values, if any. */
497	if (key_values)	483	if (src.key_values)
498	{	484	{
499	key_value *tail = 0;	485	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	486	key_values = 0;
503		487
504	for (i = key_values; i; i = i->next)	488	for (key_value *i = src.key_values; i; i = i->next)
505	{	489	{
506	key_value *new_link = new key_value;	490	key_value *new_link = new key_value;
507		491
508	new_link->next = 0;	492	new_link->next = 0;
509	new_link->key = i->key;	493	new_link->key = i->key;
510	new_link->value = i->value;	494	new_link->value = i->value;
511		495
512	/* Try and be clever here, too. */	496	/* Try and be clever here, too. */
513	if (!dst->key_values)	497	if (!key_values)
514	{	498	{
515	dst->key_values = new_link;	499	key_values = new_link;
516	tail = new_link;	500	tail = new_link;
517	}	501	}
518	else	502	else
519	{	503	{
520	tail->next = new_link;	504	tail->next = new_link;
521	tail = new_link;	505	tail = new_link;
522	}	506	}
523	}	507	}
524	}	508	}
		509	}
		510
		511	/*
		512	* copy_to first frees everything allocated by the dst object,
		513	* and then copies the contents of itself into the second
		514	* object, allocating what needs to be allocated. Basically, any
		515	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		516	* if the first object is freed, the pointers in the new object
		517	* will point at garbage.
		518	*/
		519	void
		520	object::copy_to (object *dst)
		521	{
		522	dst = this;
		523
		524	if (speed < 0)
		525	dst->speed_left = speed_left - rndm ();
525		526
526	dst->set_speed (dst->speed);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	void
		531	object::instantiate ()
		532	{
		533	if (!uuid.seq) // HACK
		534	uuid = gen_uuid ();
		535
		536	speed_left = -0.1f;
		537	/* copy the body_info to the body_used - this is only really
		538	* need for monsters, but doesn't hurt to do it for everything.
		539	* by doing so, when a monster is created, it has good starting
		540	* values for the body_used info, so when items are created
		541	* for it, they can be properly equipped.
		542	*/
		543	memcpy (body_used, body_info, sizeof (body_used));
		544
		545	attachable::instantiate ();
527	}	546	}
528		547
529	object *	548	object *
530	object::clone ()	549	object::clone ()
531	{	550	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	608	* UP_OBJ_FACE: only the objects face has changed.
590	*/	609	*/
591	void	610	void
592	update_object (object *op, int action)	611	update_object (object *op, int action)
593	{	612	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	613	if (op == NULL)
597	{	614	{
598	/* this should never happen */	615	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	616	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	617	return;
…		…
660		677
661	if (op->more)	678	if (op->more)
662	update_object (op->more, action);	679	update_object (op->more, action);
663	}	680	}
664		681
665	object *object::first;
666
667	object::object ()	682	object::object ()
668	{	683	{
669	SET_FLAG (this, FLAG_REMOVED);	684	SET_FLAG (this, FLAG_REMOVED);
670		685
671	expmul = 1.0;	686	expmul = 1.0;
672	face = blank_face;	687	face = blank_face;
673	}	688	}
674		689
675	object::~object ()	690	object::~object ()
676	{	691	{
		692	unlink ();
		693
677	free_key_values (this);	694	free_key_values (this);
678	}	695	}
679		696
		697	static int object_count;
		698
680	void object::link ()	699	void object::link ()
681	{	700	{
682	count = ++ob_count;	701	assert (!index);//D
683	uuid = gen_uuid ();	702	uuid = gen_uuid ();
		703	count = ++object_count;
684		704
685	prev = 0;	705	refcnt_inc ();
686	next = object::first;	706	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	707	}
693		708
694	void object::unlink ()	709	void object::unlink ()
695	{	710	{
696	if (this == object::first)	711	if (!index)
697	object::first = next;	712	return;
698		713
699	/* Remove this object from the list of used objects */	714	objects.erase (this);
700	if (prev) prev->next = next;	715	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next \|\| active_prev \|\| this == active_objects;
711	}	716	}
712		717
713	void	718	void
714	object::activate ()	719	object::activate ()
715	{	720	{
716	/* If already on active list, don't do anything */	721	/* If already on active list, don't do anything */
717	if (active ())	722	if (active)
718	return;	723	return;
719		724
720	if (has_active_speed ())	725	if (has_active_speed ())
721	{	726	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	727	}
732		728
733	void	729	void
734	object::activate_recursive ()	730	object::activate_recursive ()
735	{	731	{
…		…
749	*/	745	*/
750	void	746	void
751	object::deactivate ()	747	object::deactivate ()
752	{	748	{
753	/* If not on the active list, nothing needs to be done */	749	/* If not on the active list, nothing needs to be done */
754	if (!active ())	750	if (!active)
755	return;	751	return;
756		752
757	if (active_prev == 0)	753	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	754	}
773		755
774	void	756	void
775	object::deactivate_recursive ()	757	object::deactivate_recursive ()
776	{	758	{
777	for (object *op = inv; op; op = op->below)	759	for (object *op = inv; op; op = op->below)
778	op->deactivate_recursive ();	760	op->deactivate_recursive ();
779		761
780	deactivate ();	762	deactivate ();
		763	}
		764
		765	void
		766	object::set_flag_inv (int flag, int value)
		767	{
		768	for (object *op = inv; op; op = op->below)
		769	{
		770	op->flag [flag] = value;
		771	op->set_flag_inv (flag, value);
		772	}
781	}	773	}
782		774
783	/*	775	/*
784	* Remove and free all objects in the inventory of the given object.	776	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	777	* object.c ?
…		…
800	* drop on that space.	792	* drop on that space.
801	*/	793	*/
802	if (!drop_to_ground	794	if (!drop_to_ground
803	\|\| !map	795	\|\| !map
804	\|\| map->in_memory != MAP_IN_MEMORY	796	\|\| map->in_memory != MAP_IN_MEMORY
		797	\|\| map->nodrop
805	\|\| ms ().move_block == MOVE_ALL)	798	\|\| ms ().move_block == MOVE_ALL)
806	{	799	{
807	while (inv)	800	while (inv)
808	{	801	{
809	inv->destroy_inv (drop_to_ground);	802	inv->destroy_inv (drop_to_ground);
…		…
818		811
819	if (op->flag [FLAG_STARTEQUIP]	812	if (op->flag [FLAG_STARTEQUIP]
820	\|\| op->flag [FLAG_NO_DROP]	813	\|\| op->flag [FLAG_NO_DROP]
821	\|\| op->type == RUNE	814	\|\| op->type == RUNE
822	\|\| op->type == TRAP	815	\|\| op->type == TRAP
823	\|\| op->flag [FLAG_IS_A_TEMPLATE])	816	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		817	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	818	op->destroy ();
825	else	819	else
826	map->insert (op, x, y);	820	map->insert (op, x, y);
827	}	821	}
828	}	822	}
…		…
836	}	830	}
837		831
838	void	832	void
839	object::do_destroy ()	833	object::do_destroy ()
840	{	834	{
		835	attachable::do_destroy ();
		836
841	if (flag [FLAG_IS_LINKED])	837	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	838	remove_button_link (this);
843		839
844	if (flag [FLAG_FRIENDLY])	840	if (flag [FLAG_FRIENDLY])
845	remove_friendly_object (this);	841	remove_friendly_object (this);
846		842
847	if (!flag [FLAG_REMOVED])	843	if (!flag [FLAG_REMOVED])
848	remove ();	844	remove ();
849		845
850	if (flag [FLAG_FREED])	846	destroy_inv (true);
851	return;
852		847
853	set_speed (0);	848	deactivate ();
		849	unlink ();
854		850
855	flag [FLAG_FREED] = 1;	851	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		852
862	// hack to ensure that freed objects still have a valid map	853	// hack to ensure that freed objects still have a valid map
863	{	854	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	855	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		856
…		…
890		881
891	// clear those pointers that likely might have circular references to us	882	// clear those pointers that likely might have circular references to us
892	owner = 0;	883	owner = 0;
893	enemy = 0;	884	enemy = 0;
894	attacked_by = 0;	885	attacked_by = 0;
895
896	// only relevant for players(?), but make sure of it anyways
897	contr = 0;
898	}	886	}
899		887
900	void	888	void
901	object::destroy (bool destroy_inventory)	889	object::destroy (bool destroy_inventory)
902	{	890	{
…		…
930	* This function removes the object op from the linked list of objects	918	* This function removes the object op from the linked list of objects
931	* which it is currently tied to. When this function is done, the	919	* which it is currently tied to. When this function is done, the
932	* object will have no environment. If the object previously had an	920	* object will have no environment. If the object previously had an
933	* environment, the x and y coordinates will be updated to	921	* environment, the x and y coordinates will be updated to
934	* the previous environment.	922	* the previous environment.
935	* Beware: This function is called from the editor as well!
936	*/	923	*/
937	void	924	void
938	object::remove ()	925	object::do_remove ()
939	{	926	{
940	object tmp, last = 0;	927	object tmp, last = 0;
941	object *otmp;	928	object *otmp;
942		929
943	if (QUERY_FLAG (this, FLAG_REMOVED))	930	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
986	}	973	}
987	else if (map)	974	else if (map)
988	{	975	{
989	if (type == PLAYER)	976	if (type == PLAYER)
990	{	977	{
		978	// leaving a spot always closes any open container on the ground
		979	if (container && !container->env)
		980	// this causes spurious floorbox updates, but it ensures
		981	// that the CLOSE event is being sent.
		982	close_container ();
		983
991	--map->players;	984	--map->players;
992	map->touch ();	985	map->touch ();
993	}	986	}
994		987
995	map->dirty = true;	988	map->dirty = true;
		989	mapspace &ms = this->ms ();
996		990
997	/* link the object above us */	991	/* link the object above us */
998	if (above)	992	if (above)
999	above->below = below;	993	above->below = below;
1000	else	994	else
1001	map->at (x, y).top = below; /* we were top, set new top */	995	ms.top = below; /* we were top, set new top */
1002		996
1003	/* Relink the object below us, if there is one */	997	/* Relink the object below us, if there is one */
1004	if (below)	998	if (below)
1005	below->above = above;	999	below->above = above;
1006	else	1000	else
…		…
1008	/* Nothing below, which means we need to relink map object for this space	1002	/* Nothing below, which means we need to relink map object for this space
1009	* use translated coordinates in case some oddness with map tiling is	1003	* use translated coordinates in case some oddness with map tiling is
1010	* evident	1004	* evident
1011	*/	1005	*/
1012	if (GET_MAP_OB (map, x, y) != this)	1006	if (GET_MAP_OB (map, x, y) != this)
1013	{
1014	char *dump = dump_object (this);
1015	LOG (llevError,
1016	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1007	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1017	free (dump);
1018	dump = dump_object (GET_MAP_OB (map, x, y));
1019	LOG (llevError, "%s\n", dump);
1020	free (dump);
1021	}
1022		1008
1023	map->at (x, y).bot = above; /* goes on above it. */	1009	ms.bot = above; /* goes on above it. */
1024	}	1010	}
1025		1011
1026	above = 0;	1012	above = 0;
1027	below = 0;	1013	below = 0;
1028		1014
1029	if (map->in_memory == MAP_SAVING)	1015	if (map->in_memory == MAP_SAVING)
1030	return;	1016	return;
1031		1017
1032	int check_walk_off = !flag [FLAG_NO_APPLY];	1018	int check_walk_off = !flag [FLAG_NO_APPLY];
1033		1019
1034	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1020	for (tmp = ms.bot; tmp; tmp = tmp->above)
1035	{	1021	{
1036	/* No point updating the players look faces if he is the object	1022	/* No point updating the players look faces if he is the object
1037	* being removed.	1023	* being removed.
1038	*/	1024	*/
1039		1025
…		…
1119	}	1105	}
1120		1106
1121	return 0;	1107	return 0;
1122	}	1108	}
1123		1109
		1110	void
		1111	object::expand_tail ()
		1112	{
		1113	if (more)
		1114	return;
		1115
		1116	object *prev = this;
		1117
		1118	for (archetype *at = arch->more; at; at = at->more)
		1119	{
		1120	object *op = arch_to_object (at);
		1121
		1122	op->name = name;
		1123	op->name_pl = name_pl;
		1124	op->title = title;
		1125
		1126	op->head = this;
		1127	prev->more = op;
		1128
		1129	prev = op;
		1130	}
		1131	}
		1132
1124	/*	1133	/*
1125	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1134	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1126	* job preparing multi-part monsters	1135	* job preparing multi-part monsters.
1127	*/	1136	*/
1128	object *	1137	object *
1129	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1138	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1130	{	1139	{
1131	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1140	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1158	* just 'op' otherwise	1167	* just 'op' otherwise
1159	*/	1168	*/
1160	object *	1169	object *
1161	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1170	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1162	{	1171	{
		1172	assert (!op->flag [FLAG_FREED]);
		1173
1163	object tmp, top, *floor = NULL;	1174	object tmp, top, *floor = NULL;
1164	sint16 x, y;
1165		1175
1166	if (QUERY_FLAG (op, FLAG_FREED))	1176	op->remove ();
1167	{
1168	LOG (llevError, "Trying to insert freed object!\n");
1169	return NULL;
1170	}
1171		1177
1172	if (!m)	1178	#if 0
1173	{	1179	if (!m->active != !op->active)
1174	char *dump = dump_object (op);	1180	if (m->active)
1175	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1181	op->activate_recursive ();
1176	free (dump);	1182	else
1177	return op;	1183	op->deactivate_recursive ();
1178	}	1184	#endif
1179		1185
1180	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1181	{	1187	{
1182	char *dump = dump_object (op);
1183	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1184	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1185	/* Better to catch this here, as otherwise the next use of this object	1190	/* Better to catch this here, as otherwise the next use of this object
1186	* is likely to cause a crash. Better to find out where it is getting	1191	* is likely to cause a crash. Better to find out where it is getting
1187	* improperly inserted.	1192	* improperly inserted.
1188	*/	1193	*/
1189	abort ();	1194	abort ();
1190	#endif	1195	#endif
1191	free (dump);
1192	return op;	1196	return op;
1193	}	1197	}
1194		1198
1195	if (!QUERY_FLAG (op, FLAG_REMOVED))
1196	{
1197	char *dump = dump_object (op);
1198	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1199	free (dump);
1200	return op;
1201	}
1202
1203	if (op->more)
1204	{
1205	/* The part may be on a different map. */
1206
1207	object *more = op->more;	1199	if (object *more = op->more)
1208		1200	{
1209	/* We really need the caller to normalize coordinates - if
1210	* we set the map, that doesn't work if the location is within
1211	* a map and this is straddling an edge. So only if coordinate
1212	* is clear wrong do we normalize it.
1213	*/
1214	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215	more->map = get_map_from_coord (m, &more->x, &more->y);
1216	else if (!more->map)
1217	{
1218	/* For backwards compatibility - when not dealing with tiled maps,
1219	* more->map should always point to the parent.
1220	*/
1221	more->map = m;
1222	}
1223
1224	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1201	if (!insert_ob_in_map (more, m, originator, flag))
1225	{	1202	{
1226	if (!op->head)	1203	if (!op->head)
1227	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1204	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1228		1205
1229	return 0;	1206	return 0;
…		…
1234		1211
1235	/* Ideally, the caller figures this out. However, it complicates a lot	1212	/* Ideally, the caller figures this out. However, it complicates a lot
1236	* of areas of callers (eg, anything that uses find_free_spot would now	1213	* of areas of callers (eg, anything that uses find_free_spot would now
1237	* need extra work	1214	* need extra work
1238	*/	1215	*/
1239	op->map = get_map_from_coord (m, &op->x, &op->y);	1216	if (!xy_normalise (m, op->x, op->y))
1240	x = op->x;	1217	return 0;
1241	y = op->y;	1218
		1219	op->map = m;
		1220	mapspace &ms = op->ms ();
1242		1221
1243	/* this has to be done after we translate the coordinates.	1222	/* this has to be done after we translate the coordinates.
1244	*/	1223	*/
1245	if (op->nrof && !(flag & INS_NO_MERGE))	1224	if (op->nrof && !(flag & INS_NO_MERGE))
1246	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1225	for (tmp = ms.bot; tmp; tmp = tmp->above)
1247	if (object::can_merge (op, tmp))	1226	if (object::can_merge (op, tmp))
1248	{	1227	{
1249	op->nrof += tmp->nrof;	1228	op->nrof += tmp->nrof;
1250	tmp->destroy ();	1229	tmp->destroy ();
1251	}	1230	}
…		…
1268	op->below = originator->below;	1247	op->below = originator->below;
1269		1248
1270	if (op->below)	1249	if (op->below)
1271	op->below->above = op;	1250	op->below->above = op;
1272	else	1251	else
1273	op->ms ().bot = op;	1252	ms.bot = op;
1274		1253
1275	/* since below originator, no need to update top */	1254	/* since below originator, no need to update top */
1276	originator->below = op;	1255	originator->below = op;
1277	}	1256	}
1278	else	1257	else
1279	{	1258	{
		1259	top = ms.bot;
		1260
1280	/* If there are other objects, then */	1261	/* If there are other objects, then */
1281	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1262	if ((!(flag & INS_MAP_LOAD)) && top)
1282	{	1263	{
1283	object *last = 0;	1264	object *last = 0;
1284		1265
1285	/*	1266	/*
1286	* If there are multiple objects on this space, we do some trickier handling.	1267	* If there are multiple objects on this space, we do some trickier handling.
…		…
1292	* once we get to them. This reduces the need to traverse over all of	1273	* once we get to them. This reduces the need to traverse over all of
1293	* them when adding another one - this saves quite a bit of cpu time	1274	* them when adding another one - this saves quite a bit of cpu time
1294	* when lots of spells are cast in one area. Currently, it is presumed	1275	* when lots of spells are cast in one area. Currently, it is presumed
1295	* that flying non pickable objects are spell objects.	1276	* that flying non pickable objects are spell objects.
1296	*/	1277	*/
1297	while (top)	1278	for (top = ms.bot; top; top = top->above)
1298	{	1279	{
1299	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1280	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1300	floor = top;	1281	floor = top;
1301		1282
1302	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1283	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1305	top = top->below;	1286	top = top->below;
1306	break;	1287	break;
1307	}	1288	}
1308		1289
1309	last = top;	1290	last = top;
1310	top = top->above;
1311	}	1291	}
1312		1292
1313	/* Don't want top to be NULL, so set it to the last valid object */	1293	/* Don't want top to be NULL, so set it to the last valid object */
1314	top = last;	1294	top = last;
1315		1295
…		…
1317	* looks like instead of lots of conditions here.	1297	* looks like instead of lots of conditions here.
1318	* makes things faster, and effectively the same result.	1298	* makes things faster, and effectively the same result.
1319	*/	1299	*/
1320		1300
1321	/* Have object 'fall below' other objects that block view.	1301	/* Have object 'fall below' other objects that block view.
1322	* Unless those objects are exits, type 66	1302	* Unless those objects are exits.
1323	* If INS_ON_TOP is used, don't do this processing	1303	* If INS_ON_TOP is used, don't do this processing
1324	* Need to find the object that in fact blocks view, otherwise	1304	* Need to find the object that in fact blocks view, otherwise
1325	* stacking is a bit odd.	1305	* stacking is a bit odd.
1326	*/	1306	*/
1327	if (!(flag & INS_ON_TOP) &&	1307	if (!(flag & INS_ON_TOP)
1328	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1308	&& ms.flags () & P_BLOCKSVIEW
		1309	&& (op->face && !faces [op->face].visibility))
1329	{	1310	{
1330	for (last = top; last != floor; last = last->below)	1311	for (last = top; last != floor; last = last->below)
1331	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1312	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1332	break;	1313	break;
		1314
1333	/* Check to see if we found the object that blocks view,	1315	/* Check to see if we found the object that blocks view,
1334	* and make sure we have a below pointer for it so that	1316	* and make sure we have a below pointer for it so that
1335	* we can get inserted below this one, which requires we	1317	* we can get inserted below this one, which requires we
1336	* set top to the object below us.	1318	* set top to the object below us.
1337	*/	1319	*/
…		…
1339	top = last->below;	1321	top = last->below;
1340	}	1322	}
1341	} /* If objects on this space */	1323	} /* If objects on this space */
1342		1324
1343	if (flag & INS_MAP_LOAD)	1325	if (flag & INS_MAP_LOAD)
1344	top = GET_MAP_TOP (op->map, op->x, op->y);	1326	top = ms.top;
1345		1327
1346	if (flag & INS_ABOVE_FLOOR_ONLY)	1328	if (flag & INS_ABOVE_FLOOR_ONLY)
1347	top = floor;	1329	top = floor;
1348		1330
1349	/* Top is the object that our object (op) is going to get inserted above.	1331	/* Top is the object that our object (op) is going to get inserted above.
1350	*/	1332	*/
1351		1333
1352	/* First object on this space */	1334	/* First object on this space */
1353	if (!top)	1335	if (!top)
1354	{	1336	{
1355	op->above = GET_MAP_OB (op->map, op->x, op->y);	1337	op->above = ms.bot;
1356		1338
1357	if (op->above)	1339	if (op->above)
1358	op->above->below = op;	1340	op->above->below = op;
1359		1341
1360	op->below = 0;	1342	op->below = 0;
1361	op->ms ().bot = op;	1343	ms.bot = op;
1362	}	1344	}
1363	else	1345	else
1364	{ /* get inserted into the stack above top */	1346	{ /* get inserted into the stack above top */
1365	op->above = top->above;	1347	op->above = top->above;
1366		1348
…		…
1370	op->below = top;	1352	op->below = top;
1371	top->above = op;	1353	top->above = op;
1372	}	1354	}
1373		1355
1374	if (!op->above)	1356	if (!op->above)
1375	op->ms ().top = op;	1357	ms.top = op;
1376	} /* else not INS_BELOW_ORIGINATOR */	1358	} /* else not INS_BELOW_ORIGINATOR */
1377		1359
1378	if (op->type == PLAYER)	1360	if (op->type == PLAYER)
1379	{	1361	{
1380	op->contr->do_los = 1;	1362	op->contr->do_los = 1;
…		…
1386		1368
1387	/* If we have a floor, we know the player, if any, will be above	1369	/* If we have a floor, we know the player, if any, will be above
1388	* it, so save a few ticks and start from there.	1370	* it, so save a few ticks and start from there.
1389	*/	1371	*/
1390	if (!(flag & INS_MAP_LOAD))	1372	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1373	if (object *pl = ms.player ())
1392	if (pl->contr->ns)	1374	if (pl->contr->ns)
1393	pl->contr->ns->floorbox_update ();	1375	pl->contr->ns->floorbox_update ();
1394		1376
1395	/* If this object glows, it may affect lighting conditions that are	1377	/* If this object glows, it may affect lighting conditions that are
1396	* visible to others on this map. But update_all_los is really	1378	* visible to others on this map. But update_all_los is really
…		…
1458	}	1440	}
1459		1441
1460	object *	1442	object *
1461	object::insert_at (object where, object originator, int flags)	1443	object::insert_at (object where, object originator, int flags)
1462	{	1444	{
1463	where->map->insert (this, where->x, where->y, originator, flags);	1445	return where->map->insert (this, where->x, where->y, originator, flags);
1464	}	1446	}
1465		1447
1466	/*	1448	/*
1467	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1449	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1468	* is returned contains nr objects, and the remaining parts contains	1450	* is returned contains nr objects, and the remaining parts contains
…		…
1508	* the amount of an object. If the amount reaches 0, the object	1490	* the amount of an object. If the amount reaches 0, the object
1509	* is subsequently removed and freed.	1491	* is subsequently removed and freed.
1510	*	1492	*
1511	* Return value: 'op' if something is left, NULL if the amount reached 0	1493	* Return value: 'op' if something is left, NULL if the amount reached 0
1512	*/	1494	*/
1513
1514	object *	1495	object *
1515	decrease_ob_nr (object *op, uint32 i)	1496	decrease_ob_nr (object *op, uint32 i)
1516	{	1497	{
1517	object *tmp;	1498	object *tmp;
1518		1499
…		…
1593		1574
1594	/*	1575	/*
1595	* add_weight(object, weight) adds the specified weight to an object,	1576	* add_weight(object, weight) adds the specified weight to an object,
1596	* and also updates how much the environment(s) is/are carrying.	1577	* and also updates how much the environment(s) is/are carrying.
1597	*/	1578	*/
1598
1599	void	1579	void
1600	add_weight (object *op, signed long weight)	1580	add_weight (object *op, signed long weight)
1601	{	1581	{
1602	while (op != NULL)	1582	while (op != NULL)
1603	{	1583	{
…		…
1635	* inside the object environment.	1615	* inside the object environment.
1636	*	1616	*
1637	* The function returns now pointer to inserted item, and return value can	1617	* The function returns now pointer to inserted item, and return value can
1638	* be != op, if items are merged. -Tero	1618	* be != op, if items are merged. -Tero
1639	*/	1619	*/
1640
1641	object *	1620	object *
1642	object::insert (object *op)	1621	object::insert (object *op)
1643	{	1622	{
1644	object tmp, otmp;	1623	object tmp, otmp;
1645		1624
…		…
1805	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1784	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1806	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1785	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1807	{	1786	{
1808		1787
1809	float	1788	float
1810	diff = tmp->move_slow_penalty * FABS (op->speed);	1789	diff = tmp->move_slow_penalty * fabs (op->speed);
1811		1790
1812	if (op->type == PLAYER)	1791	if (op->type == PLAYER)
1813	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1792	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1814	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1793	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1815	diff /= 4.0;	1794	diff /= 4.0;
…		…
2022	}	2001	}
2023		2002
2024	if (!index)	2003	if (!index)
2025	return -1;	2004	return -1;
2026		2005
2027	return altern[RANDOM () % index];	2006	return altern [rndm (index)];
2028	}	2007	}
2029		2008
2030	/*	2009	/*
2031	* find_first_free_spot(archetype, maptile, x, y) works like	2010	* find_first_free_spot(archetype, maptile, x, y) works like
2032	* find_free_spot(), but it will search max number of squares.	2011	* find_free_spot(), but it will search max number of squares.
…		…
2053	{	2032	{
2054	arr += begin;	2033	arr += begin;
2055	end -= begin;	2034	end -= begin;
2056		2035
2057	while (--end)	2036	while (--end)
2058	swap (arr [end], arr [RANDOM () % (end + 1)]);	2037	swap (arr [end], arr [rndm (end + 1)]);
2059	}	2038	}
2060		2039
2061	/* new function to make monster searching more efficient, and effective!	2040	/* new function to make monster searching more efficient, and effective!
2062	* This basically returns a randomized array (in the passed pointer) of	2041	* This basically returns a randomized array (in the passed pointer) of
2063	* the spaces to find monsters. In this way, it won't always look for	2042	* the spaces to find monsters. In this way, it won't always look for
…		…
2197		2176
2198	return 3;	2177	return 3;
2199	}	2178	}
2200		2179
2201	/*	2180	/*
2202	* absdir(int): Returns a number between 1 and 8, which represent
2203	* the "absolute" direction of a number (it actually takes care of
2204	* "overflow" in previous calculations of a direction).
2205	*/
2206
2207	int
2208	absdir (int d)
2209	{
2210	while (d < 1)
2211	d += 8;
2212
2213	while (d > 8)
2214	d -= 8;
2215
2216	return d;
2217	}
2218
2219	/*
2220	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2221	* between two directions (which are expected to be absolute (see absdir())	2182	* between two directions (which are expected to be absolute (see absdir())
2222	*/	2183	*/
2223
2224	int	2184	int
2225	dirdiff (int dir1, int dir2)	2185	dirdiff (int dir1, int dir2)
2226	{	2186	{
2227	int d;	2187	int d;
2228		2188
…		…
2394	insert_ob_in_ob (object_create_clone (item), dst);	2354	insert_ob_in_ob (object_create_clone (item), dst);
2395		2355
2396	return dst;	2356	return dst;
2397	}	2357	}
2398		2358
2399	/* GROS - Creates an object using a string representing its content. */
2400	/* Basically, we save the content of the string to a temp file, then call */
2401	/* load_object on it. I admit it is a highly inefficient way to make things, */
2402	/* but it was simple to make and allows reusing the load_object function. */
2403	/* Remember not to use load_object_str in a time-critical situation. */
2404	/* Also remember that multiparts objects are not supported for now. */
2405	object *
2406	load_object_str (const char *obstr)
2407	{
2408	object *op;
2409	char filename[MAX_BUF];
2410
2411	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2412
2413	FILE *tempfile = fopen (filename, "w");
2414
2415	if (tempfile == NULL)
2416	{
2417	LOG (llevError, "Error - Unable to access load object temp file\n");
2418	return NULL;
2419	}
2420
2421	fprintf (tempfile, obstr);
2422	fclose (tempfile);
2423
2424	op = object::create ();
2425
2426	object_thawer thawer (filename);
2427
2428	if (thawer)
2429	load_object (thawer, op, 0);
2430
2431	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2432	CLEAR_FLAG (op, FLAG_REMOVED);
2433
2434	return op;
2435	}
2436
2437	/* This returns the first object in who's inventory that	2359	/* This returns the first object in who's inventory that
2438	* has the same type and subtype match.	2360	* has the same type and subtype match.
2439	* returns NULL if no match.	2361	* returns NULL if no match.
2440	*/	2362	*/
2441	object *	2363	object *
…		…
2494	if (link->key == canonical_key)	2416	if (link->key == canonical_key)
2495	return link->value;	2417	return link->value;
2496		2418
2497	return 0;	2419	return 0;
2498	}	2420	}
2499
2500		2421
2501	/*	2422	/*
2502	* Updates the canonical_key in op to value.	2423	* Updates the canonical_key in op to value.
2503	*	2424	*
2504	* canonical_key is a shared string (value doesn't have to be).	2425	* canonical_key is a shared string (value doesn't have to be).
…		…
2644	{	2565	{
2645	char flagdesc[512];	2566	char flagdesc[512];
2646	char info2[256 * 4];	2567	char info2[256 * 4];
2647	char *p = info;	2568	char *p = info;
2648		2569
2649	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2570	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2650	count, uuid.seq,	2571	count, uuid.seq,
2651	&name,	2572	&name,
2652	title ? "\",title:" : "",	2573	title ? "\",title:\"" : "",
2653	title ? (const char *)title : "",	2574	title ? (const char *)title : "",
2654	flag_desc (flagdesc, 512), type);	2575	flag_desc (flagdesc, 512), type);
2655		2576
2656	if (env)	2577	if (env)
2657	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2578	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2663	}	2584	}
2664		2585
2665	const char *	2586	const char *
2666	object::debug_desc () const	2587	object::debug_desc () const
2667	{	2588	{
2668	static char info[256 * 4];	2589	static char info[3][256 * 4];
		2590	static int info_idx;
		2591
2669	return debug_desc (info);	2592	return debug_desc (info [++info_idx % 3]);
2670	}	2593	}
2671		2594
		2595	struct region *
		2596	object::region () const
		2597	{
		2598	return map ? map->region (x, y)
		2599	: region::default_region ();
		2600	}
		2601
		2602	const materialtype_t *
		2603	object::dominant_material () const
		2604	{
		2605	if (materialtype_t *mat = name_to_material (materialname))
		2606	return mat;
		2607
		2608	// omfg this is slow, this has to be temporary :)
		2609	shstr unknown ("unknown");
		2610
		2611	return name_to_material (unknown);
		2612	}
		2613
		2614	void
		2615	object::open_container (object *new_container)
		2616	{
		2617	if (container == new_container)
		2618	return;
		2619
		2620	if (object *old_container = container)
		2621	{
		2622	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2623	return;
		2624
		2625	#if 0
		2626	// remove the "Close old_container" object.
		2627	if (object *closer = old_container->inv)
		2628	if (closer->type == CLOSE_CON)
		2629	closer->destroy ();
		2630	#endif
		2631
		2632	old_container->flag [FLAG_APPLIED] = 0;
		2633	container = 0;
		2634
		2635	esrv_update_item (UPD_FLAGS, this, old_container);
		2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2637	}
		2638
		2639	if (new_container)
		2640	{
		2641	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2642	return;
		2643
		2644	// TODO: this does not seem to serve any purpose anymore?
		2645	#if 0
		2646	// insert the "Close Container" object.
		2647	if (archetype *closer = new_container->other_arch)
		2648	{
		2649	object *closer = arch_to_object (new_container->other_arch);
		2650	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2651	new_container->insert (closer);
		2652	}
		2653	#endif
		2654
		2655	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2656
		2657	new_container->flag [FLAG_APPLIED] = 1;
		2658	container = new_container;
		2659
		2660	esrv_update_item (UPD_FLAGS, this, new_container);
		2661	esrv_send_inventory (this, new_container);
		2662	}
		2663	}
		2664
		2665

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.104 by root, Tue Jan 2 21:13:21 2007 UTC vs. Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC