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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.198 by root, Mon Oct 22 02:52:48 2007 UTC vs.
Revision 1.214 by root, Tue Apr 22 07:01:46 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>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	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	45	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	};	46	};
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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-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	51	-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	};	52	};
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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	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	57	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	};	58	};
54	int freedir[SIZEOFFREE] = {	59	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	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	63	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	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	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	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
181	*/	179	*/
…		…
202	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
203	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
204	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* 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	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* 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	214	* 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	215	* 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	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	\|\| ob1->arch != ob2->arch
229	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
230	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
231	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
232	\|\| ob1->weight != ob2->weight	229	\|\| 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	230	\|\| ob1->attacktype != ob2->attacktype
236	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
237	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
238	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
239	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
246	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
247	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
248	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
249	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
250	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
251	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
258	{	263	{
259	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
260	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
261		266
262	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
263	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
264		269
265	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
267		272
268	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	274	* if it is valid.
270	*/	275	*/
271	}	276	}
…		…
290	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
291	return 0;	296	return 0;
292	break;	297	break;
293	}	298	}
294		299
295	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
296	{	301	{
297	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
300	return 0;	305
301	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	307	return 0;
303	}	308	}
304		309
305	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
306	{	311	{
…		…
312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314		319
315	if (k1 != k2)	320	if (k1 != k2)
316	return 0;	321	return 0;
		322
317	else if (k1 == 0)	323	if (k1 == 0)
318	return 1;	324	return 1;
		325
319	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
320	return 0;	327	return 0;
321	}	328	}
322	}	329	}
323		330
324	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
325	return 1;	332	return 1;
326	}	333	}
327		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (!flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	return pl;
		364	}
		365	}
		366
		367	return 0;
		368	}
		369
		370	// adjust weight per container type ("of holding")
		371	static sint32
		372	weight_adjust (object *op, sint32 weight)
		373	{
		374	return op->type == CONTAINER
		375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		376	: weight;
		377	}
		378
328	/*	379	/*
		380	* adjust_weight(object, weight) adds the specified weight to an object,
		381	* and also updates how much the environment(s) is/are carrying.
		382	*/
		383	static void
		384	adjust_weight (object *op, sint32 weight)
		385	{
		386	while (op)
		387	{
		388	weight = weight_adjust (op, weight);
		389
		390	if (!weight)
		391	return;
		392
		393	op->carrying += weight;
		394
		395	if (object *pl = op->visible_to ())
		396	esrv_update_item (UPD_WEIGHT, pl, op);
		397
		398	op = op->env;
		399	}
		400	}
		401
		402	/*
329	* sum_weight() is a recursive function which calculates the weight	403	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	404	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	405	* containers are carrying, and sums it up.
332	*/	406	*/
333	long	407	void
334	sum_weight (object *op)	408	object::update_weight ()
335	{	409	{
336	long sum;	410	sint32 sum = 0;
337	object *inv;
338		411
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	412	for (object *op = inv; op; op = op->below)
340	{	413	{
341	if (inv->inv)	414	if (op->inv)
342	sum_weight (inv);	415	op->update_weight ();
343		416
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	417	sum += op->total_weight ();
		418	}
		419
		420	sum = weight_adjust (this, sum);
		421
		422	if (sum != carrying)
345	}	423	{
346
347	if (op->type == CONTAINER && op->stats.Str)
348	sum = (sum * (100 - op->stats.Str)) / 100;
349
350	if (op->carrying != sum)
351	op->carrying = sum;	424	carrying = sum;
352		425
353	return sum;	426	if (object *pl = visible_to ())
		427	esrv_update_item (UPD_WEIGHT, pl, this);
		428	}
354	}	429	}
355		430
356	/**	431	/*
357	* Return the outermost environment object for a given object.	432	* 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	*/	433	*/
373	char *	434	char *
374	dump_object (object *op)	435	dump_object (object *op)
375	{	436	{
376	if (!op)	437	if (!op)
…		…
390	get_nearest_part (object op, const object pl)	451	get_nearest_part (object op, const object pl)
391	{	452	{
392	object tmp, closest;	453	object tmp, closest;
393	int last_dist, i;	454	int last_dist, i;
394		455
395	if (op->more == NULL)	456	if (!op->more)
396	return op;	457	return op;
		458
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	459	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		460	tmp;
		461	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	462	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	463	closest = tmp, last_dist = i;
		464
400	return closest;	465	return closest;
401	}	466	}
402		467
403	/*	468	/*
404	* Returns the object which has the count-variable equal to the argument.	469	* Returns the object which has the count-variable equal to the argument.
		470	* VERRRY slow.
405	*/	471	*/
406	object *	472	object *
407	find_object (tag_t i)	473	find_object (tag_t i)
408	{	474	{
409	for_all_objects (op)	475	for_all_objects (op)
…		…
427	for_all_objects (op)	493	for_all_objects (op)
428	if (op->name == str_)	494	if (op->name == str_)
429	break;	495	break;
430		496
431	return op;	497	return op;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	498	}
439		499
440	/*	500	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	501	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	502	* skill and experience objects.
…		…
603		663
604	void	664	void
605	object::instantiate ()	665	object::instantiate ()
606	{	666	{
607	if (!uuid.seq) // HACK	667	if (!uuid.seq) // HACK
608	uuid = gen_uuid ();	668	uuid = UUID::gen ();
609		669
610	speed_left = -0.1f;	670	speed_left = -0.1f;
611	/* copy the body_info to the body_used - this is only really	671	/* copy the body_info to the body_used - this is only really
612	* need for monsters, but doesn't hurt to do it for everything.	672	* need for monsters, but doesn't hurt to do it for everything.
613	* by doing so, when a monster is created, it has good starting	673	* by doing so, when a monster is created, it has good starting
…		…
772	static int object_count;	832	static int object_count;
773		833
774	void object::link ()	834	void object::link ()
775	{	835	{
776	assert (!index);//D	836	assert (!index);//D
777	uuid = gen_uuid ();	837	uuid = UUID::gen ();
778	count = ++object_count;	838	count = ++object_count;
779		839
780	refcnt_inc ();	840	refcnt_inc ();
781	objects.insert (this);	841	objects.insert (this);
782	}	842	}
…		…
866	* if some form of movement is allowed, let objects	926	* if some form of movement is allowed, let objects
867	* drop on that space.	927	* drop on that space.
868	*/	928	*/
869	if (!drop_to_ground	929	if (!drop_to_ground
870	\|\| !map	930	\|\| !map
871	\|\| map->in_memory != MAP_IN_MEMORY	931	\|\| map->in_memory != MAP_ACTIVE
872	\|\| map->nodrop	932	\|\| map->nodrop
873	\|\| ms ().move_block == MOVE_ALL)	933	\|\| ms ().move_block == MOVE_ALL)
874	{	934	{
875	while (inv)	935	while (inv)
876	{	936	{
…		…
905	}	965	}
906		966
907	void	967	void
908	object::do_destroy ()	968	object::do_destroy ()
909	{	969	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	971	remove_button_link (this);
914		972
915	if (flag [FLAG_FRIENDLY])	973	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	974	remove_friendly_object (this);
917		975
918	if (!flag [FLAG_REMOVED])
919	remove ();	976	remove ();
		977
		978	attachable::do_destroy ();
920		979
921	destroy_inv (true);	980	destroy_inv (true);
922		981
923	deactivate ();	982	deactivate ();
924	unlink ();	983	unlink ();
…		…
935		994
936	freed_map->path = "<freed objects map>";	995	freed_map->path = "<freed objects map>";
937	freed_map->name = "/internal/freed_objects_map";	996	freed_map->name = "/internal/freed_objects_map";
938	freed_map->width = 3;	997	freed_map->width = 3;
939	freed_map->height = 3;	998	freed_map->height = 3;
		999	freed_map->nodrop = 1;
940		1000
941	freed_map->alloc ();	1001	freed_map->alloc ();
942	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
943	}	1003	}
944		1004
945	map = freed_map;	1005	map = freed_map;
946	x = 1;	1006	x = 1;
947	y = 1;	1007	y = 1;
…		…
976	play_sound (sound_destroy);	1036	play_sound (sound_destroy);
977	else if (flag [FLAG_MONSTER])	1037	else if (flag [FLAG_MONSTER])
978	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1038	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
979		1039
980	attachable::destroy ();	1040	attachable::destroy ();
981	}
982
983	/*
984	* sub_weight() recursively (outwards) subtracts a number from the
985	* weight of an object (and what is carried by it's environment(s)).
986	*/
987	void
988	sub_weight (object *op, signed long weight)
989	{
990	while (op != NULL)
991	{
992	if (op->type == CONTAINER)
993	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
994
995	op->carrying -= weight;
996	op = op->env;
997	}
998	}	1041	}
999		1042
1000	/* op->remove ():	1043	/* op->remove ():
1001	* This function removes the object op from the linked list of objects	1044	* This function removes the object op from the linked list of objects
1002	* which it is currently tied to. When this function is done, the	1045	* which it is currently tied to. When this function is done, the
…		…
1008	object::do_remove ()	1051	object::do_remove ()
1009	{	1052	{
1010	object tmp, last = 0;	1053	object tmp, last = 0;
1011	object *otmp;	1054	object *otmp;
1012		1055
1013	if (QUERY_FLAG (this, FLAG_REMOVED))	1056	if (flag [FLAG_REMOVED])
1014	return;	1057	return;
1015		1058
1016	SET_FLAG (this, FLAG_REMOVED);
1017	INVOKE_OBJECT (REMOVE, this);	1059	INVOKE_OBJECT (REMOVE, this);
		1060
		1061	if (object *pl = visible_to ())
		1062	esrv_del_item (pl->contr, count);
		1063
		1064	flag [FLAG_REMOVED] = true;
1018		1065
1019	if (more)	1066	if (more)
1020	more->remove ();	1067	more->remove ();
1021		1068
1022	/*	1069	/*
1023	* In this case, the object to be removed is in someones	1070	* In this case, the object to be removed is in someones
1024	* inventory.	1071	* inventory.
1025	*/	1072	*/
1026	if (env)	1073	if (env)
1027	{	1074	{
		1075	adjust_weight (env, -total_weight ());
		1076
		1077	*(above ? &above->below : &env->inv) = below;
		1078
1028	if (nrof)	1079	if (below)
1029	sub_weight (env, weight * nrof);	1080	below->above = above;
1030	else	1081
1031	sub_weight (env, weight + carrying);	1082	/* we set up values so that it could be inserted into
		1083	* the map, but we don't actually do that - it is up
		1084	* to the caller to decide what we want to do.
		1085	*/
		1086	map = env->map;
		1087	x = env->x;
		1088	y = env->y;
		1089	above = 0;
		1090	below = 0;
		1091	env = 0;
1032		1092
1033	/* NO_FIX_PLAYER is set when a great many changes are being	1093	/* NO_FIX_PLAYER is set when a great many changes are being
1034	* made to players inventory. If set, avoiding the call	1094	* made to players inventory. If set, avoiding the call
1035	* to save cpu time.	1095	* to save cpu time.
1036	*/	1096	*/
1037	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1038	otmp->update_stats ();	1098	otmp->update_stats ();
1039
1040	if (above)
1041	above->below = below;
1042	else
1043	env->inv = below;
1044
1045	if (below)
1046	below->above = above;
1047
1048	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.
1051	*/
1052	x = env->x, y = env->y;
1053	map = env->map;
1054	above = 0, below = 0;
1055	env = 0;
1056	}	1099	}
1057	else if (map)	1100	else if (map)
1058	{	1101	{
1059	if (type == PLAYER)	1102	if (type == PLAYER)
1060	{	1103	{
…		…
1161	if (!top)	1204	if (!top)
1162	for (top = op; top && top->above; top = top->above)	1205	for (top = op; top && top->above; top = top->above)
1163	;	1206	;
1164		1207
1165	for (; top; top = top->below)	1208	for (; top; top = top->below)
1166	{
1167	if (top == op)
1168	continue;
1169
1170	if (object::can_merge (op, top))	1209	if (object::can_merge (op, top))
1171	{	1210	{
1172	top->nrof += op->nrof;	1211	top->nrof += op->nrof;
1173		1212
1174	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1213	if (object *pl = top->visible_to ())
1175	op->weight = 0; /* Don't want any adjustements now */	1214	esrv_update_item (UPD_NROF, pl, top);
		1215
		1216	op->weight = 0; // cancel the addition above
		1217	op->carrying = 0; // must be 0 already
		1218
1176	op->destroy ();	1219	op->destroy (1);
		1220
1177	return top;	1221	return top;
1178	}	1222	}
1179	}
1180		1223
1181	return 0;	1224	return 0;
1182	}	1225	}
1183		1226
1184	void	1227	void
…		…
1273	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1274	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1275	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1276	{	1319	{
1277	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1278	tmp->destroy ();	1321	tmp->destroy (1);
1279	}	1322	}
1280		1323
1281	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1282	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1283		1326
…		…
1463	* op is the object to insert it under: supplies x and the map.	1506	* op is the object to insert it under: supplies x and the map.
1464	*/	1507	*/
1465	void	1508	void
1466	replace_insert_ob_in_map (const char arch_string, object op)	1509	replace_insert_ob_in_map (const char arch_string, object op)
1467	{	1510	{
1468	object tmp, tmp1;
1469
1470	/* first search for itself and remove any old instances */	1511	/* first search for itself and remove any old instances */
1471		1512
1472	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1513	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1473	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1514	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1474	tmp->destroy ();	1515	tmp->destroy (1);
1475		1516
1476	tmp1 = arch_to_object (archetype::find (arch_string));	1517	object *tmp = arch_to_object (archetype::find (arch_string));
1477		1518
1478	tmp1->x = op->x;	1519	tmp->x = op->x;
1479	tmp1->y = op->y;	1520	tmp->y = op->y;
		1521
1480	insert_ob_in_map (tmp1, op->map, op, 0);	1522	insert_ob_in_map (tmp, op->map, op, 0);
1481	}	1523	}
1482		1524
1483	object *	1525	object *
1484	object::insert_at (object where, object originator, int flags)	1526	object::insert_at (object where, object originator, int flags)
1485	{	1527	{
		1528	if (where->env)
		1529	return where->env->insert (this);
		1530	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1531	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1532	}
1488		1533
1489	/*	1534	/*
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523
1524	newob->nrof = nr;
1525
1526	return newob;
1527	}
1528
1529	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1535	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1536	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1537	* is subsequently removed and freed.
1533	*	1538	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1539	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1540	*/
		1541	bool
		1542	object::decrease (sint32 nr)
		1543	{
		1544	if (!nr)
		1545	return true;
		1546
		1547	nr = min (nr, nrof);
		1548
		1549	nrof -= nr;
		1550
		1551	if (nrof)
		1552	{
		1553	adjust_weight (env, -weight * nr); // carrying == 0
		1554
		1555	if (object *pl = visible_to ())
		1556	esrv_update_item (UPD_NROF, pl, this);
		1557
		1558	return true;
		1559	}
		1560	else
		1561	{
		1562	destroy (1);
		1563	return false;
		1564	}
		1565	}
		1566
		1567	/*
		1568	* split(ob,nr) splits up ob into two parts. The part which
		1569	* is returned contains nr objects, and the remaining parts contains
		1570	* the rest (or is removed and returned if that number is 0).
		1571	* On failure, NULL is returned.
		1572	*/
1536	object *	1573	object *
1537	decrease_ob_nr (object *op, uint32 i)	1574	object::split (sint32 nr)
1538	{	1575	{
1539	object *tmp;	1576	int have = number_of ();
1540		1577
1541	if (i == 0) /* objects with op->nrof require this check */	1578	if (have < nr)
1542	return op;	1579	return 0;
1543		1580	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1581	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1582	remove ();
1579	op->nrof = 0;	1583	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1584	}
1584	else	1585	else
1585	{	1586	{
1586	object *above = op->above;	1587	decrease (nr);
1587		1588
1588	if (i < op->nrof)	1589	object *op = object_create_clone (this);
1589	op->nrof -= i;	1590	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1591	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}
1614	}
1615
1616	/*
1617	* add_weight(object, weight) adds the specified weight to an object,
1618	* and also updates how much the environment(s) is/are carrying.
1619	*/
1620	void
1621	add_weight (object *op, signed long weight)
1622	{
1623	while (op != NULL)
1624	{
1625	if (op->type == CONTAINER)
1626	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1627
1628	op->carrying += weight;
1629	op = op->env;
1630	}	1592	}
1631	}	1593	}
1632		1594
1633	object *	1595	object *
1634	insert_ob_in_ob (object op, object where)	1596	insert_ob_in_ob (object op, object where)
…		…
1659	* be != op, if items are merged. -Tero	1621	* be != op, if items are merged. -Tero
1660	*/	1622	*/
1661	object *	1623	object *
1662	object::insert (object *op)	1624	object::insert (object *op)
1663	{	1625	{
1664	if (!QUERY_FLAG (op, FLAG_REMOVED))
1665	op->remove ();
1666
1667	if (op->more)	1626	if (op->more)
1668	{	1627	{
1669	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1628	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1670	return op;	1629	return op;
1671	}	1630	}
1672		1631
1673	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1632	op->remove ();
1674	CLEAR_FLAG (op, FLAG_REMOVED);	1633
		1634	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1675		1635
1676	if (op->nrof)	1636	if (op->nrof)
1677	{
1678	for (object *tmp = inv; tmp; tmp = tmp->below)	1637	for (object *tmp = inv; tmp; tmp = tmp->below)
1679	if (object::can_merge (tmp, op))	1638	if (object::can_merge (tmp, op))
1680	{	1639	{
1681	/* return the original object and remove inserted object	1640	/* return the original object and remove inserted object
1682	(client needs the original object) */	1641	(client needs the original object) */
1683	tmp->nrof += op->nrof;	1642	tmp->nrof += op->nrof;
1684	/* Weight handling gets pretty funky. Since we are adding to	1643
1685	* tmp->nrof, we need to increase the weight.	1644	if (object *pl = tmp->visible_to ())
1686	*/	1645	esrv_update_item (UPD_NROF, pl, tmp);
		1646
1687	add_weight (this, op->weight * op->nrof);	1647	adjust_weight (this, op->total_weight ());
1688	SET_FLAG (op, FLAG_REMOVED);	1648
1689	op->destroy (); /* free the inserted object */	1649	op->destroy (1);
1690	op = tmp;	1650	op = tmp;
1691	op->remove (); /* and fix old object's links */	1651	goto inserted;
1692	CLEAR_FLAG (op, FLAG_REMOVED);
1693	break;
1694	}	1652	}
1695		1653
1696	/* I assume combined objects have no inventory
1697	* We add the weight - this object could have just been removed
1698	* (if it was possible to merge). calling remove_ob will subtract
1699	* the weight, so we need to add it in again, since we actually do
1700	* the linking below
1701	*/
1702	add_weight (this, op->weight * op->nrof);
1703	}
1704	else
1705	add_weight (this, (op->weight + op->carrying));
1706
1707	if (object *otmp = this->in_player ())
1708	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1709	otmp->update_stats ();
1710
1711	op->owner = 0; // its his/hers now. period.	1654	op->owner = 0; // it's his/hers now. period.
1712	op->map = 0;	1655	op->map = 0;
		1656	op->x = 0;
		1657	op->y = 0;
		1658
		1659	op->above = 0;
		1660	op->below = inv;
1713	op->env = this;	1661	op->env = this;
1714	op->above = 0;
1715	op->below = 0;
1716	op->x = op->y = 0;
1717		1662
		1663	if (inv)
		1664	inv->above = op;
		1665
		1666	inv = op;
		1667
		1668	op->flag [FLAG_REMOVED] = 0;
		1669
		1670	if (object *pl = op->visible_to ())
		1671	esrv_send_item (pl, op);
		1672
		1673	adjust_weight (this, op->total_weight ());
		1674
		1675	inserted:
1718	/* reset the light list and los of the players on the map */	1676	/* reset the light list and los of the players on the map */
1719	if (op->glow_radius && map)	1677	if (op->glow_radius && map && map->darkness)
1720	{
1721	#ifdef DEBUG_LIGHTS
1722	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1723	#endif /* DEBUG_LIGHTS */
1724	if (map->darkness)
1725	update_all_los (map, x, y);	1678	update_all_los (map, x, y);
1726	}
1727		1679
1728	/* Client has no idea of ordering so lets not bother ordering it here.	1680	// if this is a player's inventory, update stats
1729	* It sure simplifies this function...	1681	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1730	*/	1682	update_stats ();
1731	if (!inv)
1732	inv = op;
1733	else
1734	{
1735	op->below = inv;
1736	op->below->above = op;
1737	inv = op;
1738	}
1739		1683
1740	INVOKE_OBJECT (INSERT, this);	1684	INVOKE_OBJECT (INSERT, this);
1741		1685
1742	return op;	1686	return op;
1743	}	1687	}
…		…
2018		1962
2019	/* However, often	1963	/* However, often
2020	* ob doesn't have any move type (when used to place exits)	1964	* ob doesn't have any move type (when used to place exits)
2021	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1965	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022	*/	1966	*/
2023	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1967	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024	{	1968	{
2025	altern [index++] = i;	1969	altern [index++] = i;
2026	continue;	1970	continue;
2027	}	1971	}
2028		1972
…		…
2613	{	2557	{
2614	char flagdesc[512];	2558	char flagdesc[512];
2615	char info2[256 * 4];	2559	char info2[256 * 4];
2616	char *p = info;	2560	char *p = info;
2617		2561
2618	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2562	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619	count, uuid.seq,	2563	count,
		2564	uuid.c_str (),
2620	&name,	2565	&name,
2621	title ? "\",title:\"" : "",	2566	title ? "\",title:\"" : "",
2622	title ? (const char *)title : "",	2567	title ? (const char *)title : "",
2623	flag_desc (flagdesc, 512), type);	2568	flag_desc (flagdesc, 512), type);
2624		2569
…		…
2740		2685
2741	insert (force);	2686	insert (force);
2742	}	2687	}
2743		2688
2744	void	2689	void
2745	object::play_sound (faceidx sound) const	2690	object::play_sound (faceidx sound)
2746	{	2691	{
2747	if (!sound)	2692	if (!sound)
2748	return;	2693	return;
2749		2694
2750	if (flag [FLAG_REMOVED])	2695	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.198 by root, Mon Oct 22 02:52:48 2007 UTC vs. Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.198 by root, Mon Oct 22 02:52:48 2007 UTC vs.
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC