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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
37	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	activevec actives;	40	activevec actives;
		41
		42	//+GPL
41		43
42	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
43	0,	45	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	46	0, 1, 1, 1, 0, -1, -1, -1,
45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
49	0,	51	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	52	-1, -1, 0, 1, 1, 1, 0, -1,
51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};	55	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	56	int freedir[SIZEOFFREE] = {
61	0,	57	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	58	1, 2, 3, 4, 5, 6, 7, 8,
63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	59	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
65	};	61	};
66		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
67	static void	70	static void
68	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
69	{	72	{
70	CALL_BEGIN (2);	73	CALL_BEGIN (2);
71	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
73	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
74	CALL_END;	77	CALL_END;
75	}	78	}
76		79
77	static void	80	static void
78	read_uuid (void)	81	read_uuid ()
79	{	82	{
80	char filename[MAX_BUF];	83	char filename[MAX_BUF];
81		84
82	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
83		86
…		…
97		100
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	102	_exit (1);
100	}	103	}
101		104
102	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	106	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
105		108
106	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
107	{	110	{
…		…
134		137
135	void	138	void
136	UUID::init ()	139	UUID::init ()
137	{	140	{
138	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) \| digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz \|= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
139	}	207	}
140		208
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	210	static bool
143	compare_ob_value_lists_one (const object wants, const object has)	211	compare_ob_value_lists_one (const object wants, const object has)
…		…
179	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
180	* check weight	248	* check weight
181	*/	249	*/
182	bool object::can_merge_slow (object ob1, object ob2)	250	bool object::can_merge_slow (object ob1, object ob2)
183	{	251	{
184	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
185	if (ob1 == ob2	253	if (ob1 == ob2
186	\|\| ob1->type != ob2->type	254	\|\| ob1->type != ob2->type
187	\|\| ob1->speed != ob2->speed
188	\|\| ob1->value != ob2->value	255	\|\| ob1->value != ob2->value
189	\|\| ob1->name != ob2->name)	256	\|\| ob1->name != ob2->name
		257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
190	return 0;	258	return 0;
191		259
192	/* Do not merge objects if nrof would overflow, assume nrof	260	/* Do not merge objects if nrof would overflow, assume nrof
193	* is always 0 .. 2*31-1 /	261	* is always 0 .. 2*31-1 /
194	if (ob1->nrof > 0x7fffffff - ob2->nrof)	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
215	\|\| ob1->magic != ob2->magic	283	\|\| ob1->magic != ob2->magic
216	\|\| ob1->slaying != ob2->slaying	284	\|\| ob1->slaying != ob2->slaying
217	\|\| ob1->skill != ob2->skill	285	\|\| ob1->skill != ob2->skill
218	\|\| ob1->value != ob2->value	286	\|\| ob1->value != ob2->value
219	\|\| ob1->animation_id != ob2->animation_id	287	\|\| ob1->animation_id != ob2->animation_id
220	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	288	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
221	\|\| ob1->client_type != ob2->client_type	289	\|\| ob1->client_type != ob2->client_type
222	\|\| ob1->materialname != ob2->materialname	290	\|\| ob1->material != ob2->material
223	\|\| ob1->lore != ob2->lore	291	\|\| ob1->lore != ob2->lore
224	\|\| ob1->subtype != ob2->subtype	292	\|\| ob1->subtype != ob2->subtype
225	\|\| ob1->move_type != ob2->move_type	293	\|\| ob1->move_type != ob2->move_type
226	\|\| ob1->move_block != ob2->move_block	294	\|\| ob1->move_block != ob2->move_block
227	\|\| ob1->move_allow != ob2->move_allow	295	\|\| ob1->move_allow != ob2->move_allow
228	\|\| ob1->move_on != ob2->move_on	296	\|\| ob1->move_on != ob2->move_on
229	\|\| ob1->move_off != ob2->move_off	297	\|\| ob1->move_off != ob2->move_off
230	\|\| ob1->move_slow != ob2->move_slow	298	\|\| ob1->move_slow != ob2->move_slow
231	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	299	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234	return 0;	302	return 0;
235		303
236	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
…		…
328	// the player inventory itself is always visible	396	// the player inventory itself is always visible
329	if (env->is_player ())	397	if (env->is_player ())
330	return env;	398	return env;
331		399
332	// else a player could have our env open	400	// else a player could have our env open
333	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
334		402
335	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	404	// even if our inv is in a player.
337	if (envest->is_on_map ())	405	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	407	if (pl->container_ () == env)
340	return pl;	408	return pl;
341	}	409	}
342	else	410	else
343	{	411	{
344	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	416	\|\| pl->container_ () == this)
349	return pl;	417	return pl;
350	}	418	}
351	}	419	}
352		420
353	return 0;	421	return 0;
…		…
431	object_freezer freezer;	499	object_freezer freezer;
432	op->write (freezer);	500	op->write (freezer);
433	return freezer.as_string ();	501	return freezer.as_string ();
434	}	502	}
435		503
436	/*	504	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
438	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.
440	*/
441	object *
442	get_nearest_part (object op, const object pl)
443	{	506	{
444	object tmp, closest;	507	return dump_object (this);
445	int last_dist, i;
446
447	if (!op->more)
448	return op;
449
450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451	tmp;
452	tmp = tmp->more)
453	if ((i = distance (tmp, pl)) < last_dist)
454	closest = tmp, last_dist = i;
455
456	return closest;
457	}	508	}
458		509
459	/*	510	/*
460	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
461	* VERRRY slow.	512	* VERRRY slow.
…		…
463	object *	514	object *
464	find_object (tag_t i)	515	find_object (tag_t i)
465	{	516	{
466	for_all_objects (op)	517	for_all_objects (op)
467	if (op->count == i)	518	if (op->count == i)
		519	return op;
		520
		521	return 0;
		522	}
		523
		524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
468	return op;	534	return op;
469		535
470	return 0;	536	return 0;
471	}	537	}
472		538
…		…
506	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	572	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
507	return;	573	return;
508	}	574	}
509		575
510	this->owner = owner;	576	this->owner = owner;
511	}
512
513	int
514	object::slottype () const
515	{
516	if (type == SKILL)
517	{
518	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
519	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
520	}
521	else
522	{
523	if (slot [body_combat].info) return slot_combat;
524	if (slot [body_range ].info) return slot_ranged;
525	}
526
527	return slot_none;
528	}
529
530	bool
531	object::change_weapon (object *ob)
532	{
533	if (current_weapon == ob)
534	return true;
535
536	if (chosen_skill)
537	chosen_skill->flag [FLAG_APPLIED] = false;
538
539	current_weapon = ob;
540	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
541
542	if (chosen_skill)
543	chosen_skill->flag [FLAG_APPLIED] = true;
544
545	update_stats ();
546
547	if (ob)
548	{
549	// now check wether any body locations became invalid, in which case
550	// we cannot apply the weapon at the moment.
551	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
552	if (slot[i].used < 0)
553	{
554	current_weapon = chosen_skill = 0;
555	update_stats ();
556
557	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "
560	"[You need to unapply some items first.]", &ob->name);
561	return false;
562	}
563
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}
566	else
567	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
568
569	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
570	{
571	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
572	&name, ob->debug_desc ());
573	return false;
574	}
575
576	return true;
577	}	577	}
578		578
579	/* Zero the key_values on op, decrementing the shared-string	579	/* Zero the key_values on op, decrementing the shared-string
580	* refcounts and freeing the links.	580	* refcounts and freeing the links.
581	*/	581	*/
…		…
634	tail = new_link;	634	tail = new_link;
635	}	635	}
636	}	636	}
637	}	637	}
638		638
639	if (speed < 0)
640	dst->speed_left -= rndm ();
641
642	dst->activate ();	639	dst->activate ();
643	}	640	}
644		641
645	void	642	void
646	object::instantiate ()	643	object::instantiate ()
647	{	644	{
648	if (!uuid.seq) // HACK	645	if (!uuid.seq) // HACK
649	uuid = UUID::gen ();	646	uuid = UUID::gen ();
650		647
		648	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		649	if (flag [FLAG_RANDOM_SPEED] && speed)
		650	speed_left = - speed - rndm (); // TODO animation
		651	else
651	speed_left = -0.1f;	652	speed_left = -1.;
		653
652	/* copy the body_info to the body_used - this is only really	654	/* copy the body_info to the body_used - this is only really
653	* need for monsters, but doesn't hurt to do it for everything.	655	* need for monsters, but doesn't hurt to do it for everything.
654	* by doing so, when a monster is created, it has good starting	656	* by doing so, when a monster is created, it has good starting
655	* values for the body_used info, so when items are created	657	* values for the body_used info, so when items are created
656	* for it, they can be properly equipped.	658	* for it, they can be properly equipped.
…		…
664	object *	666	object *
665	object::clone ()	667	object::clone ()
666	{	668	{
667	object *neu = create ();	669	object *neu = create ();
668	copy_to (neu);	670	copy_to (neu);
		671
		672	// TODO: unclean state changes, should not be done in clone AND instantiate
		673	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		674	neu->speed_left = - neu->speed - rndm (); // TODO animation
		675
669	neu->map = map; // not copied by copy_to	676	neu->map = map; // not copied by copy_to
670	return neu;	677	return neu;
671	}	678	}
672		679
673	/*	680	/*
…		…
691	* This function needs to be called whenever the speed of an object changes.	698	* This function needs to be called whenever the speed of an object changes.
692	*/	699	*/
693	void	700	void
694	object::set_speed (float speed)	701	object::set_speed (float speed)
695	{	702	{
696	if (flag [FLAG_FREED] && speed)
697	{
698	LOG (llevError, "Object %s is freed but has speed.\n", &name);
699	speed = 0;
700	}
701
702	this->speed = speed;	703	this->speed = speed;
703		704
704	if (has_active_speed ())	705	if (has_active_speed ())
705	activate ();	706	activate ();
706	else	707	else
…		…
756		757
757	if (!(m.flags_ & P_UPTODATE))	758	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	759	/* nop */;
759	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
760	{	761	{
		762	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	763	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	766	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
…		…
770	\|\| (m.move_slow \| op->move_slow) != m.move_slow	772	\|\| (m.move_slow \| op->move_slow) != m.move_slow
771	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
772	* have move_allow right now.	774	* have move_allow right now.
773	*/	775	*/
774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	m.invalidate ();	777	m.invalidate ();
		778	#else
		779	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		780	m.invalidate ();
		781	#endif
777	}	782	}
778	/* if the object is being removed, we can't make intelligent	783	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	784	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	785	* that is being removed.
781	*/	786	*/
…		…
792		797
793	object::object ()	798	object::object ()
794	{	799	{
795	SET_FLAG (this, FLAG_REMOVED);	800	SET_FLAG (this, FLAG_REMOVED);
796		801
797	expmul = 1.0;	802	//expmul = 1.0; declared const for the time being
798	face = blank_face;	803	face = blank_face;
		804	material = MATERIAL_NULL;
799	}	805	}
800		806
801	object::~object ()	807	object::~object ()
802	{	808	{
803	unlink ();	809	unlink ();
…		…
831	{	837	{
832	/* If already on active list, don't do anything */	838	/* If already on active list, don't do anything */
833	if (active)	839	if (active)
834	return;	840	return;
835		841
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	if (has_active_speed ())	842	if (has_active_speed ())
		843	{
		844	if (flag [FLAG_FREED])
		845	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		846
840	actives.insert (this);	847	actives.insert (this);
		848	}
841	}	849	}
842		850
843	void	851	void
844	object::activate_recursive ()	852	object::activate_recursive ()
845	{	853	{
…		…
1031	* the previous environment.	1039	* the previous environment.
1032	*/	1040	*/
1033	void	1041	void
1034	object::do_remove ()	1042	object::do_remove ()
1035	{	1043	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1044	if (flag [FLAG_REMOVED])
1040	return;	1045	return;
1041		1046
1042	INVOKE_OBJECT (REMOVE, this);	1047	INVOKE_OBJECT (REMOVE, this);
1043		1048
…		…
1075		1080
1076	above = 0;	1081	above = 0;
1077	below = 0;	1082	below = 0;
1078	env = 0;	1083	env = 0;
1079		1084
1080	/* NO_FIX_PLAYER is set when a great many changes are being	1085	if (pl && pl->is_player ())
1081	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.
1083	*/	1086	{
1084	if (pl)	1087	if (expect_false (pl->contr->combat_ob == this))
1085	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1086	{	1088	{
1087	pl->update_stats ();	1089	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1090	pl->contr->combat_ob = 0;
		1091	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1092	}
1088		1093
		1094	if (expect_false (pl->contr->ranged_ob == this))
		1095	{
		1096	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1097	pl->contr->ranged_ob = 0;
		1098	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1099	}
		1100
		1101	pl->contr->queue_stats_update ();
		1102
1089	if (glow_radius && pl->is_on_map ())	1103	if (expect_false (glow_radius) && pl->is_on_map ())
1090	update_all_los (pl->map, pl->x, pl->y);	1104	update_all_los (pl->map, pl->x, pl->y);
1091	}	1105	}
1092	}	1106	}
1093	else if (map)	1107	else if (map)
1094	{	1108	{
1095	map->dirty = true;	1109	map->dirty = true;
1096	mapspace &ms = this->ms ();	1110	mapspace &ms = this->ms ();
…		…
1109	close_container ();	1123	close_container ();
1110		1124
1111	--map->players;	1125	--map->players;
1112	map->touch ();	1126	map->touch ();
1113	}	1127	}
1114	else if (pl->container == this)	1128	else if (pl->container_ () == this)
1115	{	1129	{
1116	// removing a container should close it	1130	// removing a container should close it
1117	close_container ();	1131	close_container ();
1118	}	1132	}
1119		1133
…		…
1135		1149
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1150	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1151
1138	if (object *pl = ms.player ())	1152	if (object *pl = ms.player ())
1139	{	1153	{
1140	if (pl->container == this)	1154	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1155	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1156	* removed (most likely destroyed), update the player view
1143	* appropriately.	1157	* appropriately.
1144	*/	1158	*/
1145	pl->close_container ();	1159	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1163	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1164	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1165	pl->contr->ns->floorbox_update ();
1152	}	1166	}
1153		1167
		1168	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1169	for (object above, tmp = ms.bot; tmp; tmp = above)
1155	{	1170	{
		1171	above = tmp->above;
		1172
1156	/* No point updating the players look faces if he is the object	1173	/* No point updating the players look faces if he is the object
1157	* being removed.	1174	* being removed.
1158	*/	1175	*/
1159		1176
1160	/* See if object moving off should effect something */	1177	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1178	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1179	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1180	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1181	}
1170
1171	last = tmp;
1172	}
1173		1182
1174	if (affects_los ())	1183	if (affects_los ())
1175	update_all_los (map, x, y);	1184	update_all_los (map, x, y);
1176	}	1185	}
1177	}	1186	}
…		…
1221		1230
1222	object *prev = this;	1231	object *prev = this;
1223		1232
1224	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1233	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1225	{	1234	{
1226	object *op = arch_to_object (at);	1235	object *op = at->instance ();
1227		1236
1228	op->name = name;	1237	op->name = name;
1229	op->name_pl = name_pl;	1238	op->name_pl = name_pl;
1230	op->title = title;	1239	op->title = title;
1231		1240
…		…
1269	* Passing 0 for flag gives proper default values, so flag really only needs	1278	* Passing 0 for flag gives proper default values, so flag really only needs
1270	* to be set if special handling is needed.	1279	* to be set if special handling is needed.
1271	*	1280	*
1272	* Return value:	1281	* Return value:
1273	* new object if 'op' was merged with other object	1282	* new object if 'op' was merged with other object
1274	* NULL if 'op' was destroyed	1283	* NULL if there was an error (destroyed, blocked etc.)
1275	* just 'op' otherwise	1284	* just 'op' otherwise
1276	*/	1285	*/
1277	object *	1286	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1288	{
…		…
1297		1306
1298	if (object *more = op->more)	1307	if (object *more = op->more)
1299	if (!insert_ob_in_map (more, m, originator, flag))	1308	if (!insert_ob_in_map (more, m, originator, flag))
1300	return 0;	1309	return 0;
1301		1310
1302	CLEAR_FLAG (op, FLAG_REMOVED);	1311	op->flag [FLAG_REMOVED] = false;
1303		1312	op->env = 0;
1304	op->map = newmap;	1313	op->map = newmap;
		1314
1305	mapspace &ms = op->ms ();	1315	mapspace &ms = op->ms ();
1306		1316
1307	/* this has to be done after we translate the coordinates.	1317	/* this has to be done after we translate the coordinates.
1308	*/	1318	*/
1309	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331	abort ();	1341	abort ();
1332	}	1342	}
1333		1343
1334	if (!originator->is_on_map ())	1344	if (!originator->is_on_map ())
		1345	{
1335	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1346	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336	op->debug_desc (), originator->debug_desc ());	1347	op->debug_desc (), originator->debug_desc ());
		1348	abort ();
		1349	}
1337		1350
1338	op->above = originator;	1351	op->above = originator;
1339	op->below = originator->below;	1352	op->below = originator->below;
1340	originator->below = op;	1353	originator->below = op;
1341		1354
…		…
1473	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1474	* update_object().	1487	* update_object().
1475	*/	1488	*/
1476		1489
1477	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1478	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479	{	1492	{
1480	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1481	return 0;	1494	return 0;
1482		1495
1483	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
…		…
1502		1515
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (tmp->arch->archname == archname) /* same archetype */	1517	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy ();	1518	tmp->destroy ();
1506		1519
1507	object *tmp = arch_to_object (archetype::find (archname));	1520	object *tmp = archetype::find (archname)->instance ();
1508		1521
1509	tmp->x = op->x;	1522	tmp->x = op->x;
1510	tmp->y = op->y;	1523	tmp->y = op->y;
1511		1524
1512	insert_ob_in_map (tmp, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1517	{	1530	{
1518	if (where->env)	1531	if (where->env)
1519	return where->env->insert (this);	1532	return where->env->insert (this);
1520	else	1533	else
1521	return where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
		1535	}
		1536
		1537	// check whether we can put this into the map, respect max_volume, max_items
		1538	bool
		1539	object::can_drop_at (maptile m, int x, int y, object originator)
		1540	{
		1541	mapspace &ms = m->at (x, y);
		1542
		1543	int items = ms.items ();
		1544
		1545	if (!items // testing !items ensures we can drop at least one item
		1546	\|\| (items < m->max_items
		1547	&& ms.volume () < m->max_volume))
		1548	return true;
		1549
		1550	if (originator && originator->is_player ())
		1551	originator->contr->failmsg (format (
		1552	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1553	query_name ()
		1554	));
		1555
		1556	return false;
1522	}	1557	}
1523		1558
1524	/*	1559	/*
1525	* decrease(object, number) decreases a specified number from	1560	* decrease(object, number) decreases a specified number from
1526	* the amount of an object. If the amount reaches 0, the object	1561	* the amount of an object. If the amount reaches 0, the object
…		…
1666	if (op->glow_radius && is_on_map ())	1701	if (op->glow_radius && is_on_map ())
1667	{	1702	{
1668	update_stats ();	1703	update_stats ();
1669	update_all_los (map, x, y);	1704	update_all_los (map, x, y);
1670	}	1705	}
1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1706	else if (is_player ())
1672	// if this is a player's inventory, update stats	1707	// if this is a player's inventory, update stats
1673	update_stats ();	1708	contr->queue_stats_update ();
1674		1709
1675	INVOKE_OBJECT (INSERT, this);	1710	INVOKE_OBJECT (INSERT, this);
1676		1711
1677	return op;	1712	return op;
1678	}	1713	}
…		…
1698	* on top.	1733	* on top.
1699	*/	1734	*/
1700	int	1735	int
1701	check_move_on (object op, object originator)	1736	check_move_on (object op, object originator)
1702	{	1737	{
		1738	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1739	return 0;
		1740
1703	object *tmp;	1741	object *tmp;
1704	maptile *m = op->map;	1742	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1743	int x = op->x, y = op->y;
1706		1744
1707	MoveType move_on, move_slow, move_block;	1745	mapspace &ms = m->at (x, y);
1708		1746
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1747	ms.update ();
1710	return 0;
1711		1748
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1749	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1750	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1751	MoveType move_block = ms.move_block;
1715		1752
1716	/* if nothing on this space will slow op down or be applied,	1753	/* if nothing on this space will slow op down or be applied,
1717	* no need to do checking below. have to make sure move_type	1754	* no need to do checking below. have to make sure move_type
1718	* is set, as lots of objects don't have it set - we treat that	1755	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1756	* as walking.
…		…
1730	return 0;	1767	return 0;
1731		1768
1732	/* The objects have to be checked from top to bottom.	1769	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1770	* Hence, we first go to the top:
1734	*/	1771	*/
1735		1772	for (object next, tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1773	{
		1774	next = tmp->below;
1745		1775
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1776	if (tmp == op)
1749	continue; /* Can't apply yourself */	1777	continue; /* Can't apply yourself */
1750		1778
1751	/* Check to see if one of the movement types should be slowed down.	1779	/* Check to see if one of the movement types should be slowed down.
1752	* Second check makes sure that the movement types not being slowed	1780	* Second check makes sure that the movement types not being slowed
…		…
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1785	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758	{	1786	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1787	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1788	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1789	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1790	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1791
1766	if (op->is_player ())	1792	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1793	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1794	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1795	diff /= 4.0;
1770		1796
1771	op->speed_left -= diff;	1797	op->speed_left -= diff;
1772	}	1798	}
1773	}	1799	}
…		…
2174	* This basically means that if direction is 15, then it could either go	2200	* This basically means that if direction is 15, then it could either go
2175	* direction 4, 14, or 16 to get back to where we are.	2201	* direction 4, 14, or 16 to get back to where we are.
2176	* Moved from spell_util.c to object.c with the other related direction	2202	* Moved from spell_util.c to object.c with the other related direction
2177	* functions.	2203	* functions.
2178	*/	2204	*/
2179	const int reduction_dir[SIZEOFFREE][3] = {	2205	static const int reduction_dir[SIZEOFFREE][3] = {
2180	{0, 0, 0}, /* 0 */	2206	{0, 0, 0}, /* 0 */
2181	{0, 0, 0}, /* 1 */	2207	{0, 0, 0}, /* 1 */
2182	{0, 0, 0}, /* 2 */	2208	{0, 0, 0}, /* 2 */
2183	{0, 0, 0}, /* 3 */	2209	{0, 0, 0}, /* 3 */
2184	{0, 0, 0}, /* 4 */	2210	{0, 0, 0}, /* 4 */
…		…
2455	{	2481	{
2456	return map ? map->region (x, y)	2482	return map ? map->region (x, y)
2457	: region::default_region ();	2483	: region::default_region ();
2458	}	2484	}
2459		2485
2460	const materialtype_t *
2461	object::dominant_material () const
2462	{
2463	if (materialtype_t *mt = name_to_material (materialname))
2464	return mt;
2465
2466	return name_to_material (shstr_unknown);
2467	}
2468
2469	void	2486	void
2470	object::open_container (object *new_container)	2487	object::open_container (object *new_container)
2471	{	2488	{
2472	if (container == new_container)	2489	if (container == new_container)
2473	return;	2490	return;
…		…
2493	container = 0;	2510	container = 0;
2494		2511
2495	// client needs item update to make it work, client bug requires this to be separate	2512	// client needs item update to make it work, client bug requires this to be separate
2496	esrv_update_item (UPD_FLAGS, this, old_container);	2513	esrv_update_item (UPD_FLAGS, this, old_container);
2497		2514
2498	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2515	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499	play_sound (sound_find ("chest_close"));	2516	play_sound (sound_find ("chest_close"));
2500	}	2517	}
2501		2518
2502	if (new_container)	2519	if (new_container)
2503	{	2520	{
…		…
2507	// TODO: this does not seem to serve any purpose anymore?	2524	// TODO: this does not seem to serve any purpose anymore?
2508	#if 0	2525	#if 0
2509	// insert the "Close Container" object.	2526	// insert the "Close Container" object.
2510	if (archetype *closer = new_container->other_arch)	2527	if (archetype *closer = new_container->other_arch)
2511	{	2528	{
2512	object *closer = arch_to_object (new_container->other_arch);	2529	object *closer = new_container->other_arch->instance ();
2513	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2530	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514	new_container->insert (closer);	2531	new_container->insert (closer);
2515	}	2532	}
2516	#endif	2533	#endif
2517		2534
2518	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519		2536
2520	// make sure the container is available, client bug requires this to be separate	2537	// make sure the container is available, client bug requires this to be separate
2521	esrv_send_item (this, new_container);	2538	esrv_send_item (this, new_container);
2522		2539
2523	new_container->flag [FLAG_APPLIED] = true;	2540	new_container->flag [FLAG_APPLIED] = true;
…		…
2543	return splay (tmp);	2560	return splay (tmp);
2544		2561
2545	return 0;	2562	return 0;
2546	}	2563	}
2547		2564
		2565	//-GPL
		2566
		2567	void
		2568	object::force_set_timer (int duration)
		2569	{
		2570	this->duration = 1;
		2571	this->speed_left = -1.f;
		2572
		2573	this->set_speed (duration ? 1.f / duration : 0.f);
		2574	}
		2575
2548	object *	2576	object *
2549	object::force_add (shstr_tmp name, int duration)	2577	object::force_add (shstr_tmp name, int duration)
2550	{	2578	{
2551	if (object *force = force_find (name))	2579	if (object *force = force_find (name))
2552	force->destroy ();	2580	force->destroy ();
2553		2581
2554	object *force = get_archetype (FORCE_NAME);	2582	object *force = get_archetype (FORCE_NAME);
2555		2583
2556	force->slaying = name;	2584	force->slaying = name;
2557	force->stats.food = 1;	2585	force->force_set_timer (duration);
2558	force->speed_left = -1.f;
2559
2560	force->set_speed (duration ? 1.f / duration : 0.f);
2561	force->flag [FLAG_IS_USED_UP] = true;
2562	force->flag [FLAG_APPLIED] = true;	2586	force->flag [FLAG_APPLIED] = true;
2563		2587
2564	return insert (force);	2588	return insert (force);
2565	}	2589	}
2566		2590
2567	void	2591	void
2568	object::play_sound (faceidx sound)	2592	object::play_sound (faceidx sound) const
2569	{	2593	{
2570	if (!sound)	2594	if (!sound)
2571	return;	2595	return;
2572		2596
2573	if (flag [FLAG_REMOVED])	2597	if (is_on_map ())
2574	return;
2575
2576	if (env)
2577	{
2578	if (object *pl = in_player ())
2579	pl->contr->play_sound (sound);
2580	}
2581	else
2582	map->play_sound (sound, x, y);	2598	map->play_sound (sound, x, y);
		2599	else if (object *pl = in_player ())
		2600	pl->contr->play_sound (sound);
		2601	}
		2602
		2603	void
		2604	object::say_msg (const char *msg) const
		2605	{
		2606	if (is_on_map ())
		2607	map->say_msg (msg, x, y);
		2608	else if (object *pl = in_player ())
		2609	pl->contr->play_sound (sound);
2583	}	2610	}
2584		2611
2585	void	2612	void
2586	object::make_noise ()	2613	object::make_noise ()
2587	{	2614	{
…		…
2613		2640
2614	insert (force);	2641	insert (force);
2615	}	2642	}
2616	}	2643	}
2617		2644
		2645	void object::change_move_type (MoveType mt)
		2646	{
		2647	if (move_type == mt)
		2648	return;
		2649
		2650	if (is_on_map ())
		2651	{
		2652	// we are on the map, so handle move_on/off effects
		2653	remove ();
		2654	move_type = mt;
		2655	map->insert (this, x, y, this);
		2656	}
		2657	else
		2658	move_type = mt;
		2659	}
		2660

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC vs. Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC