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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.202 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 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	UUID UUID::cur;	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	objectvec objects;	38	objectvec objects;
42	activevec actives;	39	activevec actives;
43		40
44	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,
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	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
46	};	46	};
47	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,
48	-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
49	};	52	};
50	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,
51	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
52	};	58	};
53	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
54	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,
55	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
56	};	64	};
57		65
58	static void	66	static void
59	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
60	{	68	{
61	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
62		70	CALL_ARG_SV (newSVval64 (skip));
63	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
64	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
65		73	CALL_END;
66	FILE *fp;
67
68	if (!(fp = fopen (filename2, "w")))
69	{
70	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
71	return;
72	}
73
74	fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
75	fclose (fp);
76	rename (filename2, filename1);
77	}	74	}
78		75
79	static void	76	static void
80	read_uuid (void)	77	read_uuid (void)
81	{	78	{
82	char filename[MAX_BUF];	79	char filename[MAX_BUF];
83		80
84	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
85		84
86	FILE *fp;	85	FILE *fp;
87		86
88	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
89	{	88	{
90	if (errno == ENOENT)	89	if (errno == ENOENT)
91	{	90	{
92	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	92	UUID::cur.seq = 0;
94	write_uuid ();	93	write_uuid (UUID_GAP, true);
95	return;	94	return;
96	}	95	}
97		96
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	98	_exit (1);
100	}	99	}
101		100
102	int version;	101	UUID::BUF buf;
103	unsigned long long uid;	102	buf[0] = 0;
104	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
105	{	106	{
106	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
107	_exit (1);	108	_exit (1);
108	}	109	}
109		110
110	UUID::cur.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
111	write_uuid ();	112
112	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
113	fclose (fp);	114	fclose (fp);
114	}	115	}
115		116
116	UUID	117	UUID
117	UUID::gen ()	118	UUID::gen ()
118	{	119	{
119	UUID uid;	120	UUID uid;
120		121
121	uid.seq = ++cur.seq;	122	uid.seq = ++cur.seq;
122		123
123	if (!(cur.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
124	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
125		130
126	return uid;	131	return uid;
127	}	132	}
128		133
129	void	134	void
…		…
131	{	136	{
132	read_uuid ();	137	read_uuid ();
133	}	138	}
134		139
135	/* 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. */
136	static int	141	static bool
137	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
138	{	143	{
139	key_value *wants_field;	144	key_value *wants_field;
140		145
141	/* 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
…		…
149	key_value *has_field;	154	key_value *has_field;
150		155
151	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
152	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
153		158
154	if (has_field == NULL)	159	if (!has_field)
155	{
156	/* No field with that name. */	160	return 0; /* No field with that name. */
157	return FALSE;
158	}
159		161
160	/* Found the matching field. */	162	/* Found the matching field. */
161	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
162	{
163	/* 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. */
164	return FALSE;
165	}
166		165
167	/* 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. */
168	}	167	}
169		168
170	/* 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. */
171	return TRUE;	170	return 1;
172	}	171	}
173		172
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static int	174	static bool
176	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
177	{	176	{
178	/* 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,
179	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
180	*/	179	*/
…		…
201	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
202	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
203	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
204	return 0;	203	return 0;
205		204
206	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
207	/* 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
208	* 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
209	* used to store nrof).	208	* nrof values.
210	*/	209	*/
211	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	211	return 0;
213		212
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* 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
216	* 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
217	* 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
218	* flags lose any meaning.	217	* flags lose any meaning.
219	*/	218	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		221
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		224
226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
227	\|\| ob1->arch != ob2->arch
228	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
229	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
230	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
231	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
232	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
234	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
235	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
236	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
237	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
238	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
245	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
246	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
247	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
248	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
249	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
250	\|\| 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)))
251	return 0;	249	return 0;
252		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
253	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
255	*/	261	*/
256	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
257	{	263	{
258	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
259	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
260		266
261	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
262	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
263		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
266		272
267	/* 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
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	305
300	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	307	return 0;
302	}	308	}
303		309
304	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
305	{	311	{
…		…
311	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313		319
314	if (k1 != k2)	320	if (k1 != k2)
315	return 0;	321	return 0;
		322
316	else if (k1 == 0)	323	if (k1 == 0)
317	return 1;	324	return 1;
		325
318	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
319	return 0;	327	return 0;
320	}	328	}
321	}	329	}
322		330
323	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
324	return 1;	332	return 1;
325	}	333	}
326		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !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	if (!pl->container \|\| this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
327	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
328	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
329	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
330	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
331	*/	408	*/
332	long	409	void
333	sum_weight (object *op)	410	object::update_weight ()
334	{	411	{
335	long sum;	412	sint32 sum = 0;
336	object *inv;
337		413
338	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
339	{	415	{
340	if (inv->inv)	416	if (op->inv)
341	sum_weight (inv);	417	op->update_weight ();
342		418
343	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
344	}	425	{
345
346	if (op->type == CONTAINER && op->stats.Str)
347	sum = (sum * (100 - op->stats.Str)) / 100;
348
349	if (op->carrying != sum)
350	op->carrying = sum;	426	carrying = sum;
351		427
352	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
353	}	432	}
354		433
355	/**	434	/*
356	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
357	*/
358
359	object *
360	object_get_env_recursive (object *op)
361	{
362	while (op->env != NULL)
363	op = op->env;
364	return op;
365	}
366
367	/*
368	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
369	* Some error messages.
370	* The result of the dump is stored in the static global errmsg array.
371	*/	436	*/
372	char *	437	char *
373	dump_object (object *op)	438	dump_object (object *op)
374	{	439	{
375	if (!op)	440	if (!op)
…		…
389	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
390	{	455	{
391	object tmp, closest;	456	object tmp, closest;
392	int last_dist, i;	457	int last_dist, i;
393		458
394	if (op->more == NULL)	459	if (!op->more)
395	return op;	460	return op;
		461
396	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
397	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
398	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
399	return closest;	468	return closest;
400	}	469	}
401		470
402	/*	471	/*
403	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
404	*/	474	*/
405	object *	475	object *
406	find_object (tag_t i)	476	find_object (tag_t i)
407	{	477	{
408	for_all_objects (op)	478	for_all_objects (op)
…		…
848	object::destroy_inv (bool drop_to_ground)	918	object::destroy_inv (bool drop_to_ground)
849	{	919	{
850	// need to check first, because the checks below might segfault	920	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	921	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	922	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	923	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	924	// cf will crash below with off-map x and y
855	if (!inv)	925	if (!inv)
856	return;	926	return;
857		927
858	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
860	* drop on that space.	930	* drop on that space.
861	*/	931	*/
862	if (!drop_to_ground	932	if (!drop_to_ground
863	\|\| !map	933	\|\| !map
864	\|\| map->in_memory != MAP_IN_MEMORY	934	\|\| map->in_memory != MAP_ACTIVE
865	\|\| map->nodrop	935	\|\| map->nodrop
866	\|\| ms ().move_block == MOVE_ALL)	936	\|\| ms ().move_block == MOVE_ALL)
867	{	937	{
868	while (inv)	938	while (inv)
869	{	939	{
870	inv->destroy_inv (drop_to_ground);	940	inv->destroy_inv (false);
871	inv->destroy ();	941	inv->destroy ();
872	}	942	}
873	}	943	}
874	else	944	else
875	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
881	\|\| op->flag [FLAG_NO_DROP]	951	\|\| op->flag [FLAG_NO_DROP]
882	\|\| op->type == RUNE	952	\|\| op->type == RUNE
883	\|\| op->type == TRAP	953	\|\| op->type == TRAP
884	\|\| op->flag [FLAG_IS_A_TEMPLATE]	954	\|\| op->flag [FLAG_IS_A_TEMPLATE]
885	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	955	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
886	op->destroy ();	956	op->destroy (true);
887	else	957	else
888	map->insert (op, x, y);	958	map->insert (op, x, y);
889	}	959	}
890	}	960	}
891	}	961	}
…		…
898	}	968	}
899		969
900	void	970	void
901	object::do_destroy ()	971	object::do_destroy ()
902	{	972	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	974	remove_button_link (this);
907		975
908	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	977	remove_friendly_object (this);
910		978
911	if (!flag [FLAG_REMOVED])
912	remove ();	979	remove ();
913		980
914	destroy_inv (true);	981	attachable::do_destroy ();
915		982
916	deactivate ();	983	deactivate ();
917	unlink ();	984	unlink ();
918		985
919	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
…		…
931	freed_map->width = 3;	998	freed_map->width = 3;
932	freed_map->height = 3;	999	freed_map->height = 3;
933	freed_map->nodrop = 1;	1000	freed_map->nodrop = 1;
934		1001
935	freed_map->alloc ();	1002	freed_map->alloc ();
936	freed_map->in_memory = MAP_IN_MEMORY;	1003	freed_map->in_memory = MAP_ACTIVE;
937	}	1004	}
938		1005
939	map = freed_map;	1006	map = freed_map;
940	x = 1;	1007	x = 1;
941	y = 1;	1008	y = 1;
…		…
960	object::destroy (bool destroy_inventory)	1027	object::destroy (bool destroy_inventory)
961	{	1028	{
962	if (destroyed ())	1029	if (destroyed ())
963	return;	1030	return;
964		1031
		1032	if (!is_head () && !head->destroyed ())
		1033	{
		1034	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1035	head->destroy (destroy_inventory);
		1036	}
		1037
965	if (destroy_inventory)	1038	destroy_inv (!destroy_inventory);
966	destroy_inv (false);
967		1039
968	if (is_head ())	1040	if (is_head ())
969	if (sound_destroy)	1041	if (sound_destroy)
970	play_sound (sound_destroy);	1042	play_sound (sound_destroy);
971	else if (flag [FLAG_MONSTER])	1043	else if (flag [FLAG_MONSTER])
972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1044	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973		1045
974	attachable::destroy ();	1046	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	}	1047	}
993		1048
994	/* op->remove ():	1049	/* op->remove ():
995	* This function removes the object op from the linked list of objects	1050	* 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	1051	* which it is currently tied to. When this function is done, the
…		…
1002	object::do_remove ()	1057	object::do_remove ()
1003	{	1058	{
1004	object tmp, last = 0;	1059	object tmp, last = 0;
1005	object *otmp;	1060	object *otmp;
1006		1061
1007	if (QUERY_FLAG (this, FLAG_REMOVED))	1062	if (flag [FLAG_REMOVED])
1008	return;	1063	return;
1009		1064
1010	SET_FLAG (this, FLAG_REMOVED);
1011	INVOKE_OBJECT (REMOVE, this);	1065	INVOKE_OBJECT (REMOVE, this);
		1066
		1067	flag [FLAG_REMOVED] = true;
1012		1068
1013	if (more)	1069	if (more)
1014	more->remove ();	1070	more->remove ();
1015		1071
1016	/*	1072	/*
1017	* In this case, the object to be removed is in someones	1073	* In this case, the object to be removed is in someones
1018	* inventory.	1074	* inventory.
1019	*/	1075	*/
1020	if (env)	1076	if (env)
1021	{	1077	{
		1078	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1079	if (object *pl = visible_to ())
		1080	esrv_del_item (pl->contr, count);
		1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1082
		1083	adjust_weight (env, -total_weight ());
		1084
		1085	*(above ? &above->below : &env->inv) = below;
		1086
1022	if (nrof)	1087	if (below)
1023	sub_weight (env, weight * nrof);	1088	below->above = above;
1024	else	1089
1025	sub_weight (env, weight + carrying);	1090	/* we set up values so that it could be inserted into
		1091	* the map, but we don't actually do that - it is up
		1092	* to the caller to decide what we want to do.
		1093	*/
		1094	map = env->map;
		1095	x = env->x;
		1096	y = env->y;
		1097	above = 0;
		1098	below = 0;
		1099	env = 0;
1026		1100
1027	/* NO_FIX_PLAYER is set when a great many changes are being	1101	/* NO_FIX_PLAYER is set when a great many changes are being
1028	* made to players inventory. If set, avoiding the call	1102	* made to players inventory. If set, avoiding the call
1029	* to save cpu time.	1103	* to save cpu time.
1030	*/	1104	*/
1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1105	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1032	otmp->update_stats ();	1106	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	}	1107	}
1051	else if (map)	1108	else if (map)
1052	{	1109	{
1053	if (type == PLAYER)
1054	{
1055	// leaving a spot always closes any open container on the ground
1056	if (container && !container->env)
1057	// this causes spurious floorbox updates, but it ensures
1058	// that the CLOSE event is being sent.
1059	close_container ();
1060
1061	--map->players;
1062	map->touch ();
1063	}
1064
1065	map->dirty = true;	1110	map->dirty = true;
1066	mapspace &ms = this->ms ();	1111	mapspace &ms = this->ms ();
		1112
		1113	if (object *pl = ms.player ())
		1114	{
		1115	if (type == PLAYER) // this == pl(!)
		1116	{
		1117	// leaving a spot always closes any open container on the ground
		1118	if (container && !container->env)
		1119	// this causes spurious floorbox updates, but it ensures
		1120	// that the CLOSE event is being sent.
		1121	close_container ();
		1122
		1123	--map->players;
		1124	map->touch ();
		1125	}
		1126	else if (pl->container == this)
		1127	{
		1128	// removing a container should close it
		1129	close_container ();
		1130	}
		1131
		1132	esrv_del_item (pl->contr, count);
		1133	}
1067		1134
1068	/* link the object above us */	1135	/* link the object above us */
1069	if (above)	1136	if (above)
1070	above->below = below;	1137	above->below = below;
1071	else	1138	else
…		…
1101	* removed (most likely destroyed), update the player view	1168	* removed (most likely destroyed), update the player view
1102	* appropriately.	1169	* appropriately.
1103	*/	1170	*/
1104	pl->close_container ();	1171	pl->close_container ();
1105		1172
1106	pl->contr->ns->floorbox_update ();	1173	//TODO: the floorbox prev/next might need updating
		1174	esrv_del_item (pl->contr, count);
1107	}	1175	}
1108		1176
1109	for (tmp = ms.bot; tmp; tmp = tmp->above)	1177	for (tmp = ms.bot; tmp; tmp = tmp->above)
1110	{	1178	{
1111	/* No point updating the players look faces if he is the object	1179	/* No point updating the players look faces if he is the object
…		…
1155	if (!top)	1223	if (!top)
1156	for (top = op; top && top->above; top = top->above)	1224	for (top = op; top && top->above; top = top->above)
1157	;	1225	;
1158		1226
1159	for (; top; top = top->below)	1227	for (; top; top = top->below)
1160	{
1161	if (top == op)
1162	continue;
1163
1164	if (object::can_merge (op, top))	1228	if (object::can_merge (op, top))
1165	{	1229	{
1166	top->nrof += op->nrof;	1230	top->nrof += op->nrof;
1167		1231
1168	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1232	if (object *pl = top->visible_to ())
1169	op->weight = 0; /* Don't want any adjustements now */	1233	esrv_update_item (UPD_NROF, pl, top);
		1234
		1235	op->weight = 0; // cancel the addition above
		1236	op->carrying = 0; // must be 0 already
		1237
1170	op->destroy ();	1238	op->destroy (1);
		1239
1171	return top;	1240	return top;
1172	}	1241	}
1173	}
1174		1242
1175	return 0;	1243	return 0;
1176	}	1244	}
1177		1245
1178	void	1246	void
…		…
1237	object *	1305	object *
1238	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1306	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1239	{	1307	{
1240	assert (!op->flag [FLAG_FREED]);	1308	assert (!op->flag [FLAG_FREED]);
1241		1309
1242	object top, floor = NULL;
1243
1244	op->remove ();	1310	op->remove ();
1245		1311
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1312	/* Ideally, the caller figures this out. However, it complicates a lot
1247	* of areas of callers (eg, anything that uses find_free_spot would now	1313	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1314	* need extra work
1249	*/	1315	*/
1250	if (!xy_normalise (m, op->x, op->y))	1316	if (!xy_normalise (m, op->x, op->y))
1251	{	1317	{
1252	op->destroy ();	1318	op->destroy (1);
1253	return 0;	1319	return 0;
1254	}	1320	}
1255		1321
1256	if (object *more = op->more)	1322	if (object *more = op->more)
1257	if (!insert_ob_in_map (more, m, originator, flag))	1323	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1266	*/	1332	*/
1267	if (op->nrof && !(flag & INS_NO_MERGE))	1333	if (op->nrof && !(flag & INS_NO_MERGE))
1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269	if (object::can_merge (op, tmp))	1335	if (object::can_merge (op, tmp))
1270	{	1336	{
		1337	// TODO: we atcually want to update tmp, not op,
		1338	// but some caller surely breaks when we return tmp
		1339	// from here :/
1271	op->nrof += tmp->nrof;	1340	op->nrof += tmp->nrof;
1272	tmp->destroy ();	1341	tmp->destroy (1);
1273	}	1342	}
1274		1343
1275	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1344	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1276	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1345	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1277		1346
…		…
1297	/* since below originator, no need to update top */	1366	/* since below originator, no need to update top */
1298	originator->below = op;	1367	originator->below = op;
1299	}	1368	}
1300	else	1369	else
1301	{	1370	{
		1371	object top, floor = NULL;
		1372
1302	top = ms.bot;	1373	top = ms.bot;
1303		1374
1304	/* If there are other objects, then */	1375	/* If there are other objects, then */
1305	if (top)	1376	if (top)
1306	{	1377	{
…		…
1405	}	1476	}
1406		1477
1407	op->map->dirty = true;	1478	op->map->dirty = true;
1408		1479
1409	if (object *pl = ms.player ())	1480	if (object *pl = ms.player ())
1410	pl->contr->ns->floorbox_update ();	1481	//TODO: the floorbox prev/next might need updating
		1482	esrv_send_item (pl, op);
1411		1483
1412	/* If this object glows, it may affect lighting conditions that are	1484	/* If this object glows, it may affect lighting conditions that are
1413	* visible to others on this map. But update_all_los is really	1485	* visible to others on this map. But update_all_los is really
1414	* an inefficient way to do this, as it means los for all players	1486	* an inefficient way to do this, as it means los for all players
1415	* on the map will get recalculated. The players could very well	1487	* on the map will get recalculated. The players could very well
…		…
1457	* op is the object to insert it under: supplies x and the map.	1529	* op is the object to insert it under: supplies x and the map.
1458	*/	1530	*/
1459	void	1531	void
1460	replace_insert_ob_in_map (const char arch_string, object op)	1532	replace_insert_ob_in_map (const char arch_string, object op)
1461	{	1533	{
1462	object tmp, tmp1;
1463
1464	/* first search for itself and remove any old instances */	1534	/* first search for itself and remove any old instances */
1465		1535
1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1536	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1537	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1468	tmp->destroy ();	1538	tmp->destroy (1);
1469		1539
1470	tmp1 = arch_to_object (archetype::find (arch_string));	1540	object *tmp = arch_to_object (archetype::find (arch_string));
1471		1541
1472	tmp1->x = op->x;	1542	tmp->x = op->x;
1473	tmp1->y = op->y;	1543	tmp->y = op->y;
		1544
1474	insert_ob_in_map (tmp1, op->map, op, 0);	1545	insert_ob_in_map (tmp, op->map, op, 0);
1475	}	1546	}
1476		1547
1477	object *	1548	object *
1478	object::insert_at (object where, object originator, int flags)	1549	object::insert_at (object where, object originator, int flags)
1479	{	1550	{
		1551	if (where->env)
		1552	return where->env->insert (this);
		1553	else
1480	return where->map->insert (this, where->x, where->y, originator, flags);	1554	return where->map->insert (this, where->x, where->y, originator, flags);
1481	}	1555	}
1482		1556
1483	/*	1557	/*
1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1485	* is returned contains nr objects, and the remaining parts contains
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	{
1493	object *newob;
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	}
1501
1502	newob = object_create_clone (orig_ob);
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	}
1516	}
1517
1518	newob->nrof = nr;
1519
1520	return newob;
1521	}
1522
1523	/*
1524	* decrease_ob_nr(object, number) decreases a specified number from	1558	* decrease(object, number) decreases a specified number from
1525	* the amount of an object. If the amount reaches 0, the object	1559	* the amount of an object. If the amount reaches 0, the object
1526	* is subsequently removed and freed.	1560	* is subsequently removed and freed.
1527	*	1561	*
1528	* Return value: 'op' if something is left, NULL if the amount reached 0	1562	* Return value: 'op' if something is left, NULL if the amount reached 0
1529	*/	1563	*/
		1564	bool
		1565	object::decrease (sint32 nr)
		1566	{
		1567	if (!nr)
		1568	return true;
		1569
		1570	nr = min (nr, nrof);
		1571
		1572	nrof -= nr;
		1573
		1574	if (nrof)
		1575	{
		1576	adjust_weight (env, -weight * nr); // carrying == 0
		1577
		1578	if (object *pl = visible_to ())
		1579	esrv_update_item (UPD_NROF, pl, this);
		1580
		1581	return true;
		1582	}
		1583	else
		1584	{
		1585	destroy (1);
		1586	return false;
		1587	}
		1588	}
		1589
		1590	/*
		1591	* split(ob,nr) splits up ob into two parts. The part which
		1592	* is returned contains nr objects, and the remaining parts contains
		1593	* the rest (or is removed and returned if that number is 0).
		1594	* On failure, NULL is returned.
		1595	*/
1530	object *	1596	object *
1531	decrease_ob_nr (object *op, uint32 i)	1597	object::split (sint32 nr)
1532	{	1598	{
1533	object *tmp;	1599	int have = number_of ();
1534		1600
1535	if (i == 0) /* objects with op->nrof require this check */	1601	if (have < nr)
1536	return op;	1602	return 0;
1537		1603	else if (have == 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	{	1604	{
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 ();	1605	remove ();
1573	op->nrof = 0;	1606	return this;
1574	if (tmp)
1575	esrv_del_item (tmp->contr, op->count);
1576	}
1577	}	1607	}
1578	else	1608	else
1579	{	1609	{
1580	object *above = op->above;	1610	decrease (nr);
1581		1611
1582	if (i < op->nrof)	1612	object *op = object_create_clone (this);
1583	op->nrof -= i;	1613	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;	1614	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	}	1615	}
1625	}	1616	}
1626		1617
1627	object *	1618	object *
1628	insert_ob_in_ob (object op, object where)	1619	insert_ob_in_ob (object op, object where)
…		…
1653	* be != op, if items are merged. -Tero	1644	* be != op, if items are merged. -Tero
1654	*/	1645	*/
1655	object *	1646	object *
1656	object::insert (object *op)	1647	object::insert (object *op)
1657	{	1648	{
1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1659	op->remove ();
1660
1661	if (op->more)	1649	if (op->more)
1662	{	1650	{
1663	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1651	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1664	return op;	1652	return op;
1665	}	1653	}
1666		1654
1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1655	op->remove ();
1668	CLEAR_FLAG (op, FLAG_REMOVED);	1656
		1657	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669		1658
1670	if (op->nrof)	1659	if (op->nrof)
1671	{
1672	for (object *tmp = inv; tmp; tmp = tmp->below)	1660	for (object *tmp = inv; tmp; tmp = tmp->below)
1673	if (object::can_merge (tmp, op))	1661	if (object::can_merge (tmp, op))
1674	{	1662	{
1675	/* return the original object and remove inserted object	1663	/* return the original object and remove inserted object
1676	(client needs the original object) */	1664	(client needs the original object) */
1677	tmp->nrof += op->nrof;	1665	tmp->nrof += op->nrof;
1678	/* Weight handling gets pretty funky. Since we are adding to	1666
1679	* tmp->nrof, we need to increase the weight.	1667	if (object *pl = tmp->visible_to ())
1680	*/	1668	esrv_update_item (UPD_NROF, pl, tmp);
		1669
1681	add_weight (this, op->weight * op->nrof);	1670	adjust_weight (this, op->total_weight ());
1682	SET_FLAG (op, FLAG_REMOVED);	1671
1683	op->destroy (); /* free the inserted object */	1672	op->destroy (1);
1684	op = tmp;	1673	op = tmp;
1685	op->remove (); /* and fix old object's links */	1674	goto inserted;
1686	CLEAR_FLAG (op, FLAG_REMOVED);
1687	break;
1688	}	1675	}
1689		1676
1690	/* I assume combined objects have no inventory
1691	* We add the weight - this object could have just been removed
1692	* (if it was possible to merge). calling remove_ob will subtract
1693	* the weight, so we need to add it in again, since we actually do
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
1701	if (object *otmp = this->in_player ())
1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1703	otmp->update_stats ();
1704
1705	op->owner = 0; // its his/hers now. period.	1677	op->owner = 0; // it's his/hers now. period.
1706	op->map = 0;	1678	op->map = 0;
		1679	op->x = 0;
		1680	op->y = 0;
		1681
		1682	op->above = 0;
		1683	op->below = inv;
1707	op->env = this;	1684	op->env = this;
1708	op->above = 0;
1709	op->below = 0;
1710	op->x = op->y = 0;
1711		1685
		1686	if (inv)
		1687	inv->above = op;
		1688
		1689	inv = op;
		1690
		1691	op->flag [FLAG_REMOVED] = 0;
		1692
		1693	if (object *pl = op->visible_to ())
		1694	esrv_send_item (pl, op);
		1695
		1696	adjust_weight (this, op->total_weight ());
		1697
		1698	inserted:
1712	/* reset the light list and los of the players on the map */	1699	/* reset the light list and los of the players on the map */
1713	if (op->glow_radius && map)	1700	if (op->glow_radius && map && map->darkness)
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);	1701	update_all_los (map, x, y);
1720	}
1721		1702
1722	/* Client has no idea of ordering so lets not bother ordering it here.	1703	// if this is a player's inventory, update stats
1723	* It sure simplifies this function...	1704	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1724	*/	1705	update_stats ();
1725	if (!inv)
1726	inv = op;
1727	else
1728	{
1729	op->below = inv;
1730	op->below->above = op;
1731	inv = op;
1732	}
1733		1706
1734	INVOKE_OBJECT (INSERT, this);	1707	INVOKE_OBJECT (INSERT, this);
1735		1708
1736	return op;	1709	return op;
1737	}	1710	}
…		…
2607	{	2580	{
2608	char flagdesc[512];	2581	char flagdesc[512];
2609	char info2[256 * 4];	2582	char info2[256 * 4];
2610	char *p = info;	2583	char *p = info;
2611		2584
2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2585	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613	count, uuid.seq,	2586	count,
		2587	uuid.c_str (),
2614	&name,	2588	&name,
2615	title ? "\",title:\"" : "",	2589	title ? "\",title:\"" : "",
2616	title ? (const char *)title : "",	2590	title ? (const char *)title : "",
2617	flag_desc (flagdesc, 512), type);	2591	flag_desc (flagdesc, 512), type);
2618		2592
2619	if (!this->flag[FLAG_REMOVED] && env)	2593	if (!flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2595
2622	if (map)	2596	if (map)
2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2597	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624		2598
…		…
2654	object::open_container (object *new_container)	2628	object::open_container (object *new_container)
2655	{	2629	{
2656	if (container == new_container)	2630	if (container == new_container)
2657	return;	2631	return;
2658		2632
2659	if (object *old_container = container)	2633	object *old_container = container;
		2634
		2635	if (old_container)
2660	{	2636	{
2661	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2637	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2662	return;	2638	return;
2663		2639
2664	#if 0	2640	#if 0
…		…
2666	if (object *closer = old_container->inv)	2642	if (object *closer = old_container->inv)
2667	if (closer->type == CLOSE_CON)	2643	if (closer->type == CLOSE_CON)
2668	closer->destroy ();	2644	closer->destroy ();
2669	#endif	2645	#endif
2670		2646
		2647	// make sure the container is available
		2648	esrv_send_item (this, old_container);
		2649
2671	old_container->flag [FLAG_APPLIED] = 0;	2650	old_container->flag [FLAG_APPLIED] = false;
2672	container = 0;	2651	container = 0;
2673		2652
		2653	// client needs item update to make it work, client bug requires this to be separate
2674	esrv_update_item (UPD_FLAGS, this, old_container);	2654	esrv_update_item (UPD_FLAGS, this, old_container);
		2655
2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2676	play_sound (sound_find ("chest_close"));	2657	play_sound (sound_find ("chest_close"));
2677	}	2658	}
2678		2659
2679	if (new_container)	2660	if (new_container)
…		…
2692	}	2673	}
2693	#endif	2674	#endif
2694		2675
2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2696		2677
		2678	// make sure the container is available, client bug requires this to be separate
		2679	esrv_send_item (this, new_container);
		2680
2697	new_container->flag [FLAG_APPLIED] = 1;	2681	new_container->flag [FLAG_APPLIED] = true;
2698	container = new_container;	2682	container = new_container;
2699		2683
		2684	// client needs flag change
2700	esrv_update_item (UPD_FLAGS, this, new_container);	2685	esrv_update_item (UPD_FLAGS, this, new_container);
2701	esrv_send_inventory (this, new_container);	2686	esrv_send_inventory (this, new_container);
2702	play_sound (sound_find ("chest_open"));	2687	play_sound (sound_find ("chest_open"));
2703	}	2688	}
		2689	// else if (!old_container->env && contr && contr->ns)
		2690	// contr->ns->floorbox_reset ();
2704	}	2691	}
2705		2692
2706	object *	2693	object *
2707	object::force_find (const shstr name)	2694	object::force_find (const shstr name)
2708	{	2695	{
…		…
2734		2721
2735	insert (force);	2722	insert (force);
2736	}	2723	}
2737		2724
2738	void	2725	void
2739	object::play_sound (faceidx sound) const	2726	object::play_sound (faceidx sound)
2740	{	2727	{
2741	if (!sound)	2728	if (!sound)
2742	return;	2729	return;
2743		2730
2744	if (flag [FLAG_REMOVED])	2731	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.202 by root, Thu Apr 10 15:35:15 2008 UTC vs. Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.202 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC