ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.255 by root, Sun Aug 31 02:01:41 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;
140
141	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
142	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
143	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
144	*/	147	*/
145		148
146	/* For each field in wants, */	149	/* For each field in wants, */
147	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
148	{	151	if (has->kv_get (kv->key) != kv->value)
149	key_value *has_field;	152	return false;
150
151	/* Look for a field in has with the same key. */
152	has_field = get_ob_key_link (has, wants_field->key);
153
154	if (has_field == NULL)
155	{
156	/* No field with that name. */
157	return FALSE;
158	}
159
160	/* Found the matching field. */
161	if (has_field->value != wants_field->value)
162	{
163	/* Values don't match, so this half of the comparison is false. */
164	return FALSE;
165	}
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		153
170	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
171	return TRUE;	155	return true;
172	}	156	}
173		157
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static int	159	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	161	{
178	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
180	*/	164	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
182	}	167	}
183		168
184	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	170	* they can be merged together.
186	*	171	*
…		…
201	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
204	return 0;	189	return 0;
205		190
206	//TODO: this ain't working well, use nicer and correct overflow check
207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	191	/* Do not merge objects if nrof would overflow, assume nrof
208	* value could not be stored in a sint32 (which unfortunately sometimes is	192	* is always 0 .. 2**31-1 */
209	* used to store nrof).	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
210	*/
211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
212	return 0;	194	return 0;
213		195
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* 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	197	* 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	198	* 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	199	* are not equal - just if it has been identified, the been_applied
218	* flags lose any meaning.	200	* flags lose any meaning.
219	*/	201	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	202	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		204
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		207
226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	208	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	209	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	210	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	211	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	212	|| 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	213	|| ob1->attacktype != ob2->attacktype
235	|| ob1->magic != ob2->magic	214	|| ob1->magic != ob2->magic
236	|| ob1->slaying != ob2->slaying	215	|| ob1->slaying != ob2->slaying
237	|| ob1->skill != ob2->skill	216	|| ob1->skill != ob2->skill
238	|| ob1->value != ob2->value	217	|| ob1->value != ob2->value
239	|| ob1->animation_id != ob2->animation_id	218	|| ob1->animation_id != ob2->animation_id
		219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
240	|| ob1->client_type != ob2->client_type	220	|| ob1->client_type != ob2->client_type
241	|| ob1->materialname != ob2->materialname	221	|| ob1->materialname != ob2->materialname
242	|| ob1->lore != ob2->lore	222	|| ob1->lore != ob2->lore
243	|| ob1->subtype != ob2->subtype	223	|| ob1->subtype != ob2->subtype
244	|| ob1->move_type != ob2->move_type	224	|| ob1->move_type != ob2->move_type
245	|| ob1->move_block != ob2->move_block	225	|| ob1->move_block != ob2->move_block
246	|| ob1->move_allow != ob2->move_allow	226	|| ob1->move_allow != ob2->move_allow
247	|| ob1->move_on != ob2->move_on	227	|| ob1->move_on != ob2->move_on
248	|| ob1->move_off != ob2->move_off	228	|| ob1->move_off != ob2->move_off
249	|| ob1->move_slow != ob2->move_slow	229	|| ob1->move_slow != ob2->move_slow
250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	230	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
251	return 0;	233	return 0;
252		234
		235	if ((ob1->flag ^ ob2->flag)
		236	.reset (FLAG_INV_LOCKED)
		237	.reset (FLAG_REMOVED)
		238	.any ())
		239	return 0;
		240
253	/* This is really a spellbook check - really, we should	241	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	242	* not merge objects with real inventories, as splitting them
		243	* is hard.
255	*/	244	*/
256	if (ob1->inv || ob2->inv)	245	if (ob1->inv || ob2->inv)
257	{	246	{
258	if (!(ob1->inv && ob2->inv))	247	if (!(ob1->inv && ob2->inv))
259	return 0; /* inventories differ in length */	248	return 0; /* inventories differ in length */
260		249
261	if (ob1->inv->below || ob2->inv->below)	250	if (ob1->inv->below || ob2->inv->below)
262	return 0; /* more than one object in inv */	251	return 0; /* more than one object in inv */
263		252
264	if (!object::can_merge (ob1->inv, ob2->inv))	253	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0; /* inventory objexts differ */	254	return 0; /* inventory objects differ */
266		255
267	/* inventory ok - still need to check rest of this object to see	256	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	257	* if it is valid.
269	*/	258	*/
270	}	259	}
…		…
289	if (ob1->level != ob2->level)	278	if (ob1->level != ob2->level)
290	return 0;	279	return 0;
291	break;	280	break;
292	}	281	}
293		282
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	283	if (ob1->key_values || ob2->key_values)
295	{	284	{
296	/* At least one of these has key_values. */	285	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	286	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	287	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	288
300	else if (!compare_ob_value_lists (ob1, ob2))	289	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	290	return 0;
302	}	291	}
303		292
304	if (ob1->self || ob2->self)	293	if (ob1->self || ob2->self)
305	{	294	{
…		…
311	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	300	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	301	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313		302
314	if (k1 != k2)	303	if (k1 != k2)
315	return 0;	304	return 0;
		305
316	else if (k1 == 0)	306	if (k1 == 0)
317	return 1;	307	return 1;
		308
318	else if (!cfperl_can_merge (ob1, ob2))	309	if (!cfperl_can_merge (ob1, ob2))
319	return 0;	310	return 0;
320	}	311	}
321	}	312	}
322		313
323	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
324	return 1;	315	return 1;
325	}	316	}
326		317
		318	// find player who can see this object
		319	object *
		320	object::visible_to () const
		321	{
		322	if (client_visible () && !flag [FLAG_REMOVED])
		323	{
		324	// see if we are in a container of sorts
		325	if (env)
		326	{
		327	// the player inventory itself is always visible
		328	if (env->type == PLAYER)
		329	return env;
		330
		331	// else a player could have our env open
		332	object *envest = env->outer_env ();
		333
		334	// the player itself is always on a map, so we will find him here
		335	// even if our inv is in a player.
		336	if (envest->is_on_map ())
		337	if (object *pl = envest->ms ().player ())
		338	if (pl->container == env)
		339	return pl;
		340	}
		341	else
		342	{
		343	// maybe there is a player standing on the same mapspace
		344	// this will catch the case where "this" is a player
		345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		347	|| this == pl->container)
		348	return pl;
		349	}
		350	}
		351
		352	return 0;
		353	}
		354
		355	// adjust weight per container type ("of holding")
		356	static sint32
		357	weight_adjust_for (object *op, sint32 weight)
		358	{
		359	return op->type == CONTAINER
		360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		361	: weight;
		362	}
		363
327	/*	364	/*
		365	* adjust_weight(object, weight) adds the specified weight to an object,
		366	* and also updates how much the environment(s) is/are carrying.
		367	*/
		368	static void
		369	adjust_weight (object *op, sint32 weight)
		370	{
		371	while (op)
		372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
		377
		378	if (!weight)
		379	return;
		380
		381	op->carrying += weight;
		382
		383	if (object *pl = op->visible_to ())
		384	if (pl != op) // player is handled lazily
		385	esrv_update_item (UPD_WEIGHT, pl, op);
		386
		387	op = op->env;
		388	}
		389	}
		390
		391	/*
328	* sum_weight() is a recursive function which calculates the weight	392	* this is a recursive function which calculates the weight
329	* an object is carrying. It goes through in figures out how much	393	* an object is carrying. It goes through op and figures out how much
330	* containers are carrying, and sums it up.	394	* containers are carrying, and sums it up.
331	*/	395	*/
332	long	396	void
333	sum_weight (object *op)	397	object::update_weight ()
334	{	398	{
335	long sum;	399	sint32 sum = 0;
336	object *inv;
337		400
338	for (sum = 0, inv = op->inv; inv; inv = inv->below)	401	for (object *op = inv; op; op = op->below)
339	{	402	{
340	if (inv->inv)	403	if (op->inv)
341	sum_weight (inv);	404	op->update_weight ();
342		405
343	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	406	sum += op->total_weight ();
		407	}
		408
		409	sum = weight_adjust_for (this, sum);
		410
		411	if (sum != carrying)
344	}	412	{
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;	413	carrying = sum;
351		414
352	return sum;	415	if (object *pl = visible_to ())
		416	if (pl != this) // player is handled lazily
		417	esrv_update_item (UPD_WEIGHT, pl, this);
		418	}
353	}	419	}
354		420
355	/**	421	/*
356	* Return the outermost environment object for a given object.	422	* 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	*/	423	*/
372	char *	424	char *
373	dump_object (object *op)	425	dump_object (object *op)
374	{	426	{
375	if (!op)	427	if (!op)
…		…
389	get_nearest_part (object *op, const object *pl)	441	get_nearest_part (object *op, const object *pl)
390	{	442	{
391	object *tmp, *closest;	443	object *tmp, *closest;
392	int last_dist, i;	444	int last_dist, i;
393		445
394	if (op->more == NULL)	446	if (!op->more)
395	return op;	447	return op;
		448
396	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	449	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		450	tmp;
		451	tmp = tmp->more)
397	if ((i = distance (tmp, pl)) < last_dist)	452	if ((i = distance (tmp, pl)) < last_dist)
398	closest = tmp, last_dist = i;	453	closest = tmp, last_dist = i;
		454
399	return closest;	455	return closest;
400	}	456	}
401		457
402	/*	458	/*
403	* Returns the object which has the count-variable equal to the argument.	459	* Returns the object which has the count-variable equal to the argument.
		460	* VERRRY slow.
404	*/	461	*/
405	object *	462	object *
406	find_object (tag_t i)	463	find_object (tag_t i)
407	{	464	{
408	for_all_objects (op)	465	for_all_objects (op)
…		…
419	*/	476	*/
420	object *	477	object *
421	find_object_name (const char *str)	478	find_object_name (const char *str)
422	{	479	{
423	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
424	object *op;
425		481
		482	if (str_)
426	for_all_objects (op)	483	for_all_objects (op)
427	if (op->name == str_)	484	if (op->name == str_)
428	break;	485	return op;
429		486
430	return op;	487	return 0;
431	}	488	}
432		489
433	/*	490	/*
434	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
435	* skill and experience objects.	492	* skill and experience objects.
…		…
533	}	590	}
534		591
535	op->key_values = 0;	592	op->key_values = 0;
536	}	593	}
537		594
538	object &	595	/*
539	object::operator =(const object &src)	596	* copy_to first frees everything allocated by the dst object,
		597	* and then copies the contents of itself into the second
		598	* object, allocating what needs to be allocated. Basically, any
		599	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		600	* if the first object is freed, the pointers in the new object
		601	* will point at garbage.
		602	*/
		603	void
		604	object::copy_to (object *dst)
540	{	605	{
541	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
542	bool is_removed = flag [FLAG_REMOVED];
543
544	*(object_copy *)this = src;	607	*(object_copy *)dst = *this;
545
546	flag [FLAG_FREED] = is_freed;
547	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
548		609
549	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
550	if (src.key_values)	611	if (key_values)
551	{	612	{
552	key_value *tail = 0;	613	key_value *tail = 0;
553	key_values = 0;	614	dst->key_values = 0;
554		615
555	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
556	{	617	{
557	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
558		619
559	new_link->next = 0;	620	new_link->next = 0;
560	new_link->key = i->key;	621	new_link->key = i->key;
561	new_link->value = i->value;	622	new_link->value = i->value;
562		623
563	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
564	if (!key_values)	625	if (!dst->key_values)
565	{	626	{
566	key_values = new_link;	627	dst->key_values = new_link;
567	tail = new_link;	628	tail = new_link;
568	}	629	}
569	else	630	else
570	{	631	{
571	tail->next = new_link;	632	tail->next = new_link;
572	tail = new_link;	633	tail = new_link;
573	}	634	}
574	}	635	}
575	}	636	}
576	}
577
578	/*
579	* copy_to first frees everything allocated by the dst object,
580	* and then copies the contents of itself into the second
581	* object, allocating what needs to be allocated. Basically, any
582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
583	* if the first object is freed, the pointers in the new object
584	* will point at garbage.
585	*/
586	void
587	object::copy_to (object *dst)
588	{
589	*dst = *this;
590		637
591	if (speed < 0)	638	if (speed < 0)
592	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
593		640
594	dst->set_speed (dst->speed);	641	dst->set_speed (dst->speed);
…		…
616	object *	663	object *
617	object::clone ()	664	object::clone ()
618	{	665	{
619	object *neu = create ();	666	object *neu = create ();
620	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
621	return neu;	669	return neu;
622	}	670	}
623		671
624	/*	672	/*
625	* If an object with the IS_TURNABLE() flag needs to be turned due	673	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
676	* UP_OBJ_FACE: only the objects face has changed.	724	* UP_OBJ_FACE: only the objects face has changed.
677	*/	725	*/
678	void	726	void
679	update_object (object *op, int action)	727	update_object (object *op, int action)
680	{	728	{
681	if (op == NULL)	729	if (!op)
682	{	730	{
683	/* this should never happen */	731	/* this should never happen */
684	LOG (llevDebug, "update_object() called for NULL object.\n");	732	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
685	return;	733	return;
686	}	734	}
687		735
688	if (op->env)	736	if (!op->is_on_map ())
689	{	737	{
690	/* Animation is currently handled by client, so nothing	738	/* Animation is currently handled by client, so nothing
691	* to do in this case.	739	* to do in this case.
692	*/	740	*/
693	return;	741	return;
694	}	742	}
695
696	/* If the map is saving, don't do anything as everything is
697	* going to get freed anyways.
698	*/
699	if (!op->map || op->map->in_memory == MAP_SAVING)
700	return;
701		743
702	/* make sure the object is within map boundaries */	744	/* make sure the object is within map boundaries */
703	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	745	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
704	{	746	{
705	LOG (llevError, "update_object() called for object out of map!\n");	747	LOG (llevError, "update_object() called for object out of map!\n");
…		…
724	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
725	|| (m.move_on | op->move_on ) != m.move_on	767	|| (m.move_on | op->move_on ) != m.move_on
726	|| (m.move_off | op->move_off ) != m.move_off	768	|| (m.move_off | op->move_off ) != m.move_off
727	|| (m.move_slow | op->move_slow) != m.move_slow	769	|| (m.move_slow | op->move_slow) != m.move_slow
728	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
729	* to have move_allow right now.	771	* have move_allow right now.
730	*/	772	*/
731	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	773	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
732	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
733	m.flags_ = 0;	775	m.flags_ = 0;
734	}	776	}
…		…
848	object::destroy_inv (bool drop_to_ground)	890	object::destroy_inv (bool drop_to_ground)
849	{	891	{
850	// need to check first, because the checks below might segfault	892	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	893	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	894	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	895	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	896	// cf will crash below with off-map x and y
855	if (!inv)	897	if (!inv)
856	return;	898	return;
857		899
858	/* Only if the space blocks everything do we not process -	900	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	901	* if some form of movement is allowed, let objects
860	* drop on that space.	902	* drop on that space.
861	*/	903	*/
862	if (!drop_to_ground	904	if (!drop_to_ground
863	|| !map	905	|| !map
864	|| map->in_memory != MAP_IN_MEMORY	906	|| map->in_memory != MAP_ACTIVE
865	|| map->nodrop	907	|| map->no_drop
866	|| ms ().move_block == MOVE_ALL)	908	|| ms ().move_block == MOVE_ALL)
867	{	909	{
868	while (inv)	910	while (inv)
869	{
870	inv->destroy_inv (drop_to_ground);
871	inv->destroy ();	911	inv->destroy (true);
872	}
873	}	912	}
874	else	913	else
875	{ /* Put objects in inventory onto this space */	914	{ /* Put objects in inventory onto this space */
876	while (inv)	915	while (inv)
877	{	916	{
…		…
881	|| op->flag [FLAG_NO_DROP]	920	|| op->flag [FLAG_NO_DROP]
882	|| op->type == RUNE	921	|| op->type == RUNE
883	|| op->type == TRAP	922	|| op->type == TRAP
884	|| op->flag [FLAG_IS_A_TEMPLATE]	923	|| op->flag [FLAG_IS_A_TEMPLATE]
885	|| op->flag [FLAG_DESTROY_ON_DEATH])	924	|| op->flag [FLAG_DESTROY_ON_DEATH])
886	op->destroy ();	925	op->destroy (true);
887	else	926	else
888	map->insert (op, x, y);	927	map->insert (op, x, y);
889	}	928	}
890	}	929	}
891	}	930	}
…		…
895	object *op = new object;	934	object *op = new object;
896	op->link ();	935	op->link ();
897	return op;	936	return op;
898	}	937	}
899		938
		939	static struct freed_map : maptile
		940	{
		941	freed_map ()
		942	{
		943	path = "<freed objects map>";
		944	name = "/internal/freed_objects_map";
		945	width = 3;
		946	height = 3;
		947	no_drop = 1;
		948	no_reset = 1;
		949
		950	alloc ();
		951	in_memory = MAP_ACTIVE;
		952	}
		953
		954	~freed_map ()
		955	{
		956	destroy ();
		957	}
		958	} freed_map; // freed objects are moved here to avoid crashes
		959
900	void	960	void
901	object::do_destroy ()	961	object::do_destroy ()
902	{	962	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	963	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	964	remove_button_link (this);
907		965
908	if (flag [FLAG_FRIENDLY])	966	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	967	remove_friendly_object (this);
910		968
911	if (!flag [FLAG_REMOVED])
912	remove ();	969	remove ();
913		970
914	destroy_inv (true);	971	attachable::do_destroy ();
915		972
916	deactivate ();	973	deactivate ();
917	unlink ();	974	unlink ();
918		975
919	flag [FLAG_FREED] = 1;	976	flag [FLAG_FREED] = 1;
920		977
921	// hack to ensure that freed objects still have a valid map	978	// hack to ensure that freed objects still have a valid map
922	{
923	static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925	if (!freed_map)
926	{
927	freed_map = new maptile;
928
929	freed_map->path = "<freed objects map>";
930	freed_map->name = "/internal/freed_objects_map";
931	freed_map->width = 3;
932	freed_map->height = 3;
933	freed_map->nodrop = 1;
934
935	freed_map->alloc ();
936	freed_map->in_memory = MAP_IN_MEMORY;
937	}
938
939	map = freed_map;	979	map = &freed_map;
940	x = 1;	980	x = 1;
941	y = 1;	981	y = 1;
942	}
943		982
944	if (more)	983	if (more)
945	{	984	{
946	more->destroy ();	985	more->destroy ();
947	more = 0;	986	more = 0;
…		…
960	object::destroy (bool destroy_inventory)	999	object::destroy (bool destroy_inventory)
961	{	1000	{
962	if (destroyed ())	1001	if (destroyed ())
963	return;	1002	return;
964		1003
		1004	if (!is_head () && !head->destroyed ())
		1005	{
		1006	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1007	head->destroy (destroy_inventory);
		1008	return;
		1009	}
		1010
965	if (destroy_inventory)	1011	destroy_inv (!destroy_inventory);
966	destroy_inv (false);
967		1012
968	if (is_head ())	1013	if (is_head ())
969	if (sound_destroy)	1014	if (sound_destroy)
970	play_sound (sound_destroy);	1015	play_sound (sound_destroy);
971	else if (flag [FLAG_MONSTER])	1016	else if (flag [FLAG_MONSTER])
972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1017	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973		1018
974	attachable::destroy ();	1019	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	}	1020	}
993		1021
994	/* op->remove ():	1022	/* op->remove ():
995	* This function removes the object op from the linked list of objects	1023	* 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	1024	* which it is currently tied to. When this function is done, the
…		…
1002	object::do_remove ()	1030	object::do_remove ()
1003	{	1031	{
1004	object *tmp, *last = 0;	1032	object *tmp, *last = 0;
1005	object *otmp;	1033	object *otmp;
1006		1034
1007	if (QUERY_FLAG (this, FLAG_REMOVED))	1035	if (flag [FLAG_REMOVED])
1008	return;	1036	return;
1009		1037
1010	SET_FLAG (this, FLAG_REMOVED);
1011	INVOKE_OBJECT (REMOVE, this);	1038	INVOKE_OBJECT (REMOVE, this);
		1039
		1040	flag [FLAG_REMOVED] = true;
1012		1041
1013	if (more)	1042	if (more)
1014	more->remove ();	1043	more->remove ();
1015		1044
1016	/*	1045	/*
1017	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1018	* inventory.	1047	* inventory.
1019	*/	1048	*/
1020	if (env)	1049	if (env)
1021	{	1050	{
1022	if (nrof)	1051	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1023	sub_weight (env, weight * nrof);	1052	if (object *pl = visible_to ())
1024	else	1053	esrv_del_item (pl->contr, count);
1025	sub_weight (env, weight + carrying);	1054	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1055
		1056	adjust_weight (env, -total_weight ());
		1057
		1058	/* we set up values so that it could be inserted into
		1059	* the map, but we don't actually do that - it is up
		1060	* to the caller to decide what we want to do.
		1061	*/
		1062	map = env->map;
		1063	x = env->x;
		1064	y = env->y;
		1065
		1066	// make sure cmov optimisation is applicable
		1067	*(above ? &above->below : &env->inv) = below;
		1068	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1069
		1070	above = 0;
		1071	below = 0;
		1072	env = 0;
1026		1073
1027	/* NO_FIX_PLAYER is set when a great many changes are being	1074	/* NO_FIX_PLAYER is set when a great many changes are being
1028	* made to players inventory. If set, avoiding the call	1075	* made to players inventory. If set, avoiding the call
1029	* to save cpu time.	1076	* to save cpu time.
1030	*/	1077	*/
1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1078	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1032	otmp->update_stats ();	1079	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	}	1080	}
1051	else if (map)	1081	else if (map)
1052	{	1082	{
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;	1083	map->dirty = true;
1066	mapspace &ms = this->ms ();	1084	mapspace &ms = this->ms ();
1067		1085
		1086	if (object *pl = ms.player ())
		1087	{
		1088	if (type == PLAYER) // this == pl(!)
		1089	{
		1090	// leaving a spot always closes any open container on the ground
		1091	if (container && !container->env)
		1092	// this causes spurious floorbox updates, but it ensures
		1093	// that the CLOSE event is being sent.
		1094	close_container ();
		1095
		1096	--map->players;
		1097	map->touch ();
		1098	}
		1099	else if (pl->container == this)
		1100	{
		1101	// removing a container should close it
		1102	close_container ();
		1103	}
		1104
		1105	esrv_del_item (pl->contr, count);
		1106	}
		1107
1068	/* link the object above us */	1108	/* link the object above us */
1069	if (above)	1109	// re-link, make sure compiler can easily use cmove
1070	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1071	else	1111	*(below ? &below->above : &ms.bot) = above;
1072	ms.top = below; /* we were top, set new top */
1073
1074	/* Relink the object below us, if there is one */
1075	if (below)
1076	below->above = above;
1077	else
1078	{
1079	/* Nothing below, which means we need to relink map object for this space
1080	* use translated coordinates in case some oddness with map tiling is
1081	* evident
1082	*/
1083	if (GET_MAP_OB (map, x, y) != this)
1084	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1085
1086	ms.bot = above; /* goes on above it. */
1087	}
1088		1112
1089	above = 0;	1113	above = 0;
1090	below = 0;	1114	below = 0;
		1115
		1116	ms.flags_ = 0;
1091		1117
1092	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1093	return;	1119	return;
1094		1120
1095	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1101	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1102	* appropriately.	1128	* appropriately.
1103	*/	1129	*/
1104	pl->close_container ();	1130	pl->close_container ();
1105		1131
		1132	//TODO: the floorbox prev/next might need updating
		1133	//esrv_del_item (pl->contr, count);
		1134	//TODO: update floorbox to preserve ordering
		1135	if (pl->contr->ns)
1106	pl->contr->ns->floorbox_update ();	1136	pl->contr->ns->floorbox_update ();
1107	}	1137	}
1108		1138
1109	for (tmp = ms.bot; tmp; tmp = tmp->above)	1139	for (tmp = ms.bot; tmp; tmp = tmp->above)
1110	{	1140	{
1111	/* No point updating the players look faces if he is the object	1141	/* No point updating the players look faces if he is the object
…		…
1124	}	1154	}
1125		1155
1126	last = tmp;	1156	last = tmp;
1127	}	1157	}
1128		1158
1129	/* last == NULL if there are no objects on this space */
1130	//TODO: this makes little sense, why only update the topmost object?
1131	if (!last)
1132	map->at (x, y).flags_ = 0;
1133	else
1134	update_object (last, UP_OBJ_REMOVE);
1135
1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1159	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1137	update_all_los (map, x, y);	1160	update_all_los (map, x, y);
1138	}	1161	}
1139	}	1162	}
1140		1163
…		…
1155	if (!top)	1178	if (!top)
1156	for (top = op; top && top->above; top = top->above)	1179	for (top = op; top && top->above; top = top->above)
1157	;	1180	;
1158		1181
1159	for (; top; top = top->below)	1182	for (; top; top = top->below)
1160	{
1161	if (top == op)
1162	continue;
1163
1164	if (object::can_merge (op, top))	1183	if (object::can_merge (op, top))
1165	{	1184	{
1166	top->nrof += op->nrof;	1185	top->nrof += op->nrof;
1167		1186
1168	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1187	if (object *pl = top->visible_to ())
1169	op->weight = 0; /* Don't want any adjustements now */	1188	esrv_update_item (UPD_NROF, pl, top);
		1189
		1190	op->weight = 0; // cancel the addition above
		1191	op->carrying = 0; // must be 0 already
		1192
1170	op->destroy ();	1193	op->destroy (1);
		1194
1171	return top;	1195	return top;
1172	}	1196	}
1173	}
1174		1197
1175	return 0;	1198	return 0;
1176	}	1199	}
1177		1200
1178	void	1201	void
…		…
1203	* job preparing multi-part monsters.	1226	* job preparing multi-part monsters.
1204	*/	1227	*/
1205	object *	1228	object *
1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1229	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1207	{	1230	{
		1231	op->remove ();
		1232
1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1233	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1209	{	1234	{
1210	tmp->x = x + tmp->arch->x;	1235	tmp->x = x + tmp->arch->x;
1211	tmp->y = y + tmp->arch->y;	1236	tmp->y = y + tmp->arch->y;
1212	}	1237	}
…		…
1235	* just 'op' otherwise	1260	* just 'op' otherwise
1236	*/	1261	*/
1237	object *	1262	object *
1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1263	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1239	{	1264	{
1240	assert (!op->flag [FLAG_FREED]);	1265	if (op->is_on_map ())
		1266	{
		1267	LOG (llevError, "insert_ob_in_map called for object already on map");
		1268	abort ();
		1269	}
1241		1270
1242	object *top, *floor = NULL;	1271	if (op->env)
1243		1272	{
		1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1244	op->remove ();	1274	op->remove ();
		1275	}
		1276
		1277	if (op->face && !face_info (op->face))//D TODO: remove soon
		1278	{//D
		1279	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1280	op->face = 1;//D
		1281	}//D
1245		1282
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* 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	1284	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1285	* need extra work
1249	*/	1286	*/
1250	if (!xy_normalise (m, op->x, op->y))	1287	if (!xy_normalise (m, op->x, op->y))
1251	{	1288	{
1252	op->destroy ();	1289	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1253	return 0;	1290	return 0;
1254	}	1291	}
1255		1292
1256	if (object *more = op->more)	1293	if (object *more = op->more)
1257	if (!insert_ob_in_map (more, m, originator, flag))	1294	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1266	*/	1303	*/
1267	if (op->nrof && !(flag & INS_NO_MERGE))	1304	if (op->nrof && !(flag & INS_NO_MERGE))
1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1305	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269	if (object::can_merge (op, tmp))	1306	if (object::can_merge (op, tmp))
1270	{	1307	{
		1308	// TODO: we actually want to update tmp, not op,
		1309	// but some caller surely breaks when we return tmp
		1310	// from here :/
1271	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1272	tmp->destroy ();	1312	tmp->destroy (1);
1273	}	1313	}
1274		1314
1275	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1315	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1276	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1316	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1277		1317
…		…
1284	{	1324	{
1285	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1325	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1286	abort ();	1326	abort ();
1287	}	1327	}
1288		1328
		1329	if (!originator->is_on_map ())
		1330	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1331	op->debug_desc (), originator->debug_desc ());
		1332
1289	op->above = originator;	1333	op->above = originator;
1290	op->below = originator->below;	1334	op->below = originator->below;
1291
1292	if (op->below)
1293	op->below->above = op;
1294	else
1295	ms.bot = op;
1296
1297	/* since *below* originator, no need to update top */
1298	originator->below = op;	1335	originator->below = op;
		1336
		1337	*(op->below ? &op->below->above : &ms.bot) = op;
1299	}	1338	}
1300	else	1339	else
1301	{	1340	{
1302	top = ms.bot;	1341	object *floor = 0;
		1342	object *top = ms.top;
1303		1343
1304	/* If there are other objects, then */	1344	/* If there are other objects, then */
1305	if (top)	1345	if (top)
1306	{	1346	{
1307	object *last = 0;
1308
1309	/*	1347	/*
1310	* If there are multiple objects on this space, we do some trickier handling.	1348	* If there are multiple objects on this space, we do some trickier handling.
1311	* We've already dealt with merging if appropriate.	1349	* We've already dealt with merging if appropriate.
1312	* Generally, we want to put the new object on top. But if	1350	* Generally, we want to put the new object on top. But if
1313	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1351	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1316	* once we get to them. This reduces the need to traverse over all of	1354	* once we get to them. This reduces the need to traverse over all of
1317	* them when adding another one - this saves quite a bit of cpu time	1355	* them when adding another one - this saves quite a bit of cpu time
1318	* when lots of spells are cast in one area. Currently, it is presumed	1356	* when lots of spells are cast in one area. Currently, it is presumed
1319	* that flying non pickable objects are spell objects.	1357	* that flying non pickable objects are spell objects.
1320	*/	1358	*/
1321	for (top = ms.bot; top; top = top->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1322	{	1360	{
1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1361	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1324	floor = top;	1362	floor = tmp;
1325		1363
1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1364	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1327	{	1365	{
1328	/* We insert above top, so we want this object below this */	1366	/* We insert above top, so we want this object below this */
1329	top = top->below;	1367	top = tmp->below;
1330	break;	1368	break;
1331	}	1369	}
1332		1370
1333	last = top;	1371	top = tmp;
1334	}	1372	}
1335
1336	/* Don't want top to be NULL, so set it to the last valid object */
1337	top = last;
1338		1373
1339	/* We let update_position deal with figuring out what the space	1374	/* We let update_position deal with figuring out what the space
1340	* looks like instead of lots of conditions here.	1375	* looks like instead of lots of conditions here.
1341	* makes things faster, and effectively the same result.	1376	* makes things faster, and effectively the same result.
1342	*/	1377	*/
…		…
1349	*/	1384	*/
1350	if (!(flag & INS_ON_TOP)	1385	if (!(flag & INS_ON_TOP)
1351	&& ms.flags () & P_BLOCKSVIEW	1386	&& ms.flags () & P_BLOCKSVIEW
1352	&& (op->face && !faces [op->face].visibility))	1387	&& (op->face && !faces [op->face].visibility))
1353	{	1388	{
		1389	object *last;
		1390
1354	for (last = top; last != floor; last = last->below)	1391	for (last = top; last != floor; last = last->below)
1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1392	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1356	break;	1393	break;
1357		1394
1358	/* Check to see if we found the object that blocks view,	1395	/* Check to see if we found the object that blocks view,
…		…
1366	} /* If objects on this space */	1403	} /* If objects on this space */
1367		1404
1368	if (flag & INS_ABOVE_FLOOR_ONLY)	1405	if (flag & INS_ABOVE_FLOOR_ONLY)
1369	top = floor;	1406	top = floor;
1370		1407
1371	/* Top is the object that our object (op) is going to get inserted above.	1408	// insert object above top, or bottom-most if top = 0
1372	*/
1373
1374	/* First object on this space */
1375	if (!top)	1409	if (!top)
1376	{	1410	{
		1411	op->below = 0;
1377	op->above = ms.bot;	1412	op->above = ms.bot;
1378
1379	if (op->above)
1380	op->above->below = op;
1381
1382	op->below = 0;
1383	ms.bot = op;	1413	ms.bot = op;
		1414
		1415	*(op->above ? &op->above->below : &ms.top) = op;
1384	}	1416	}
1385	else	1417	else
1386	{ /* get inserted into the stack above top */	1418	{
1387	op->above = top->above;	1419	op->above = top->above;
1388
1389	if (op->above)
1390	op->above->below = op;	1420	top->above = op;
1391		1421
1392	op->below = top;	1422	op->below = top;
1393	top->above = op;	1423	*(op->above ? &op->above->below : &ms.top) = op;
1394	}	1424	}
1395		1425	}
1396	if (!op->above)
1397	ms.top = op;
1398	} /* else not INS_BELOW_ORIGINATOR */
1399		1426
1400	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1401	{	1428	{
1402	op->contr->do_los = 1;	1429	op->contr->do_los = 1;
1403	++op->map->players;	1430	++op->map->players;
…		…
1405	}	1432	}
1406		1433
1407	op->map->dirty = true;	1434	op->map->dirty = true;
1408		1435
1409	if (object *pl = ms.player ())	1436	if (object *pl = ms.player ())
		1437	//TODO: the floorbox prev/next might need updating
		1438	//esrv_send_item (pl, op);
		1439	//TODO: update floorbox to preserve ordering
		1440	if (pl->contr->ns)
1410	pl->contr->ns->floorbox_update ();	1441	pl->contr->ns->floorbox_update ();
1411		1442
1412	/* If this object glows, it may affect lighting conditions that are	1443	/* If this object glows, it may affect lighting conditions that are
1413	* visible to others on this map. But update_all_los is really	1444	* 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	1445	* 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	1446	* 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.	1488	* op is the object to insert it under: supplies x and the map.
1458	*/	1489	*/
1459	void	1490	void
1460	replace_insert_ob_in_map (const char *arch_string, object *op)	1491	replace_insert_ob_in_map (const char *arch_string, object *op)
1461	{	1492	{
1462	object *tmp, *tmp1;
1463
1464	/* first search for itself and remove any old instances */	1493	/* first search for itself and remove any old instances */
1465		1494
1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1495	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1496	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1468	tmp->destroy ();	1497	tmp->destroy (1);
1469		1498
1470	tmp1 = arch_to_object (archetype::find (arch_string));	1499	object *tmp = arch_to_object (archetype::find (arch_string));
1471		1500
1472	tmp1->x = op->x;	1501	tmp->x = op->x;
1473	tmp1->y = op->y;	1502	tmp->y = op->y;
		1503
1474	insert_ob_in_map (tmp1, op->map, op, 0);	1504	insert_ob_in_map (tmp, op->map, op, 0);
1475	}	1505	}
1476		1506
1477	object *	1507	object *
1478	object::insert_at (object *where, object *originator, int flags)	1508	object::insert_at (object *where, object *originator, int flags)
1479	{	1509	{
		1510	if (where->env)
		1511	return where->env->insert (this);
		1512	else
1480	return where->map->insert (this, where->x, where->y, originator, flags);	1513	return where->map->insert (this, where->x, where->y, originator, flags);
1481	}	1514	}
1482		1515
1483	/*	1516	/*
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	1517	* decrease(object, number) decreases a specified number from
1525	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1526	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1527	*	1520	*
1528	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1529	*/	1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	if (!nr)
		1527	return true;
		1528
		1529	nr = min (nr, nrof);
		1530
		1531	if (nrof > nr)
		1532	{
		1533	nrof -= nr;
		1534	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1535
		1536	if (object *pl = visible_to ())
		1537	esrv_update_item (UPD_NROF, pl, this);
		1538
		1539	return true;
		1540	}
		1541	else
		1542	{
		1543	destroy ();
		1544	return false;
		1545	}
		1546	}
		1547
		1548	/*
		1549	* split(ob,nr) splits up ob into two parts. The part which
		1550	* is returned contains nr objects, and the remaining parts contains
		1551	* the rest (or is removed and returned if that number is 0).
		1552	* On failure, NULL is returned.
		1553	*/
1530	object *	1554	object *
1531	decrease_ob_nr (object *op, uint32 i)	1555	object::split (sint32 nr)
1532	{	1556	{
1533	object *tmp;	1557	int have = number_of ();
1534		1558
1535	if (i == 0) /* objects with op->nrof require this check */	1559	if (have < nr)
1536	return op;	1560	return 0;
1537		1561	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	{	1562	{
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 ();	1563	remove ();
1573	op->nrof = 0;	1564	return this;
1574	if (tmp)
1575	esrv_del_item (tmp->contr, op->count);
1576	}
1577	}	1565	}
1578	else	1566	else
1579	{	1567	{
1580	object *above = op->above;	1568	decrease (nr);
1581		1569
1582	if (i < op->nrof)	1570	object *op = deep_clone ();
1583	op->nrof -= i;	1571	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;	1572	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	}	1573	}
1625	}	1574	}
1626		1575
1627	object *	1576	object *
1628	insert_ob_in_ob (object *op, object *where)	1577	insert_ob_in_ob (object *op, object *where)
…		…
1653	* be != op, if items are merged. -Tero	1602	* be != op, if items are merged. -Tero
1654	*/	1603	*/
1655	object *	1604	object *
1656	object::insert (object *op)	1605	object::insert (object *op)
1657	{	1606	{
1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1659	op->remove ();
1660
1661	if (op->more)	1607	if (op->more)
1662	{	1608	{
1663	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1609	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1664	return op;	1610	return op;
1665	}	1611	}
1666		1612
1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1613	op->remove ();
1668	CLEAR_FLAG (op, FLAG_REMOVED);	1614
		1615	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669		1616
1670	if (op->nrof)	1617	if (op->nrof)
1671	{
1672	for (object *tmp = inv; tmp; tmp = tmp->below)	1618	for (object *tmp = inv; tmp; tmp = tmp->below)
1673	if (object::can_merge (tmp, op))	1619	if (object::can_merge (tmp, op))
1674	{	1620	{
1675	/* return the original object and remove inserted object	1621	/* return the original object and remove inserted object
1676	(client needs the original object) */	1622	(client needs the original object) */
1677	tmp->nrof += op->nrof;	1623	tmp->nrof += op->nrof;
1678	/* Weight handling gets pretty funky. Since we are adding to	1624
1679	* tmp->nrof, we need to increase the weight.	1625	if (object *pl = tmp->visible_to ())
1680	*/	1626	esrv_update_item (UPD_NROF, pl, tmp);
		1627
1681	add_weight (this, op->weight * op->nrof);	1628	adjust_weight (this, op->total_weight ());
1682	SET_FLAG (op, FLAG_REMOVED);	1629
1683	op->destroy (); /* free the inserted object */	1630	op->destroy (1);
1684	op = tmp;	1631	op = tmp;
1685	op->remove (); /* and fix old object's links */	1632	goto inserted;
1686	CLEAR_FLAG (op, FLAG_REMOVED);
1687	break;
1688	}	1633	}
1689		1634
1690	/* I assume combined objects have no inventory
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.	1635	op->owner = 0; // it's his/hers now. period.
1706	op->map = 0;	1636	op->map = 0;
		1637	op->x = 0;
		1638	op->y = 0;
		1639
		1640	op->above = 0;
		1641	op->below = inv;
1707	op->env = this;	1642	op->env = this;
1708	op->above = 0;
1709	op->below = 0;
1710	op->x = op->y = 0;
1711		1643
		1644	if (inv)
		1645	inv->above = op;
		1646
		1647	inv = op;
		1648
		1649	op->flag [FLAG_REMOVED] = 0;
		1650
		1651	if (object *pl = op->visible_to ())
		1652	esrv_send_item (pl, op);
		1653
		1654	adjust_weight (this, op->total_weight ());
		1655
		1656	inserted:
1712	/* reset the light list and los of the players on the map */	1657	/* reset the light list and los of the players on the map */
1713	if (op->glow_radius && map)	1658	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);	1659	update_all_los (map, x, y);
1720	}
1721		1660
1722	/* Client has no idea of ordering so lets not bother ordering it here.	1661	// if this is a player's inventory, update stats
1723	* It sure simplifies this function...	1662	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1724	*/	1663	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		1664
1734	INVOKE_OBJECT (INSERT, this);	1665	INVOKE_OBJECT (INSERT, this);
1735		1666
1736	return op;	1667	return op;
1737	}	1668	}
…		…
1865	LOG (llevError, "Present_arch called outside map.\n");	1796	LOG (llevError, "Present_arch called outside map.\n");
1866	return NULL;	1797	return NULL;
1867	}	1798	}
1868		1799
1869	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1800	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1870	if (tmp->arch == at)	1801	if (tmp->arch->archname == at->archname)
1871	return tmp;	1802	return tmp;
1872		1803
1873	return NULL;	1804	return NULL;
1874	}	1805	}
1875		1806
…		…
1939	* The first matching object is returned, or NULL if none.	1870	* The first matching object is returned, or NULL if none.
1940	*/	1871	*/
1941	object *	1872	object *
1942	present_arch_in_ob (const archetype *at, const object *op)	1873	present_arch_in_ob (const archetype *at, const object *op)
1943	{	1874	{
1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1875	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945	if (tmp->arch == at)	1876	if (tmp->arch->archname == at->archname)
1946	return tmp;	1877	return tmp;
1947		1878
1948	return NULL;	1879	return NULL;
1949	}	1880	}
1950		1881
…		…
2359		2290
2360	/*	2291	/*
2361	* create clone from object to another	2292	* create clone from object to another
2362	*/	2293	*/
2363	object *	2294	object *
2364	object_create_clone (object *asrc)	2295	object::deep_clone ()
2365	{	2296	{
2366	object *dst = 0, *tmp, *src, *prev, *item;	2297	assert (("deep_clone called on non-head object", is_head ()));
2367		2298
2368	if (!asrc)	2299	object *dst = clone ();
2369	return 0;
2370		2300
2371	src = asrc->head_ ();	2301	object *prev = dst;
2372
2373	prev = 0;
2374	for (object *part = src; part; part = part->more)	2302	for (object *part = this->more; part; part = part->more)
2375	{	2303	{
2376	tmp = part->clone ();	2304	object *tmp = part->clone ();
2377	tmp->x -= src->x;
2378	tmp->y -= src->y;
2379
2380	if (!part->head)
2381	{
2382	dst = tmp;
2383	tmp->head = 0;
2384	}
2385	else
2386	tmp->head = dst;	2305	tmp->head = dst;
2387
2388	tmp->more = 0;
2389
2390	if (prev)
2391	prev->more = tmp;	2306	prev->more = tmp;
2392
2393	prev = tmp;	2307	prev = tmp;
2394	}	2308	}
2395		2309
2396	for (item = src->inv; item; item = item->below)	2310	for (object *item = inv; item; item = item->below)
2397	insert_ob_in_ob (object_create_clone (item), dst);	2311	insert_ob_in_ob (item->deep_clone (), dst);
2398		2312
2399	return dst;	2313	return dst;
2400	}	2314	}
2401		2315
2402	/* This returns the first object in who's inventory that	2316	/* This returns the first object in who's inventory that
…		…
2411	return tmp;	2325	return tmp;
2412		2326
2413	return 0;	2327	return 0;
2414	}	2328	}
2415		2329
2416	/* If ob has a field named key, return the link from the list,	2330	const shstr &
2417	* otherwise return NULL.	2331	object::kv_get (const shstr &key) const
2418	*
2419	* key must be a passed in shared string - otherwise, this won't
2420	* do the desired thing.
2421	*/
2422	key_value *
2423	get_ob_key_link (const object *ob, const char *key)
2424	{	2332	{
2425	for (key_value *link = ob->key_values; link; link = link->next)	2333	for (key_value *kv = key_values; kv; kv = kv->next)
2426	if (link->key == key)	2334	if (kv->key == key)
2427	return link;
2428
2429	return 0;
2430	}
2431
2432	/*
2433	* Returns the value of op has an extra_field for key, or NULL.
2434	*
2435	* The argument doesn't need to be a shared string.
2436	*
2437	* The returned string is shared.
2438	*/
2439	const char *
2440	get_ob_key_value (const object *op, const char *const key)
2441	{
2442	key_value *link;
2443	shstr_cmp canonical_key (key);
2444
2445	if (!canonical_key)
2446	{
2447	/* 1. There being a field named key on any object
2448	* implies there'd be a shared string to find.
2449	* 2. Since there isn't, no object has this field.
2450	* 3. Therefore, *this* object doesn't have this field.
2451	*/
2452	return 0;
2453	}
2454
2455	/* This is copied from get_ob_key_link() above -
2456	* only 4 lines, and saves the function call overhead.
2457	*/
2458	for (link = op->key_values; link; link = link->next)
2459	if (link->key == canonical_key)
2460	return link->value;	2335	return kv->value;
2461		2336
2462	return 0;	2337	return shstr_null;
2463	}	2338	}
2464		2339
2465	/*	2340	void
2466	* Updates the canonical_key in op to value.	2341	object::kv_set (const shstr &key, const shstr &value)
2467	*
2468	* canonical_key is a shared string (value doesn't have to be).
2469	*
2470	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2471	* keys.
2472	*
2473	* Returns TRUE on success.
2474	*/
2475	int
2476	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2477	{	2342	{
2478	key_value *field = NULL, *last = NULL;	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2479		2344	if (kv->key == key)
2480	for (field = op->key_values; field != NULL; field = field->next)
2481	{
2482	if (field->key != canonical_key)
2483	{	2345	{
2484	last = field;	2346	kv->value = value;
2485	continue;	2347	return;
2486	}	2348	}
2487		2349
2488	if (value)	2350	key_value *kv = new key_value;
2489	field->value = value;	2351
2490	else	2352	kv->next = key_values;
		2353	kv->key = key;
		2354	kv->value = value;
		2355
		2356	key_values = kv;
		2357	}
		2358
		2359	void
		2360	object::kv_del (const shstr &key)
		2361	{
		2362	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2363	if ((*kvp)->key == key)
2491	{	2364	{
2492	/* Basically, if the archetype has this key set,	2365	key_value *kv = *kvp;
2493	* we need to store the null value so when we save	2366	*kvp = (*kvp)->next;
2494	* it, we save the empty value so that when we load,	2367	delete kv;
2495	* we get this value back again.	2368	return;
2496	*/
2497	if (get_ob_key_link (op->arch, canonical_key))
2498	field->value = 0;
2499	else
2500	{
2501	if (last)
2502	last->next = field->next;
2503	else
2504	op->key_values = field->next;
2505
2506	delete field;
2507	}
2508	}	2369	}
2509	return TRUE;
2510	}
2511	/* IF we get here, key doesn't exist */
2512
2513	/* No field, we'll have to add it. */
2514
2515	if (!add_key)
2516	return FALSE;
2517
2518	/* There isn't any good reason to store a null
2519	* value in the key/value list. If the archetype has
2520	* this key, then we should also have it, so shouldn't
2521	* be here. If user wants to store empty strings,
2522	* should pass in ""
2523	*/
2524	if (value == NULL)
2525	return TRUE;
2526
2527	field = new key_value;
2528
2529	field->key = canonical_key;
2530	field->value = value;
2531	/* Usual prepend-addition. */
2532	field->next = op->key_values;
2533	op->key_values = field;
2534
2535	return TRUE;
2536	}
2537
2538	/*
2539	* Updates the key in op to value.
2540	*
2541	* If add_key is FALSE, this will only update existing keys,
2542	* and not add new ones.
2543	* In general, should be little reason FALSE is ever passed in for add_key
2544	*
2545	* Returns TRUE on success.
2546	*/
2547	int
2548	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2549	{
2550	shstr key_ (key);
2551
2552	return set_ob_key_value_s (op, key_, value, add_key);
2553	}	2370	}
2554		2371
2555	object::depth_iterator::depth_iterator (object *container)	2372	object::depth_iterator::depth_iterator (object *container)
2556	: iterator_base (container)	2373	: iterator_base (container)
2557	{	2374	{
…		…
2607	{	2424	{
2608	char flagdesc[512];	2425	char flagdesc[512];
2609	char info2[256 * 4];	2426	char info2[256 * 4];
2610	char *p = info;	2427	char *p = info;
2611		2428
2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2429	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2613	count, uuid.seq,	2430	count,
		2431	uuid.c_str (),
2614	&name,	2432	&name,
2615	title ? "\",title:\"" : "",	2433	title ? ",title:\"" : "",
2616	title ? (const char *)title : "",	2434	title ? (const char *)title : "",
		2435	title ? "\"" : "",
2617	flag_desc (flagdesc, 512), type);	2436	flag_desc (flagdesc, 512), type);
2618		2437
2619	if (!this->flag[FLAG_REMOVED] && env)	2438	if (!flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2439	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2440
2622	if (map)	2441	if (map)
2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2442	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624		2443
…		…
2654	object::open_container (object *new_container)	2473	object::open_container (object *new_container)
2655	{	2474	{
2656	if (container == new_container)	2475	if (container == new_container)
2657	return;	2476	return;
2658		2477
2659	if (object *old_container = container)	2478	object *old_container = container;
		2479
		2480	if (old_container)
2660	{	2481	{
2661	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2482	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2662	return;	2483	return;
2663		2484
2664	#if 0	2485	#if 0
…		…
2666	if (object *closer = old_container->inv)	2487	if (object *closer = old_container->inv)
2667	if (closer->type == CLOSE_CON)	2488	if (closer->type == CLOSE_CON)
2668	closer->destroy ();	2489	closer->destroy ();
2669	#endif	2490	#endif
2670		2491
		2492	// make sure the container is available
		2493	esrv_send_item (this, old_container);
		2494
2671	old_container->flag [FLAG_APPLIED] = 0;	2495	old_container->flag [FLAG_APPLIED] = false;
2672	container = 0;	2496	container = 0;
2673		2497
		2498	// client needs item update to make it work, client bug requires this to be separate
2674	esrv_update_item (UPD_FLAGS, this, old_container);	2499	esrv_update_item (UPD_FLAGS, this, old_container);
		2500
2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2501	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2676	play_sound (sound_find ("chest_close"));	2502	play_sound (sound_find ("chest_close"));
2677	}	2503	}
2678		2504
2679	if (new_container)	2505	if (new_container)
…		…
2692	}	2518	}
2693	#endif	2519	#endif
2694		2520
2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2521	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2696		2522
		2523	// make sure the container is available, client bug requires this to be separate
		2524	esrv_send_item (this, new_container);
		2525
2697	new_container->flag [FLAG_APPLIED] = 1;	2526	new_container->flag [FLAG_APPLIED] = true;
2698	container = new_container;	2527	container = new_container;
2699		2528
		2529	// client needs flag change
2700	esrv_update_item (UPD_FLAGS, this, new_container);	2530	esrv_update_item (UPD_FLAGS, this, new_container);
2701	esrv_send_inventory (this, new_container);	2531	esrv_send_inventory (this, new_container);
2702	play_sound (sound_find ("chest_open"));	2532	play_sound (sound_find ("chest_open"));
2703	}	2533	}
		2534	// else if (!old_container->env && contr && contr->ns)
		2535	// contr->ns->floorbox_reset ();
2704	}	2536	}
2705		2537
2706	object *	2538	object *
2707	object::force_find (const shstr name)	2539	object::force_find (const shstr name)
2708	{	2540	{
…		…
2734		2566
2735	insert (force);	2567	insert (force);
2736	}	2568	}
2737		2569
2738	void	2570	void
2739	object::play_sound (faceidx sound) const	2571	object::play_sound (faceidx sound)
2740	{	2572	{
2741	if (!sound)	2573	if (!sound)
2742	return;	2574	return;
2743		2575
2744	if (flag [FLAG_REMOVED])	2576	if (flag [FLAG_REMOVED])

Diff Legend

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