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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.196 by root, Wed Oct 17 22:01:27 2007 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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,
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 GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
…		…
33	#include <sproto.h>	30	#include <sproto.h>
34	#include <loader.h>	31	#include <loader.h>
35		32
36	#include <bitset>	33	#include <bitset>
37		34
38	int nrofallocobjects = 0;	35	UUID UUID::cur;
39	static UUID uuid;	36	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
41		38
42	objectvec objects;	39	objectvec objects;
43	activevec actives;	40	activevec actives;
44		41
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,	42	short freearr_x[SIZEOFFREE] = {
		43	0,
		44	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,
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	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
47	};	47	};
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,	48	short freearr_y[SIZEOFFREE] = {
		49	0,
		50	-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,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	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
50	};	53	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	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,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	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
53	};	59	};
54	int freedir[SIZEOFFREE] = {	60	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	61	0,
		62	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,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 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
57	};	65	};
58		66
59	static void	67	static void
60	write_uuid (void)	68	write_uuid (uval64 skip, bool sync)
61	{	69	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	70	CALL_BEGIN (2);
63		71	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	72	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	73	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		74	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	75	}
79		76
80	static void	77	static void
81	read_uuid (void)	78	read_uuid (void)
82	{	79	{
83	char filename[MAX_BUF];	80	char filename[MAX_BUF];
84		81
85	sprintf (filename, "%s/uuid", settings.localdir);	82	sprintf (filename, "%s/uuid", settings.localdir);
86		83
		84	seq_next_save = 0;
		85
87	FILE *fp;	86	FILE *fp;
88		87
89	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
90	{	89	{
91	if (errno == ENOENT)	90	if (errno == ENOENT)
92	{	91	{
93	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	93	UUID::cur.seq = 0;
95	write_uuid ();	94	write_uuid (UUID_GAP, true);
96	return;	95	return;
97	}	96	}
98		97
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	99	_exit (1);
101	}	100	}
102		101
103	int version;	102	UUID::BUF buf;
104	unsigned long long uid;	103	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	104	fgets (buf, sizeof (buf), fp);
		105
		106	if (!UUID::cur.parse (buf))
106	{	107	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	108	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	109	_exit (1);
109	}	110	}
110		111
111	uuid.seq = uid;	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	113
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	114	write_uuid (UUID_GAP, true);
114	fclose (fp);	115	fclose (fp);
115	}	116	}
116		117
117	UUID	118	UUID
118	gen_uuid ()	119	UUID::gen ()
119	{	120	{
120	UUID uid;	121	UUID uid;
121		122
122	uid.seq = ++uuid.seq;	123	uid.seq = ++cur.seq;
123		124
124	if (!(uuid.seq & (UUID_SKIP - 1)))	125	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	126	{
		127	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		128	write_uuid (UUID_GAP, false);
		129	}
		130
126		131
127	return uid;	132	return uid;
128	}	133	}
129		134
130	void	135	void
131	init_uuid ()	136	UUID::init ()
132	{	137	{
133	read_uuid ();	138	read_uuid ();
134	}	139	}
135		140
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	142	static bool
138	compare_ob_value_lists_one (const object wants, const object has)	143	compare_ob_value_lists_one (const object wants, const object has)
139	{	144	{
140	key_value *wants_field;	145	key_value *wants_field;
141		146
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	155	key_value *has_field;
151		156
152	/* Look for a field in has with the same key. */	157	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	158	has_field = get_ob_key_link (has, wants_field->key);
154		159
155	if (has_field == NULL)	160	if (!has_field)
156	{
157	/* No field with that name. */	161	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		162
161	/* Found the matching field. */	163	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	164	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	165	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		166
168	/* If we get here, we found a match. Now for the next field in wants. */	167	/* If we get here, we found a match. Now for the next field in wants. */
169	}	168	}
170		169
171	/* If we get here, every field in wants has a matching field in has. */	170	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	171	return 1;
173	}	172	}
174		173
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	174	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	175	static bool
177	compare_ob_value_lists (const object ob1, const object ob2)	176	compare_ob_value_lists (const object ob1, const object ob2)
178	{	177	{
179	/* However, there may be fields in has which aren't partnered in wants,	178	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison twice. :(	179	* so we need to run the comparison twice. :(
181	*/	180	*/
…		…
202	\|\| ob1->speed != ob2->speed	201	\|\| ob1->speed != ob2->speed
203	\|\| ob1->value != ob2->value	202	\|\| ob1->value != ob2->value
204	\|\| ob1->name != ob2->name)	203	\|\| ob1->name != ob2->name)
205	return 0;	204	return 0;
206		205
207	//TODO: this ain't working well, use nicer and correct overflow check	206	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	209	* nrof values.
211	*/	210	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	212	return 0;
214		213
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	214	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	215	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	216	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	217	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	218	* flags lose any meaning.
220	*/	219	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		222
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		225
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
228	\|\| ob1->arch != ob2->arch
229	\|\| ob1->name != ob2->name	227	\|\| ob1->name != ob2->name
230	\|\| ob1->title != ob2->title	228	\|\| ob1->title != ob2->title
231	\|\| ob1->msg != ob2->msg	229	\|\| ob1->msg != ob2->msg
232	\|\| ob1->weight != ob2->weight	230	\|\| ob1->weight != ob2->weight
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	\|\| ob1->attacktype != ob2->attacktype	231	\|\| ob1->attacktype != ob2->attacktype
236	\|\| ob1->magic != ob2->magic	232	\|\| ob1->magic != ob2->magic
237	\|\| ob1->slaying != ob2->slaying	233	\|\| ob1->slaying != ob2->slaying
238	\|\| ob1->skill != ob2->skill	234	\|\| ob1->skill != ob2->skill
239	\|\| ob1->value != ob2->value	235	\|\| ob1->value != ob2->value
…		…
246	\|\| ob1->move_block != ob2->move_block	242	\|\| ob1->move_block != ob2->move_block
247	\|\| ob1->move_allow != ob2->move_allow	243	\|\| ob1->move_allow != ob2->move_allow
248	\|\| ob1->move_on != ob2->move_on	244	\|\| ob1->move_on != ob2->move_on
249	\|\| ob1->move_off != ob2->move_off	245	\|\| ob1->move_off != ob2->move_off
250	\|\| ob1->move_slow != ob2->move_slow	246	\|\| ob1->move_slow != ob2->move_slow
251	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	247	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		248	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		249	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	250	return 0;
253		251
		252	if ((ob1->flag ^ ob2->flag)
		253	.reset (FLAG_INV_LOCKED)
		254	.reset (FLAG_CLIENT_SENT)
		255	.reset (FLAG_REMOVED)
		256	.any ())
		257	return 0;
		258
254	/* This is really a spellbook check - really, we should	259	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	260	* not merge objects with real inventories, as splitting them
		261	* is hard.
256	*/	262	*/
257	if (ob1->inv \|\| ob2->inv)	263	if (ob1->inv \|\| ob2->inv)
258	{	264	{
259	if (!(ob1->inv && ob2->inv))	265	if (!(ob1->inv && ob2->inv))
260	return 0; /* inventories differ in length */	266	return 0; /* inventories differ in length */
261		267
262	if (ob1->inv->below \|\| ob2->inv->below)	268	if (ob1->inv->below \|\| ob2->inv->below)
263	return 0; /* more than one object in inv */	269	return 0; /* more than one object in inv */
264		270
265	if (!object::can_merge (ob1->inv, ob2->inv))	271	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0; /* inventory objexts differ */	272	return 0; /* inventory objects differ */
267		273
268	/* inventory ok - still need to check rest of this object to see	274	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	275	* if it is valid.
270	*/	276	*/
271	}	277	}
…		…
290	if (ob1->level != ob2->level)	296	if (ob1->level != ob2->level)
291	return 0;	297	return 0;
292	break;	298	break;
293	}	299	}
294		300
295	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	301	if (ob1->key_values \|\| ob2->key_values)
296	{	302	{
297	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	304	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
300	return 0;	306
301	else if (!compare_ob_value_lists (ob1, ob2))	307	if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	308	return 0;
303	}	309	}
304		310
305	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
306	{	312	{
…		…
312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314		320
315	if (k1 != k2)	321	if (k1 != k2)
316	return 0;	322	return 0;
		323
317	else if (k1 == 0)	324	if (k1 == 0)
318	return 1;	325	return 1;
		326
319	else if (!cfperl_can_merge (ob1, ob2))	327	if (!cfperl_can_merge (ob1, ob2))
320	return 0;	328	return 0;
321	}	329	}
322	}	330	}
323		331
324	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
325	return 1;	333	return 1;
326	}	334	}
327		335
		336	// adjust weight per container type ("of holding")
		337	static sint32
		338	weight_adjust (object *op, sint32 weight)
		339	{
		340	return op->type == CONTAINER
		341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		342	: weight;
		343	}
		344
328	/*	345	/*
		346	* adjust_weight(object, weight) adds the specified weight to an object,
		347	* and also updates how much the environment(s) is/are carrying.
		348	*/
		349	static void
		350	adjust_weight (object *op, sint32 weight)
		351	{
		352	while (op)
		353	{
		354	weight = weight_adjust (op, weight);
		355
		356	op->carrying += weight;
		357	op = op->env;
		358	}
		359	}
		360
		361	/*
329	* sum_weight() is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	363	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	364	* containers are carrying, and sums it up.
332	*/	365	*/
333	long	366	void
334	sum_weight (object *op)	367	object::update_weight ()
335	{	368	{
336	long sum;	369	sint32 sum = 0;
337	object *inv;
338		370
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	371	for (object *op = inv; op; op = op->below)
340	{	372	{
341	if (inv->inv)	373	if (op->inv)
342	sum_weight (inv);	374	op->update_weight ();
343		375
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	376	sum += op->total_weight ();
345	}	377	}
346		378
347	if (op->type == CONTAINER && op->stats.Str)	379	carrying = weight_adjust (this, sum);
348	sum = (sum * (100 - op->stats.Str)) / 100;
349
350	if (op->carrying != sum)
351	op->carrying = sum;
352
353	return sum;
354	}	380	}
355		381
356	/**	382	/*
357	* Return the outermost environment object for a given object.	383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
358	*/
359
360	object *
361	object_get_env_recursive (object *op)
362	{
363	while (op->env != NULL)
364	op = op->env;
365	return op;
366	}
367
368	/*
369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
370	* Some error messages.
371	* The result of the dump is stored in the static global errmsg array.
372	*/	384	*/
373	char *	385	char *
374	dump_object (object *op)	386	dump_object (object *op)
375	{	387	{
376	if (!op)	388	if (!op)
…		…
390	get_nearest_part (object op, const object pl)	402	get_nearest_part (object op, const object pl)
391	{	403	{
392	object tmp, closest;	404	object tmp, closest;
393	int last_dist, i;	405	int last_dist, i;
394		406
395	if (op->more == NULL)	407	if (!op->more)
396	return op;	408	return op;
		409
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		411	tmp;
		412	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
400	return closest;	416	return closest;
401	}	417	}
402		418
403	/*	419	/*
404	* Returns the object which has the count-variable equal to the argument.	420	* Returns the object which has the count-variable equal to the argument.
		421	* VERRRY slow.
405	*/	422	*/
406	object *	423	object *
407	find_object (tag_t i)	424	find_object (tag_t i)
408	{	425	{
409	for_all_objects (op)	426	for_all_objects (op)
…		…
427	for_all_objects (op)	444	for_all_objects (op)
428	if (op->name == str_)	445	if (op->name == str_)
429	break;	446	break;
430		447
431	return op;	448	return op;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	449	}
439		450
440	/*	451	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	453	* skill and experience objects.
…		…
447	{	458	{
448	// allow objects which own objects	459	// allow objects which own objects
449	if (owner)	460	if (owner)
450	while (owner->owner)	461	while (owner->owner)
451	owner = owner->owner;	462	owner = owner->owner;
		463
		464	if (flag [FLAG_FREED])
		465	{
		466	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		467	return;
		468	}
452		469
453	this->owner = owner;	470	this->owner = owner;
454	}	471	}
455		472
456	int	473	int
…		…
597		614
598	void	615	void
599	object::instantiate ()	616	object::instantiate ()
600	{	617	{
601	if (!uuid.seq) // HACK	618	if (!uuid.seq) // HACK
602	uuid = gen_uuid ();	619	uuid = UUID::gen ();
603		620
604	speed_left = -0.1f;	621	speed_left = -0.1f;
605	/* copy the body_info to the body_used - this is only really	622	/* copy the body_info to the body_used - this is only really
606	* need for monsters, but doesn't hurt to do it for everything.	623	* need for monsters, but doesn't hurt to do it for everything.
607	* by doing so, when a monster is created, it has good starting	624	* by doing so, when a monster is created, it has good starting
…		…
766	static int object_count;	783	static int object_count;
767		784
768	void object::link ()	785	void object::link ()
769	{	786	{
770	assert (!index);//D	787	assert (!index);//D
771	uuid = gen_uuid ();	788	uuid = UUID::gen ();
772	count = ++object_count;	789	count = ++object_count;
773		790
774	refcnt_inc ();	791	refcnt_inc ();
775	objects.insert (this);	792	objects.insert (this);
776	}	793	}
…		…
860	* if some form of movement is allowed, let objects	877	* if some form of movement is allowed, let objects
861	* drop on that space.	878	* drop on that space.
862	*/	879	*/
863	if (!drop_to_ground	880	if (!drop_to_ground
864	\|\| !map	881	\|\| !map
865	\|\| map->in_memory != MAP_IN_MEMORY	882	\|\| map->in_memory != MAP_ACTIVE
866	\|\| map->nodrop	883	\|\| map->nodrop
867	\|\| ms ().move_block == MOVE_ALL)	884	\|\| ms ().move_block == MOVE_ALL)
868	{	885	{
869	while (inv)	886	while (inv)
870	{	887	{
…		…
929		946
930	freed_map->path = "<freed objects map>";	947	freed_map->path = "<freed objects map>";
931	freed_map->name = "/internal/freed_objects_map";	948	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	949	freed_map->width = 3;
933	freed_map->height = 3;	950	freed_map->height = 3;
		951	freed_map->nodrop = 1;
934		952
935	freed_map->alloc ();	953	freed_map->alloc ();
936	freed_map->in_memory = MAP_IN_MEMORY;	954	freed_map->in_memory = MAP_ACTIVE;
937	}	955	}
938		956
939	map = freed_map;	957	map = freed_map;
940	x = 1;	958	x = 1;
941	y = 1;	959	y = 1;
…		…
970	play_sound (sound_destroy);	988	play_sound (sound_destroy);
971	else if (flag [FLAG_MONSTER])	989	else if (flag [FLAG_MONSTER])
972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	990	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973		991
974	attachable::destroy ();	992	attachable::destroy ();
975	}
976
977	/*
978	* sub_weight() recursively (outwards) subtracts a number from the
979	* weight of an object (and what is carried by it's environment(s)).
980	*/
981	void
982	sub_weight (object *op, signed long weight)
983	{
984	while (op != NULL)
985	{
986	if (op->type == CONTAINER)
987	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
988
989	op->carrying -= weight;
990	op = op->env;
991	}
992	}	993	}
993		994
994	/* op->remove ():	995	/* op->remove ():
995	* This function removes the object op from the linked list of objects	996	* This function removes the object op from the linked list of objects
996	* which it is currently tied to. When this function is done, the	997	* which it is currently tied to. When this function is done, the
…		…
1017	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
1018	* inventory.	1019	* inventory.
1019	*/	1020	*/
1020	if (env)	1021	if (env)
1021	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
1022	if (nrof)	1027	if (below)
1023	sub_weight (env, weight * nrof);	1028	below->above = above;
1024	else	1029
1025	sub_weight (env, weight + carrying);	1030	/* we set up values so that it could be inserted into
		1031	* the map, but we don't actually do that - it is up
		1032	* to the caller to decide what we want to do.
		1033	*/
		1034	map = env->map;
		1035	x = env->x;
		1036	y = env->y;
		1037	above = 0;
		1038	below = 0;
		1039	env = 0;
1026		1040
1027	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1028	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1029	* to save cpu time.	1043	* to save cpu time.
1030	*/	1044	*/
1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1032	otmp->update_stats ();	1046	otmp->update_stats ();
1033
1034	if (above)
1035	above->below = below;
1036	else
1037	env->inv = below;
1038
1039	if (below)
1040	below->above = above;
1041
1042	/* we set up values so that it could be inserted into
1043	* the map, but we don't actually do that - it is up
1044	* to the caller to decide what we want to do.
1045	*/
1046	x = env->x, y = env->y;
1047	map = env->map;
1048	above = 0, below = 0;
1049	env = 0;
1050	}	1047	}
1051	else if (map)	1048	else if (map)
1052	{	1049	{
1053	if (type == PLAYER)	1050	if (type == PLAYER)
1054	{	1051	{
…		…
1267	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1270	{	1267	{
1271	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1272	tmp->destroy ();	1269	tmp->destroy (1);
1273	}	1270	}
1274		1271
1275	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1276	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1277		1274
…		…
1457	* op is the object to insert it under: supplies x and the map.	1454	* op is the object to insert it under: supplies x and the map.
1458	*/	1455	*/
1459	void	1456	void
1460	replace_insert_ob_in_map (const char arch_string, object op)	1457	replace_insert_ob_in_map (const char arch_string, object op)
1461	{	1458	{
1462	object tmp, tmp1;
1463
1464	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1465		1460
1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1468	tmp->destroy ();	1463	tmp->destroy (1);
1469		1464
1470	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1471		1466
1472	tmp1->x = op->x;	1467	tmp->x = op->x;
1473	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1474	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1475	}	1471	}
1476		1472
1477	object *	1473	object *
1478	object::insert_at (object where, object originator, int flags)	1474	object::insert_at (object where, object originator, int flags)
1479	{	1475	{
		1476	if (where->env)
		1477	return where->env->insert (this);
		1478	else
1480	return where->map->insert (this, where->x, where->y, originator, flags);	1479	return where->map->insert (this, where->x, where->y, originator, flags);
1481	}	1480	}
1482		1481
1483	/*	1482	// find player who can see this object
1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1483	static object *
1485	* is returned contains nr objects, and the remaining parts contains	1484	visible_to (object *op)
1486	* the rest (or is removed and freed if that number is 0).
1487	* On failure, NULL is returned, and the reason put into the
1488	* global static errmsg array.
1489	*/
1490	object *
1491	get_split_ob (object *orig_ob, uint32 nr)
1492	{	1485	{
1493	object *newob;	1486	if (!op->flag [FLAG_REMOVED])
1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1495
1496	if (orig_ob->nrof < nr)
1497	{
1498	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1499	return NULL;
1500	}	1487	{
1501		1488	// see if we are in a container of sorts
1502	newob = object_create_clone (orig_ob);	1489	if (object *env = op->env)
1503
1504	if ((orig_ob->nrof -= nr) < 1)
1505	orig_ob->destroy (1);
1506	else if (!is_removed)
1507	{
1508	if (orig_ob->env != NULL)
1509	sub_weight (orig_ob->env, orig_ob->weight * nr);
1510	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1511	{
1512	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1513	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1514	return NULL;
1515	}	1490	{
1516	}	1491	// the player inventory itself is always visible
		1492	if (env->type == PLAYER)
		1493	return env;
1517		1494
1518	newob->nrof = nr;	1495	// else a player could have our env open
		1496	env = env->outer_env ();
1519		1497
		1498	// the player itself is always on a map, so we will find him here
		1499	// even if our inv is in a player.
		1500	if (env->is_on_map ())
		1501	if (object *pl = env->ms ().player ())
		1502	if (pl->container == op->env)
		1503	return pl;
		1504	}
		1505	else
		1506	{
		1507	// maybe there is a player standing on the same mapspace
		1508	if (object *pl = op->ms ().player ())
		1509	return pl;
		1510	}
		1511	}
		1512
1520	return newob;	1513	return 0;
1521	}	1514	}
1522		1515
1523	/*	1516	/*
1524	* decrease_ob_nr(object, number) decreases a specified number from	1517	* decrease(object, number) decreases a specified number from
1525	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1526	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1527	*	1520	*
1528	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1529	*/	1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	nr = min (nr, nrof);
		1527
		1528	if (!nr)
		1529	return 1;
		1530
		1531	nrof -= nr;
		1532
		1533	object *visible = visible_to (this);
		1534
		1535	if (nrof)
		1536	{
		1537	adjust_weight (env, -weight * nr); // carrying == 0
		1538
		1539	if (visible)
		1540	esrv_send_item (visible, this);
		1541
		1542	return 1;
		1543	}
		1544	else
		1545	{
		1546	if (visible)
		1547	esrv_del_item (visible->contr, count);
		1548
		1549	this->destroy (1);
		1550	return 0;
		1551	}
		1552	}
		1553
		1554	/*
		1555	* split(ob,nr) splits up ob into two parts. The part which
		1556	* is returned contains nr objects, and the remaining parts contains
		1557	* the rest (or is removed and returned if that number is 0).
		1558	* On failure, NULL is returned.
		1559	*/
1530	object *	1560	object *
1531	decrease_ob_nr (object *op, uint32 i)	1561	object::split (sint32 nr)
1532	{	1562	{
1533	object *tmp;	1563	if (nrof < nr)
1534
1535	if (i == 0) /* objects with op->nrof require this check */
1536	return op;	1564	return 0;
1537		1565	else if (nrof == nr)
1538	if (i > op->nrof)
1539	i = op->nrof;
1540
1541	if (QUERY_FLAG (op, FLAG_REMOVED))
1542	op->nrof -= i;
1543	else if (op->env)
1544	{	1566	{
1545	/* is this object in the players inventory, or sub container
1546	* therein?
1547	*/
1548	tmp = op->in_player ();
1549	/* nope. Is this a container the player has opened?
1550	* If so, set tmp to that player.
1551	* IMO, searching through all the players will mostly
1552	* likely be quicker than following op->env to the map,
1553	* and then searching the map for a player.
1554	*/
1555	if (!tmp)
1556	for_all_players (pl)
1557	if (pl->ob->container == op->env)
1558	{
1559	tmp = pl->ob;
1560	break;
1561	}
1562
1563	if (i < op->nrof)
1564	{
1565	sub_weight (op->env, op->weight * i);
1566	op->nrof -= i;
1567	if (tmp)
1568	esrv_send_item (tmp, op);
1569	}
1570	else
1571	{
1572	op->remove ();	1567	remove ();
1573	op->nrof = 0;	1568	return this;
1574	if (tmp)
1575	esrv_del_item (tmp->contr, op->count);
1576	}
1577	}	1569	}
1578	else	1570	else
1579	{	1571	{
1580	object *above = op->above;	1572	decrease (nr);
1581		1573
1582	if (i < op->nrof)	1574	object *op = object_create_clone (this);
1583	op->nrof -= i;	1575	op->nrof = nr;
1584	else
1585	{
1586	op->remove ();
1587	op->nrof = 0;
1588	}
1589
1590	/* Since we just removed op, op->above is null */
1591	for (tmp = above; tmp; tmp = tmp->above)
1592	if (tmp->type == PLAYER)
1593	{
1594	if (op->nrof)
1595	esrv_send_item (tmp, op);
1596	else
1597	esrv_del_item (tmp->contr, op->count);
1598	}
1599	}
1600
1601	if (op->nrof)
1602	return op;	1576	return op;
1603	else
1604	{
1605	op->destroy ();
1606	return 0;
1607	}
1608	}
1609
1610	/*
1611	* add_weight(object, weight) adds the specified weight to an object,
1612	* and also updates how much the environment(s) is/are carrying.
1613	*/
1614	void
1615	add_weight (object *op, signed long weight)
1616	{
1617	while (op != NULL)
1618	{
1619	if (op->type == CONTAINER)
1620	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1621
1622	op->carrying += weight;
1623	op = op->env;
1624	}	1577	}
1625	}	1578	}
1626		1579
1627	object *	1580	object *
1628	insert_ob_in_ob (object op, object where)	1581	insert_ob_in_ob (object op, object where)
…		…
1653	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1654	*/	1607	*/
1655	object *	1608	object *
1656	object::insert (object *op)	1609	object::insert (object *op)
1657	{	1610	{
1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1659	op->remove ();
1660
1661	if (op->more)	1611	if (op->more)
1662	{	1612	{
1663	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1664	return op;	1614	return op;
1665	}	1615	}
1666		1616
1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1668	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669		1620
1670	if (op->nrof)	1621	if (op->nrof)
1671	{
1672	for (object *tmp = inv; tmp; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1673	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1674	{	1624	{
1675	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1676	(client needs the original object) */	1626	(client needs the original object) */
1677	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1678	/* Weight handling gets pretty funky. Since we are adding to
1679	* tmp->nrof, we need to increase the weight.
1680	*/
1681	add_weight (this, op->weight * op->nrof);	1628	adjust_weight (this, op->total_weight ());
1682	SET_FLAG (op, FLAG_REMOVED);	1629
1683	op->destroy (); /* free the inserted object */	1630	op->destroy (1);
1684	op = tmp;	1631	op = tmp;
1685	op->remove (); /* and fix old object's links */	1632	goto inserted;
1686	CLEAR_FLAG (op, FLAG_REMOVED);
1687	break;
1688	}	1633	}
1689		1634
1690	/* I assume combined objects have no inventory	1635	op->owner = 0; // it's his/hers now. period.
1691	* We add the weight - this object could have just been removed	1636	op->map = 0;
1692	* (if it was possible to merge). calling remove_ob will subtract	1637	op->x = 0;
1693	* the weight, so we need to add it in again, since we actually do	1638	op->y = 0;
1694	* the linking below
1695	*/
1696	add_weight (this, op->weight * op->nrof);
1697	}
1698	else
1699	add_weight (this, (op->weight + op->carrying));
1700		1639
		1640	op->above = 0;
		1641	op->below = inv;
		1642	op->env = this;
		1643
		1644	if (inv)
		1645	inv->above = op;
		1646
		1647	inv = op;
		1648
		1649	op->flag [FLAG_REMOVED] = 0;
		1650
		1651	adjust_weight (this, op->total_weight ());
		1652
		1653	inserted:
		1654	/* reset the light list and los of the players on the map */
		1655	if (op->glow_radius && map && map->darkness)
		1656	update_all_los (map, x, y);
		1657
1701	if (object *otmp = this->in_player ())	1658	if (object *otmp = in_player ())
1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1703	otmp->update_stats ();	1660	otmp->update_stats ();
1704
1705	op->owner = 0; // its his/hers now. period.
1706	op->map = 0;
1707	op->env = this;
1708	op->above = 0;
1709	op->below = 0;
1710	op->x = op->y = 0;
1711
1712	/* reset the light list and los of the players on the map */
1713	if (op->glow_radius && map)
1714	{
1715	#ifdef DEBUG_LIGHTS
1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1717	#endif /* DEBUG_LIGHTS */
1718	if (map->darkness)
1719	update_all_los (map, x, y);
1720	}
1721
1722	/* Client has no idea of ordering so lets not bother ordering it here.
1723	* It sure simplifies this function...
1724	*/
1725	if (!inv)
1726	inv = op;
1727	else
1728	{
1729	op->below = inv;
1730	op->below->above = op;
1731	inv = op;
1732	}
1733		1661
1734	INVOKE_OBJECT (INSERT, this);	1662	INVOKE_OBJECT (INSERT, this);
1735		1663
1736	return op;	1664	return op;
1737	}	1665	}
…		…
1952	* activate recursively a flag on an object inventory	1880	* activate recursively a flag on an object inventory
1953	*/	1881	*/
1954	void	1882	void
1955	flag_inv (object *op, int flag)	1883	flag_inv (object *op, int flag)
1956	{	1884	{
1957	if (op->inv)
1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959	{	1886	{
1960	SET_FLAG (tmp, flag);	1887	SET_FLAG (tmp, flag);
1961	flag_inv (tmp, flag);	1888	flag_inv (tmp, flag);
1962	}	1889	}
1963	}	1890	}
1964		1891
1965	/*	1892	/*
1966	* deactivate recursively a flag on an object inventory	1893	* deactivate recursively a flag on an object inventory
1967	*/	1894	*/
1968	void	1895	void
1969	unflag_inv (object *op, int flag)	1896	unflag_inv (object *op, int flag)
1970	{	1897	{
1971	if (op->inv)
1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1973	{	1899	{
1974	CLEAR_FLAG (tmp, flag);	1900	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	1901	unflag_inv (tmp, flag);
1976	}	1902	}
1977	}	1903	}
1978		1904
1979	/*	1905	/*
1980	* find_free_spot(object, map, x, y, start, stop) will search for	1906	* find_free_spot(object, map, x, y, start, stop) will search for
1981	* a spot at the given map and coordinates which will be able to contain	1907	* a spot at the given map and coordinates which will be able to contain
…		…
2014		1940
2015	/* However, often	1941	/* However, often
2016	* ob doesn't have any move type (when used to place exits)	1942	* ob doesn't have any move type (when used to place exits)
2017	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1943	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2018	*/	1944	*/
2019	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1945	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2020	{	1946	{
2021	altern [index++] = i;	1947	altern [index++] = i;
2022	continue;	1948	continue;
2023	}	1949	}
2024		1950
…		…
2609	{	2535	{
2610	char flagdesc[512];	2536	char flagdesc[512];
2611	char info2[256 * 4];	2537	char info2[256 * 4];
2612	char *p = info;	2538	char *p = info;
2613		2539
2614	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2540	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2615	count, uuid.seq,	2541	count,
		2542	uuid.c_str (),
2616	&name,	2543	&name,
2617	title ? "\",title:\"" : "",	2544	title ? "\",title:\"" : "",
2618	title ? (const char *)title : "",	2545	title ? (const char *)title : "",
2619	flag_desc (flagdesc, 512), type);	2546	flag_desc (flagdesc, 512), type);
2620		2547
…		…
2736		2663
2737	insert (force);	2664	insert (force);
2738	}	2665	}
2739		2666
2740	void	2667	void
2741	object::play_sound (faceidx sound) const	2668	object::play_sound (faceidx sound)
2742	{	2669	{
2743	if (!sound)	2670	if (!sound)
2744	return;	2671	return;
2745		2672
2746	if (flag [FLAG_REMOVED])	2673	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.196 by root, Wed Oct 17 22:01:27 2007 UTC vs. Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.196 by root, Wed Oct 17 22:01:27 2007 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC