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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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
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 <support@deliantra.net>	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	if (pl != op) // player is handled lazily
		397	esrv_update_item (UPD_WEIGHT, pl, op);
		398
		399	op = op->env;
		400	}
		401	}
		402
		403	/*
329	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	405	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
332	*/	407	*/
333	long	408	void
334	sum_weight (object *op)	409	object::update_weight ()
335	{	410	{
336	long sum;	411	sint32 sum = 0;
337	object *inv;
338		412
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
340	{	414	{
341	if (inv->inv)	415	if (op->inv)
342	sum_weight (inv);	416	op->update_weight ();
343		417
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	418	sum += op->total_weight ();
		419	}
		420
		421	sum = weight_adjust (this, sum);
		422
		423	if (sum != carrying)
345	}	424	{
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;	425	carrying = sum;
352		426
353	return sum;	427	if (object *pl = visible_to ())
		428	if (pl != this) // player is handled lazily
		429	esrv_update_item (UPD_WEIGHT, pl, this);
		430	}
354	}	431	}
355		432
356	/**	433	/*
357	* Return the outermost environment object for a given object.	434	* 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	*/	435	*/
373	char *	436	char *
374	dump_object (object *op)	437	dump_object (object *op)
375	{	438	{
376	if (!op)	439	if (!op)
…		…
390	get_nearest_part (object op, const object pl)	453	get_nearest_part (object op, const object pl)
391	{	454	{
392	object tmp, closest;	455	object tmp, closest;
393	int last_dist, i;	456	int last_dist, i;
394		457
395	if (op->more == NULL)	458	if (!op->more)
396	return op;	459	return op;
		460
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	461	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		462	tmp;
		463	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
400	return closest;	467	return closest;
401	}	468	}
402		469
403	/*	470	/*
404	* Returns the object which has the count-variable equal to the argument.	471	* Returns the object which has the count-variable equal to the argument.
		472	* VERRRY slow.
405	*/	473	*/
406	object *	474	object *
407	find_object (tag_t i)	475	find_object (tag_t i)
408	{	476	{
409	for_all_objects (op)	477	for_all_objects (op)
…		…
427	for_all_objects (op)	495	for_all_objects (op)
428	if (op->name == str_)	496	if (op->name == str_)
429	break;	497	break;
430		498
431	return op;	499	return op;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	500	}
439		501
440	/*	502	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	503	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	504	* skill and experience objects.
…		…
603		665
604	void	666	void
605	object::instantiate ()	667	object::instantiate ()
606	{	668	{
607	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
608	uuid = gen_uuid ();	670	uuid = UUID::gen ();
609		671
610	speed_left = -0.1f;	672	speed_left = -0.1f;
611	/* copy the body_info to the body_used - this is only really	673	/* 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.	674	* 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	675	* by doing so, when a monster is created, it has good starting
…		…
772	static int object_count;	834	static int object_count;
773		835
774	void object::link ()	836	void object::link ()
775	{	837	{
776	assert (!index);//D	838	assert (!index);//D
777	uuid = gen_uuid ();	839	uuid = UUID::gen ();
778	count = ++object_count;	840	count = ++object_count;
779		841
780	refcnt_inc ();	842	refcnt_inc ();
781	objects.insert (this);	843	objects.insert (this);
782	}	844	}
…		…
855	object::destroy_inv (bool drop_to_ground)	917	object::destroy_inv (bool drop_to_ground)
856	{	918	{
857	// need to check first, because the checks below might segfault	919	// need to check first, because the checks below might segfault
858	// as we might be on an invalid mapspace and crossfire code	920	// as we might be on an invalid mapspace and crossfire code
859	// is too buggy to ensure that the inventory is empty.	921	// is too buggy to ensure that the inventory is empty.
860	// corollary: if you create arrows etc. with stuff in tis inventory,	922	// corollary: if you create arrows etc. with stuff in its inventory,
861	// cf will crash below with off-map x and y	923	// cf will crash below with off-map x and y
862	if (!inv)	924	if (!inv)
863	return;	925	return;
864		926
865	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
866	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
867	* drop on that space.	929	* drop on that space.
868	*/	930	*/
869	if (!drop_to_ground	931	if (!drop_to_ground
870	\|\| !map	932	\|\| !map
871	\|\| map->in_memory != MAP_IN_MEMORY	933	\|\| map->in_memory != MAP_ACTIVE
872	\|\| map->nodrop	934	\|\| map->nodrop
873	\|\| ms ().move_block == MOVE_ALL)	935	\|\| ms ().move_block == MOVE_ALL)
874	{	936	{
875	while (inv)	937	while (inv)
876	{	938	{
877	inv->destroy_inv (drop_to_ground);	939	inv->destroy_inv (false);
878	inv->destroy ();	940	inv->destroy ();
879	}	941	}
880	}	942	}
881	else	943	else
882	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
888	\|\| op->flag [FLAG_NO_DROP]	950	\|\| op->flag [FLAG_NO_DROP]
889	\|\| op->type == RUNE	951	\|\| op->type == RUNE
890	\|\| op->type == TRAP	952	\|\| op->type == TRAP
891	\|\| op->flag [FLAG_IS_A_TEMPLATE]	953	\|\| op->flag [FLAG_IS_A_TEMPLATE]
892	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	954	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
893	op->destroy ();	955	op->destroy (true);
894	else	956	else
895	map->insert (op, x, y);	957	map->insert (op, x, y);
896	}	958	}
897	}	959	}
898	}	960	}
…		…
905	}	967	}
906		968
907	void	969	void
908	object::do_destroy ()	970	object::do_destroy ()
909	{	971	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	973	remove_button_link (this);
914		974
915	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	976	remove_friendly_object (this);
917		977
918	if (!flag [FLAG_REMOVED])
919	remove ();	978	remove ();
920		979
921	destroy_inv (true);	980	attachable::do_destroy ();
922		981
923	deactivate ();	982	deactivate ();
924	unlink ();	983	unlink ();
925		984
926	flag [FLAG_FREED] = 1;	985	flag [FLAG_FREED] = 1;
…		…
938	freed_map->width = 3;	997	freed_map->width = 3;
939	freed_map->height = 3;	998	freed_map->height = 3;
940	freed_map->nodrop = 1;	999	freed_map->nodrop = 1;
941		1000
942	freed_map->alloc ();	1001	freed_map->alloc ();
943	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
944	}	1003	}
945		1004
946	map = freed_map;	1005	map = freed_map;
947	x = 1;	1006	x = 1;
948	y = 1;	1007	y = 1;
…		…
967	object::destroy (bool destroy_inventory)	1026	object::destroy (bool destroy_inventory)
968	{	1027	{
969	if (destroyed ())	1028	if (destroyed ())
970	return;	1029	return;
971		1030
972	if (destroy_inventory)	1031	destroy_inv (!destroy_inventory);
973	destroy_inv (false);
974		1032
975	if (is_head ())	1033	if (is_head ())
976	if (sound_destroy)	1034	if (sound_destroy)
977	play_sound (sound_destroy);	1035	play_sound (sound_destroy);
978	else if (flag [FLAG_MONSTER])	1036	else if (flag [FLAG_MONSTER])
979	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1037	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
980		1038
981	attachable::destroy ();	1039	attachable::destroy ();
982	}
983
984	/*
985	* sub_weight() recursively (outwards) subtracts a number from the
986	* weight of an object (and what is carried by it's environment(s)).
987	*/
988	void
989	sub_weight (object *op, signed long weight)
990	{
991	while (op != NULL)
992	{
993	if (op->type == CONTAINER)
994	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
995
996	op->carrying -= weight;
997	op = op->env;
998	}
999	}	1040	}
1000		1041
1001	/* op->remove ():	1042	/* op->remove ():
1002	* This function removes the object op from the linked list of objects	1043	* This function removes the object op from the linked list of objects
1003	* which it is currently tied to. When this function is done, the	1044	* which it is currently tied to. When this function is done, the
…		…
1009	object::do_remove ()	1050	object::do_remove ()
1010	{	1051	{
1011	object tmp, last = 0;	1052	object tmp, last = 0;
1012	object *otmp;	1053	object *otmp;
1013		1054
1014	if (QUERY_FLAG (this, FLAG_REMOVED))	1055	if (flag [FLAG_REMOVED])
1015	return;	1056	return;
1016		1057
1017	SET_FLAG (this, FLAG_REMOVED);
1018	INVOKE_OBJECT (REMOVE, this);	1058	INVOKE_OBJECT (REMOVE, this);
		1059
		1060	if (object *pl = visible_to ())
		1061	esrv_del_item (pl->contr, count);
		1062
		1063	flag [FLAG_REMOVED] = true;
1019		1064
1020	if (more)	1065	if (more)
1021	more->remove ();	1066	more->remove ();
1022		1067
1023	/*	1068	/*
1024	* In this case, the object to be removed is in someones	1069	* In this case, the object to be removed is in someones
1025	* inventory.	1070	* inventory.
1026	*/	1071	*/
1027	if (env)	1072	if (env)
1028	{	1073	{
		1074	adjust_weight (env, -total_weight ());
		1075
		1076	*(above ? &above->below : &env->inv) = below;
		1077
1029	if (nrof)	1078	if (below)
1030	sub_weight (env, weight * nrof);	1079	below->above = above;
1031	else	1080
1032	sub_weight (env, weight + carrying);	1081	/* we set up values so that it could be inserted into
		1082	* the map, but we don't actually do that - it is up
		1083	* to the caller to decide what we want to do.
		1084	*/
		1085	map = env->map;
		1086	x = env->x;
		1087	y = env->y;
		1088	above = 0;
		1089	below = 0;
		1090	env = 0;
1033		1091
1034	/* NO_FIX_PLAYER is set when a great many changes are being	1092	/* NO_FIX_PLAYER is set when a great many changes are being
1035	* made to players inventory. If set, avoiding the call	1093	* made to players inventory. If set, avoiding the call
1036	* to save cpu time.	1094	* to save cpu time.
1037	*/	1095	*/
1038	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1039	otmp->update_stats ();	1097	otmp->update_stats ();
1040
1041	if (above)
1042	above->below = below;
1043	else
1044	env->inv = below;
1045
1046	if (below)
1047	below->above = above;
1048
1049	/* we set up values so that it could be inserted into
1050	* the map, but we don't actually do that - it is up
1051	* to the caller to decide what we want to do.
1052	*/
1053	x = env->x, y = env->y;
1054	map = env->map;
1055	above = 0, below = 0;
1056	env = 0;
1057	}	1098	}
1058	else if (map)	1099	else if (map)
1059	{	1100	{
1060	if (type == PLAYER)	1101	if (type == PLAYER)
1061	{	1102	{
…		…
1108	* removed (most likely destroyed), update the player view	1149	* removed (most likely destroyed), update the player view
1109	* appropriately.	1150	* appropriately.
1110	*/	1151	*/
1111	pl->close_container ();	1152	pl->close_container ();
1112		1153
1113	pl->contr->ns->floorbox_update ();	1154	//TODO: the floorbox prev/next might need updating
		1155	esrv_del_item (pl->contr, count);
1114	}	1156	}
1115		1157
1116	for (tmp = ms.bot; tmp; tmp = tmp->above)	1158	for (tmp = ms.bot; tmp; tmp = tmp->above)
1117	{	1159	{
1118	/* No point updating the players look faces if he is the object	1160	/* No point updating the players look faces if he is the object
…		…
1162	if (!top)	1204	if (!top)
1163	for (top = op; top && top->above; top = top->above)	1205	for (top = op; top && top->above; top = top->above)
1164	;	1206	;
1165		1207
1166	for (; top; top = top->below)	1208	for (; top; top = top->below)
1167	{
1168	if (top == op)
1169	continue;
1170
1171	if (object::can_merge (op, top))	1209	if (object::can_merge (op, top))
1172	{	1210	{
1173	top->nrof += op->nrof;	1211	top->nrof += op->nrof;
1174		1212
1175	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1213	if (object *pl = top->visible_to ())
1176	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
1177	op->destroy ();	1219	op->destroy (1);
		1220
1178	return top;	1221	return top;
1179	}	1222	}
1180	}
1181		1223
1182	return 0;	1224	return 0;
1183	}	1225	}
1184		1226
1185	void	1227	void
…		…
1244	object *	1286	object *
1245	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)
1246	{	1288	{
1247	assert (!op->flag [FLAG_FREED]);	1289	assert (!op->flag [FLAG_FREED]);
1248		1290
1249	object top, floor = NULL;
1250
1251	op->remove ();	1291	op->remove ();
1252		1292
1253	/* Ideally, the caller figures this out. However, it complicates a lot	1293	/* Ideally, the caller figures this out. However, it complicates a lot
1254	* of areas of callers (eg, anything that uses find_free_spot would now	1294	* of areas of callers (eg, anything that uses find_free_spot would now
1255	* need extra work	1295	* need extra work
1256	*/	1296	*/
1257	if (!xy_normalise (m, op->x, op->y))	1297	if (!xy_normalise (m, op->x, op->y))
1258	{	1298	{
1259	op->destroy ();	1299	op->destroy (1);
1260	return 0;	1300	return 0;
1261	}	1301	}
1262		1302
1263	if (object *more = op->more)	1303	if (object *more = op->more)
1264	if (!insert_ob_in_map (more, m, originator, flag))	1304	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1273	*/	1313	*/
1274	if (op->nrof && !(flag & INS_NO_MERGE))	1314	if (op->nrof && !(flag & INS_NO_MERGE))
1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1276	if (object::can_merge (op, tmp))	1316	if (object::can_merge (op, tmp))
1277	{	1317	{
		1318	// TODO: we atcually want to update tmp, not op,
		1319	// but some caller surely breaks when we return tmp
		1320	// from here :/
1278	op->nrof += tmp->nrof;	1321	op->nrof += tmp->nrof;
1279	tmp->destroy ();	1322	tmp->destroy (1);
1280	}	1323	}
1281		1324
1282	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1325	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1283	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1326	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1284		1327
…		…
1304	/* since below originator, no need to update top */	1347	/* since below originator, no need to update top */
1305	originator->below = op;	1348	originator->below = op;
1306	}	1349	}
1307	else	1350	else
1308	{	1351	{
		1352	object top, floor = NULL;
		1353
1309	top = ms.bot;	1354	top = ms.bot;
1310		1355
1311	/* If there are other objects, then */	1356	/* If there are other objects, then */
1312	if (top)	1357	if (top)
1313	{	1358	{
…		…
1412	}	1457	}
1413		1458
1414	op->map->dirty = true;	1459	op->map->dirty = true;
1415		1460
1416	if (object *pl = ms.player ())	1461	if (object *pl = ms.player ())
1417	pl->contr->ns->floorbox_update ();	1462	//TODO: the floorbox prev/next might need updating
		1463	esrv_send_item (pl, op);
1418		1464
1419	/* If this object glows, it may affect lighting conditions that are	1465	/* If this object glows, it may affect lighting conditions that are
1420	* visible to others on this map. But update_all_los is really	1466	* visible to others on this map. But update_all_los is really
1421	* an inefficient way to do this, as it means los for all players	1467	* an inefficient way to do this, as it means los for all players
1422	* on the map will get recalculated. The players could very well	1468	* on the map will get recalculated. The players could very well
…		…
1464	* op is the object to insert it under: supplies x and the map.	1510	* op is the object to insert it under: supplies x and the map.
1465	*/	1511	*/
1466	void	1512	void
1467	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (const char arch_string, object op)
1468	{	1514	{
1469	object tmp, tmp1;
1470
1471	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1472		1516
1473	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1474	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1475	tmp->destroy ();	1519	tmp->destroy (1);
1476		1520
1477	tmp1 = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (arch_string));
1478		1522
1479	tmp1->x = op->x;	1523	tmp->x = op->x;
1480	tmp1->y = op->y;	1524	tmp->y = op->y;
		1525
1481	insert_ob_in_map (tmp1, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
1482	}	1527	}
1483		1528
1484	object *	1529	object *
1485	object::insert_at (object where, object originator, int flags)	1530	object::insert_at (object where, object originator, int flags)
1486	{	1531	{
		1532	if (where->env)
		1533	return where->env->insert (this);
		1534	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1535	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1536	}
1489		1537
1490	/*	1538	/*
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1492	* is returned contains nr objects, and the remaining parts contains
1493	* the rest (or is removed and freed if that number is 0).
1494	* On failure, NULL is returned, and the reason put into the
1495	* global static errmsg array.
1496	*/
1497	object *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{
1500	object *newob;
1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503	if (orig_ob->nrof < nr)
1504	{
1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506	return NULL;
1507	}
1508
1509	newob = object_create_clone (orig_ob);
1510
1511	if ((orig_ob->nrof -= nr) < 1)
1512	orig_ob->destroy (1);
1513	else if (!is_removed)
1514	{
1515	if (orig_ob->env != NULL)
1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1518	{
1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521	return NULL;
1522	}
1523	}
1524
1525	newob->nrof = nr;
1526
1527	return newob;
1528	}
1529
1530	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1539	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1540	* the amount of an object. If the amount reaches 0, the object
1533	* is subsequently removed and freed.	1541	* is subsequently removed and freed.
1534	*	1542	*
1535	* Return value: 'op' if something is left, NULL if the amount reached 0	1543	* Return value: 'op' if something is left, NULL if the amount reached 0
1536	*/	1544	*/
		1545	bool
		1546	object::decrease (sint32 nr)
		1547	{
		1548	if (!nr)
		1549	return true;
		1550
		1551	nr = min (nr, nrof);
		1552
		1553	nrof -= nr;
		1554
		1555	if (nrof)
		1556	{
		1557	adjust_weight (env, -weight * nr); // carrying == 0
		1558
		1559	if (object *pl = visible_to ())
		1560	esrv_update_item (UPD_NROF, pl, this);
		1561
		1562	return true;
		1563	}
		1564	else
		1565	{
		1566	destroy (1);
		1567	return false;
		1568	}
		1569	}
		1570
		1571	/*
		1572	* split(ob,nr) splits up ob into two parts. The part which
		1573	* is returned contains nr objects, and the remaining parts contains
		1574	* the rest (or is removed and returned if that number is 0).
		1575	* On failure, NULL is returned.
		1576	*/
1537	object *	1577	object *
1538	decrease_ob_nr (object *op, uint32 i)	1578	object::split (sint32 nr)
1539	{	1579	{
1540	object *tmp;	1580	int have = number_of ();
1541		1581
1542	if (i == 0) /* objects with op->nrof require this check */	1582	if (have < nr)
1543	return op;	1583	return 0;
1544		1584	else if (have == nr)
1545	if (i > op->nrof)
1546	i = op->nrof;
1547
1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1549	op->nrof -= i;
1550	else if (op->env)
1551	{	1585	{
1552	/* is this object in the players inventory, or sub container
1553	* therein?
1554	*/
1555	tmp = op->in_player ();
1556	/* nope. Is this a container the player has opened?
1557	* If so, set tmp to that player.
1558	* IMO, searching through all the players will mostly
1559	* likely be quicker than following op->env to the map,
1560	* and then searching the map for a player.
1561	*/
1562	if (!tmp)
1563	for_all_players (pl)
1564	if (pl->ob->container == op->env)
1565	{
1566	tmp = pl->ob;
1567	break;
1568	}
1569
1570	if (i < op->nrof)
1571	{
1572	sub_weight (op->env, op->weight * i);
1573	op->nrof -= i;
1574	if (tmp)
1575	esrv_send_item (tmp, op);
1576	}
1577	else
1578	{
1579	op->remove ();	1586	remove ();
1580	op->nrof = 0;	1587	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1588	}
1585	else	1589	else
1586	{	1590	{
1587	object *above = op->above;	1591	decrease (nr);
1588		1592
1589	if (i < op->nrof)	1593	object *op = object_create_clone (this);
1590	op->nrof -= i;	1594	op->nrof = nr;
1591	else
1592	{
1593	op->remove ();
1594	op->nrof = 0;
1595	}
1596
1597	/* Since we just removed op, op->above is null */
1598	for (tmp = above; tmp; tmp = tmp->above)
1599	if (tmp->type == PLAYER)
1600	{
1601	if (op->nrof)
1602	esrv_send_item (tmp, op);
1603	else
1604	esrv_del_item (tmp->contr, op->count);
1605	}
1606	}
1607
1608	if (op->nrof)
1609	return op;	1595	return op;
1610	else
1611	{
1612	op->destroy ();
1613	return 0;
1614	}
1615	}
1616
1617	/*
1618	* add_weight(object, weight) adds the specified weight to an object,
1619	* and also updates how much the environment(s) is/are carrying.
1620	*/
1621	void
1622	add_weight (object *op, signed long weight)
1623	{
1624	while (op != NULL)
1625	{
1626	if (op->type == CONTAINER)
1627	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629	op->carrying += weight;
1630	op = op->env;
1631	}	1596	}
1632	}	1597	}
1633		1598
1634	object *	1599	object *
1635	insert_ob_in_ob (object op, object where)	1600	insert_ob_in_ob (object op, object where)
…		…
1660	* be != op, if items are merged. -Tero	1625	* be != op, if items are merged. -Tero
1661	*/	1626	*/
1662	object *	1627	object *
1663	object::insert (object *op)	1628	object::insert (object *op)
1664	{	1629	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1630	if (op->more)
1669	{	1631	{
1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1632	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671	return op;	1633	return op;
1672	}	1634	}
1673		1635
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1636	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1637
		1638	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1639
1677	if (op->nrof)	1640	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1641	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1642	if (object::can_merge (tmp, op))
1681	{	1643	{
1682	/* return the original object and remove inserted object	1644	/* return the original object and remove inserted object
1683	(client needs the original object) */	1645	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1646	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to	1647
1686	* tmp->nrof, we need to increase the weight.	1648	if (object *pl = tmp->visible_to ())
1687	*/	1649	esrv_update_item (UPD_NROF, pl, tmp);
		1650
1688	add_weight (this, op->weight * op->nrof);	1651	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1652
1690	op->destroy (); /* free the inserted object */	1653	op->destroy (1);
1691	op = tmp;	1654	op = tmp;
1692	op->remove (); /* and fix old object's links */	1655	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1656	}
1696		1657
1697	/* I assume combined objects have no inventory
1698	* We add the weight - this object could have just been removed
1699	* (if it was possible to merge). calling remove_ob will subtract
1700	* the weight, so we need to add it in again, since we actually do
1701	* the linking below
1702	*/
1703	add_weight (this, op->weight * op->nrof);
1704	}
1705	else
1706	add_weight (this, (op->weight + op->carrying));
1707
1708	if (object *otmp = this->in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.	1658	op->owner = 0; // it's his/hers now. period.
1713	op->map = 0;	1659	op->map = 0;
		1660	op->x = 0;
		1661	op->y = 0;
		1662
		1663	op->above = 0;
		1664	op->below = inv;
1714	op->env = this;	1665	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718		1666
		1667	if (inv)
		1668	inv->above = op;
		1669
		1670	inv = op;
		1671
		1672	op->flag [FLAG_REMOVED] = 0;
		1673
		1674	if (object *pl = op->visible_to ())
		1675	esrv_send_item (pl, op);
		1676
		1677	adjust_weight (this, op->total_weight ());
		1678
		1679	inserted:
1719	/* reset the light list and los of the players on the map */	1680	/* reset the light list and los of the players on the map */
1720	if (op->glow_radius && map)	1681	if (op->glow_radius && map && map->darkness)
1721	{
1722	#ifdef DEBUG_LIGHTS
1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724	#endif /* DEBUG_LIGHTS */
1725	if (map->darkness)
1726	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1727	}
1728		1683
1729	/* Client has no idea of ordering so lets not bother ordering it here.	1684	// if this is a player's inventory, update stats
1730	* It sure simplifies this function...	1685	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1731	*/	1686	update_stats ();
1732	if (!inv)
1733	inv = op;
1734	else
1735	{
1736	op->below = inv;
1737	op->below->above = op;
1738	inv = op;
1739	}
1740		1687
1741	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1742		1689
1743	return op;	1690	return op;
1744	}	1691	}
…		…
2614	{	2561	{
2615	char flagdesc[512];	2562	char flagdesc[512];
2616	char info2[256 * 4];	2563	char info2[256 * 4];
2617	char *p = info;	2564	char *p = info;
2618		2565
2619	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2566	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2620	count, uuid.seq,	2567	count,
		2568	uuid.c_str (),
2621	&name,	2569	&name,
2622	title ? "\",title:\"" : "",	2570	title ? "\",title:\"" : "",
2623	title ? (const char *)title : "",	2571	title ? (const char *)title : "",
2624	flag_desc (flagdesc, 512), type);	2572	flag_desc (flagdesc, 512), type);
2625		2573
2626	if (!this->flag[FLAG_REMOVED] && env)	2574	if (!flag[FLAG_REMOVED] && env)
2627	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2628		2576
2629	if (map)	2577	if (map)
2630	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2578	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2631		2579
…		…
2673	if (object *closer = old_container->inv)	2621	if (object *closer = old_container->inv)
2674	if (closer->type == CLOSE_CON)	2622	if (closer->type == CLOSE_CON)
2675	closer->destroy ();	2623	closer->destroy ();
2676	#endif	2624	#endif
2677		2625
2678	old_container->flag [FLAG_APPLIED] = 0;	2626	old_container->flag [FLAG_APPLIED] = false;
2679	container = 0;	2627	container = 0;
2680		2628
2681	esrv_update_item (UPD_FLAGS, this, old_container);	2629	esrv_update_item (UPD_FLAGS, this, old_container);
2682	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2630	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683	play_sound (sound_find ("chest_close"));	2631	play_sound (sound_find ("chest_close"));
…		…
2699	}	2647	}
2700	#endif	2648	#endif
2701		2649
2702	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2703		2651
2704	new_container->flag [FLAG_APPLIED] = 1;	2652	new_container->flag [FLAG_APPLIED] = true;
2705	container = new_container;	2653	container = new_container;
2706		2654
2707	esrv_update_item (UPD_FLAGS, this, new_container);	2655	esrv_update_item (UPD_FLAGS, this, new_container);
2708	esrv_send_inventory (this, new_container);	2656	esrv_send_inventory (this, new_container);
2709	play_sound (sound_find ("chest_open"));	2657	play_sound (sound_find ("chest_open"));
…		…
2741		2689
2742	insert (force);	2690	insert (force);
2743	}	2691	}
2744		2692
2745	void	2693	void
2746	object::play_sound (faceidx sound) const	2694	object::play_sound (faceidx sound)
2747	{	2695	{
2748	if (!sound)	2696	if (!sound)
2749	return;	2697	return;
2750		2698
2751	if (flag [FLAG_REMOVED])	2699	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC vs. Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC