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.197 by root, Wed Oct 17 22:04:31 2007 UTC vs.
Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
…		…
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	46	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	52	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;
141
142	/* 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
143	* 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
144	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
145	*/	147	*/
146		148
147	/* For each field in wants, */	149	/* For each field in wants, */
148	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)
149	{	151	if (has->kv_get (kv->key) != kv->value)
150	key_value *has_field;	152	return false;
151
152	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);
154
155	if (has_field == NULL)
156	{
157	/* No field with that name. */
158	return FALSE;
159	}
160
161	/* Found the matching field. */
162	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167
168	/* If we get here, we found a match. Now for the next field in wants. */
169	}
170		153
171	/* 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. */
172	return TRUE;	155	return true;
173	}	156	}
174		157
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	159	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	161	{
179	/* 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,
180	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
181	*/	164	*/
182	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);
183	}	167	}
184		168
185	/* 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
186	* they can be merged together.	170	* they can be merged together.
187	*	171	*
…		…
202	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
205	return 0;	189	return 0;
206		190
207	//TODO: this ain't working well, use nicer and correct overflow check	191	// some objects are unmergable
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	if (!ob1->nrof || !ob2->nrof)
209	* value could not be stored in a sint32 (which unfortunately sometimes is	193	return 0;
210	* used to store nrof).	194
		195	/* Do not merge objects if nrof would overflow. First part checks
		196	* for unsigned overflow (2c), second part checks whether the result
		197	* would fit into a 32 bit signed int, which is often used to hold
		198	* nrof values.
211	*/	199	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	200	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	201	return 0;
214		202
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	203	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	204	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	205	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	206	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	207	* flags lose any meaning.
220	*/	208	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	209	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	210	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		211
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	212	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	213	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		214
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	215	if (ob1->arch->archname != ob2->arch->archname
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	216	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	217	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	218	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	219	|| ob1->weight != ob2->weight
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	|| ob1->attacktype != ob2->attacktype	220	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	221	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	222	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	223	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	224	|| ob1->value != ob2->value
240	|| ob1->animation_id != ob2->animation_id	225	|| ob1->animation_id != ob2->animation_id
		226	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
241	|| ob1->client_type != ob2->client_type	227	|| ob1->client_type != ob2->client_type
242	|| ob1->materialname != ob2->materialname	228	|| ob1->materialname != ob2->materialname
243	|| ob1->lore != ob2->lore	229	|| ob1->lore != ob2->lore
244	|| ob1->subtype != ob2->subtype	230	|| ob1->subtype != ob2->subtype
245	|| ob1->move_type != ob2->move_type	231	|| ob1->move_type != ob2->move_type
246	|| ob1->move_block != ob2->move_block	232	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	233	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	234	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	235	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	236	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	237	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		238	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		239	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	240	return 0;
253		241
		242	if ((ob1->flag ^ ob2->flag)
		243	.reset (FLAG_INV_LOCKED)
		244	.reset (FLAG_CLIENT_SENT)
		245	.reset (FLAG_REMOVED)
		246	.any ())
		247	return 0;
		248
254	/* This is really a spellbook check - really, we should	249	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	250	* not merge objects with real inventories, as splitting them
		251	* is hard.
256	*/	252	*/
257	if (ob1->inv || ob2->inv)	253	if (ob1->inv || ob2->inv)
258	{	254	{
259	if (!(ob1->inv && ob2->inv))	255	if (!(ob1->inv && ob2->inv))
260	return 0; /* inventories differ in length */	256	return 0; /* inventories differ in length */
261		257
262	if (ob1->inv->below || ob2->inv->below)	258	if (ob1->inv->below || ob2->inv->below)
263	return 0; /* more than one object in inv */	259	return 0; /* more than one object in inv */
264		260
265	if (!object::can_merge (ob1->inv, ob2->inv))	261	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0; /* inventory objexts differ */	262	return 0; /* inventory objects differ */
267		263
268	/* inventory ok - still need to check rest of this object to see	264	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	265	* if it is valid.
270	*/	266	*/
271	}	267	}
…		…
290	if (ob1->level != ob2->level)	286	if (ob1->level != ob2->level)
291	return 0;	287	return 0;
292	break;	288	break;
293	}	289	}
294		290
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	291	if (ob1->key_values || ob2->key_values)
296	{	292	{
297	/* At least one of these has key_values. */	293	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	294	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	295	return 0; /* One has fields, but the other one doesn't. */
300	return 0;	296
301	else if (!compare_ob_value_lists (ob1, ob2))	297	if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	298	return 0;
303	}	299	}
304		300
305	if (ob1->self || ob2->self)	301	if (ob1->self || ob2->self)
306	{	302	{
…		…
312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	308	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	309	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314		310
315	if (k1 != k2)	311	if (k1 != k2)
316	return 0;	312	return 0;
		313
317	else if (k1 == 0)	314	if (k1 == 0)
318	return 1;	315	return 1;
		316
319	else if (!cfperl_can_merge (ob1, ob2))	317	if (!cfperl_can_merge (ob1, ob2))
320	return 0;	318	return 0;
321	}	319	}
322	}	320	}
323		321
324	/* Everything passes, must be OK. */	322	/* Everything passes, must be OK. */
325	return 1;	323	return 1;
326	}	324	}
327		325
		326	// find player who can see this object
		327	object *
		328	object::visible_to () const
		329	{
		330	if (client_visible () && !flag [FLAG_REMOVED])
		331	{
		332	// see if we are in a container of sorts
		333	if (env)
		334	{
		335	// the player inventory itself is always visible
		336	if (env->type == PLAYER)
		337	return env;
		338
		339	// else a player could have our env open
		340	object *envest = env->outer_env ();
		341
		342	// the player itself is always on a map, so we will find him here
		343	// even if our inv is in a player.
		344	if (envest->is_on_map ())
		345	if (object *pl = envest->ms ().player ())
		346	if (pl->container == env)
		347	return pl;
		348	}
		349	else
		350	{
		351	// maybe there is a player standing on the same mapspace
		352	// this will catch the case where "this" is a player
		353	if (object *pl = ms ().player ())
		354	if (!pl->container || this == pl->container)
		355	return pl;
		356	}
		357	}
		358
		359	return 0;
		360	}
		361
		362	// adjust weight per container type ("of holding")
		363	static sint32
		364	weight_adjust_for (object *op, sint32 weight)
		365	{
		366	return op->type == CONTAINER
		367	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		368	: weight;
		369	}
		370
328	/*	371	/*
		372	* adjust_weight(object, weight) adds the specified weight to an object,
		373	* and also updates how much the environment(s) is/are carrying.
		374	*/
		375	static void
		376	adjust_weight (object *op, sint32 weight)
		377	{
		378	while (op)
		379	{
		380	// adjust by actual difference to account for rounding errors
		381	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		382	weight = weight_adjust_for (op, op->carrying)
		383	- weight_adjust_for (op, op->carrying - weight);
		384
		385	if (!weight)
		386	return;
		387
		388	op->carrying += weight;
		389
		390	if (object *pl = op->visible_to ())
		391	if (pl != op) // player is handled lazily
		392	esrv_update_item (UPD_WEIGHT, pl, op);
		393
		394	op = op->env;
		395	}
		396	}
		397
		398	/*
329	* sum_weight() is a recursive function which calculates the weight	399	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	400	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	401	* containers are carrying, and sums it up.
332	*/	402	*/
333	long	403	void
334	sum_weight (object *op)	404	object::update_weight ()
335	{	405	{
336	long sum;	406	sint32 sum = 0;
337	object *inv;
338		407
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	408	for (object *op = inv; op; op = op->below)
340	{	409	{
341	if (inv->inv)	410	if (op->inv)
342	sum_weight (inv);	411	op->update_weight ();
343		412
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	413	sum += op->total_weight ();
		414	}
		415
		416	sum = weight_adjust_for (this, sum);
		417
		418	if (sum != carrying)
345	}	419	{
346
347	if (op->type == CONTAINER && op->stats.Str)
348	sum = (sum * (100 - op->stats.Str)) / 100;
349
350	if (op->carrying != sum)
351	op->carrying = sum;	420	carrying = sum;
352		421
353	return sum;	422	if (object *pl = visible_to ())
		423	if (pl != this) // player is handled lazily
		424	esrv_update_item (UPD_WEIGHT, pl, this);
		425	}
354	}	426	}
355		427
356	/**	428	/*
357	* Return the outermost environment object for a given object.	429	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
358	*/
359
360	object *
361	object_get_env_recursive (object *op)
362	{
363	while (op->env != NULL)
364	op = op->env;
365	return op;
366	}
367
368	/*
369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
370	* Some error messages.
371	* The result of the dump is stored in the static global errmsg array.
372	*/	430	*/
373	char *	431	char *
374	dump_object (object *op)	432	dump_object (object *op)
375	{	433	{
376	if (!op)	434	if (!op)
…		…
390	get_nearest_part (object *op, const object *pl)	448	get_nearest_part (object *op, const object *pl)
391	{	449	{
392	object *tmp, *closest;	450	object *tmp, *closest;
393	int last_dist, i;	451	int last_dist, i;
394		452
395	if (op->more == NULL)	453	if (!op->more)
396	return op;	454	return op;
		455
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	456	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		457	tmp;
		458	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	459	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	460	closest = tmp, last_dist = i;
		461
400	return closest;	462	return closest;
401	}	463	}
402		464
403	/*	465	/*
404	* Returns the object which has the count-variable equal to the argument.	466	* Returns the object which has the count-variable equal to the argument.
		467	* VERRRY slow.
405	*/	468	*/
406	object *	469	object *
407	find_object (tag_t i)	470	find_object (tag_t i)
408	{	471	{
409	for_all_objects (op)	472	for_all_objects (op)
…		…
420	*/	483	*/
421	object *	484	object *
422	find_object_name (const char *str)	485	find_object_name (const char *str)
423	{	486	{
424	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
425	object *op;
426		488
		489	if (str_)
427	for_all_objects (op)	490	for_all_objects (op)
428	if (op->name == str_)	491	if (op->name == str_)
429	break;	492	return op;
430		493
431	return op;	494	return 0;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	495	}
439		496
440	/*	497	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	498	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	499	* skill and experience objects.
…		…
447	{	504	{
448	// allow objects which own objects	505	// allow objects which own objects
449	if (owner)	506	if (owner)
450	while (owner->owner)	507	while (owner->owner)
451	owner = owner->owner;	508	owner = owner->owner;
		509
		510	if (flag [FLAG_FREED])
		511	{
		512	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		513	return;
		514	}
452		515
453	this->owner = owner;	516	this->owner = owner;
454	}	517	}
455		518
456	int	519	int
…		…
534	}	597	}
535		598
536	op->key_values = 0;	599	op->key_values = 0;
537	}	600	}
538		601
539	object &	602	/*
540	object::operator =(const object &src)	603	* copy_to first frees everything allocated by the dst object,
		604	* and then copies the contents of itself into the second
		605	* object, allocating what needs to be allocated. Basically, any
		606	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		607	* if the first object is freed, the pointers in the new object
		608	* will point at garbage.
		609	*/
		610	void
		611	object::copy_to (object *dst)
541	{	612	{
542	bool is_freed = flag [FLAG_FREED];	613	dst->remove ();
543	bool is_removed = flag [FLAG_REMOVED];
544
545	*(object_copy *)this = src;	614	*(object_copy *)dst = *this;
546
547	flag [FLAG_FREED] = is_freed;
548	flag [FLAG_REMOVED] = is_removed;	615	dst->flag [FLAG_REMOVED] = true;
549		616
550	/* Copy over key_values, if any. */	617	/* Copy over key_values, if any. */
551	if (src.key_values)	618	if (key_values)
552	{	619	{
553	key_value *tail = 0;	620	key_value *tail = 0;
554	key_values = 0;	621	dst->key_values = 0;
555		622
556	for (key_value *i = src.key_values; i; i = i->next)	623	for (key_value *i = key_values; i; i = i->next)
557	{	624	{
558	key_value *new_link = new key_value;	625	key_value *new_link = new key_value;
559		626
560	new_link->next = 0;	627	new_link->next = 0;
561	new_link->key = i->key;	628	new_link->key = i->key;
562	new_link->value = i->value;	629	new_link->value = i->value;
563		630
564	/* Try and be clever here, too. */	631	/* Try and be clever here, too. */
565	if (!key_values)	632	if (!dst->key_values)
566	{	633	{
567	key_values = new_link;	634	dst->key_values = new_link;
568	tail = new_link;	635	tail = new_link;
569	}	636	}
570	else	637	else
571	{	638	{
572	tail->next = new_link;	639	tail->next = new_link;
573	tail = new_link;	640	tail = new_link;
574	}	641	}
575	}	642	}
576	}	643	}
577	}
578
579	/*
580	* copy_to first frees everything allocated by the dst object,
581	* and then copies the contents of itself into the second
582	* object, allocating what needs to be allocated. Basically, any
583	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
584	* if the first object is freed, the pointers in the new object
585	* will point at garbage.
586	*/
587	void
588	object::copy_to (object *dst)
589	{
590	*dst = *this;
591		644
592	if (speed < 0)	645	if (speed < 0)
593	dst->speed_left -= rndm ();	646	dst->speed_left -= rndm ();
594		647
595	dst->set_speed (dst->speed);	648	dst->set_speed (dst->speed);
…		…
597		650
598	void	651	void
599	object::instantiate ()	652	object::instantiate ()
600	{	653	{
601	if (!uuid.seq) // HACK	654	if (!uuid.seq) // HACK
602	uuid = gen_uuid ();	655	uuid = UUID::gen ();
603		656
604	speed_left = -0.1f;	657	speed_left = -0.1f;
605	/* copy the body_info to the body_used - this is only really	658	/* copy the body_info to the body_used - this is only really
606	* need for monsters, but doesn't hurt to do it for everything.	659	* need for monsters, but doesn't hurt to do it for everything.
607	* by doing so, when a monster is created, it has good starting	660	* by doing so, when a monster is created, it has good starting
…		…
617	object *	670	object *
618	object::clone ()	671	object::clone ()
619	{	672	{
620	object *neu = create ();	673	object *neu = create ();
621	copy_to (neu);	674	copy_to (neu);
		675	neu->map = map; // not copied by copy_to
622	return neu;	676	return neu;
623	}	677	}
624		678
625	/*	679	/*
626	* If an object with the IS_TURNABLE() flag needs to be turned due	680	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
677	* UP_OBJ_FACE: only the objects face has changed.	731	* UP_OBJ_FACE: only the objects face has changed.
678	*/	732	*/
679	void	733	void
680	update_object (object *op, int action)	734	update_object (object *op, int action)
681	{	735	{
682	if (op == NULL)	736	if (!op)
683	{	737	{
684	/* this should never happen */	738	/* this should never happen */
685	LOG (llevDebug, "update_object() called for NULL object.\n");	739	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
686	return;	740	return;
687	}	741	}
688		742
689	if (op->env)	743	if (!op->is_on_map ())
690	{	744	{
691	/* Animation is currently handled by client, so nothing	745	/* Animation is currently handled by client, so nothing
692	* to do in this case.	746	* to do in this case.
693	*/	747	*/
694	return;	748	return;
695	}	749	}
696
697	/* If the map is saving, don't do anything as everything is
698	* going to get freed anyways.
699	*/
700	if (!op->map || op->map->in_memory == MAP_SAVING)
701	return;
702		750
703	/* make sure the object is within map boundaries */	751	/* make sure the object is within map boundaries */
704	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	752	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
705	{	753	{
706	LOG (llevError, "update_object() called for object out of map!\n");	754	LOG (llevError, "update_object() called for object out of map!\n");
…		…
766	static int object_count;	814	static int object_count;
767		815
768	void object::link ()	816	void object::link ()
769	{	817	{
770	assert (!index);//D	818	assert (!index);//D
771	uuid = gen_uuid ();	819	uuid = UUID::gen ();
772	count = ++object_count;	820	count = ++object_count;
773		821
774	refcnt_inc ();	822	refcnt_inc ();
775	objects.insert (this);	823	objects.insert (this);
776	}	824	}
…		…
849	object::destroy_inv (bool drop_to_ground)	897	object::destroy_inv (bool drop_to_ground)
850	{	898	{
851	// need to check first, because the checks below might segfault	899	// need to check first, because the checks below might segfault
852	// as we might be on an invalid mapspace and crossfire code	900	// as we might be on an invalid mapspace and crossfire code
853	// is too buggy to ensure that the inventory is empty.	901	// is too buggy to ensure that the inventory is empty.
854	// corollary: if you create arrows etc. with stuff in tis inventory,	902	// corollary: if you create arrows etc. with stuff in its inventory,
855	// cf will crash below with off-map x and y	903	// cf will crash below with off-map x and y
856	if (!inv)	904	if (!inv)
857	return;	905	return;
858		906
859	/* Only if the space blocks everything do we not process -	907	/* Only if the space blocks everything do we not process -
860	* if some form of movement is allowed, let objects	908	* if some form of movement is allowed, let objects
861	* drop on that space.	909	* drop on that space.
862	*/	910	*/
863	if (!drop_to_ground	911	if (!drop_to_ground
864	|| !map	912	|| !map
865	|| map->in_memory != MAP_IN_MEMORY	913	|| map->in_memory != MAP_ACTIVE
866	|| map->nodrop	914	|| map->no_drop
867	|| ms ().move_block == MOVE_ALL)	915	|| ms ().move_block == MOVE_ALL)
868	{	916	{
869	while (inv)	917	while (inv)
870	{	918	{
871	inv->destroy_inv (drop_to_ground);	919	inv->destroy_inv (false);
872	inv->destroy ();	920	inv->destroy ();
873	}	921	}
874	}	922	}
875	else	923	else
876	{ /* Put objects in inventory onto this space */	924	{ /* Put objects in inventory onto this space */
…		…
882	|| op->flag [FLAG_NO_DROP]	930	|| op->flag [FLAG_NO_DROP]
883	|| op->type == RUNE	931	|| op->type == RUNE
884	|| op->type == TRAP	932	|| op->type == TRAP
885	|| op->flag [FLAG_IS_A_TEMPLATE]	933	|| op->flag [FLAG_IS_A_TEMPLATE]
886	|| op->flag [FLAG_DESTROY_ON_DEATH])	934	|| op->flag [FLAG_DESTROY_ON_DEATH])
887	op->destroy ();	935	op->destroy (true);
888	else	936	else
889	map->insert (op, x, y);	937	map->insert (op, x, y);
890	}	938	}
891	}	939	}
892	}	940	}
…		…
896	object *op = new object;	944	object *op = new object;
897	op->link ();	945	op->link ();
898	return op;	946	return op;
899	}	947	}
900		948
		949	static struct freed_map : maptile
		950	{
		951	freed_map ()
		952	{
		953	path = "<freed objects map>";
		954	name = "/internal/freed_objects_map";
		955	width = 3;
		956	height = 3;
		957	no_drop = 1;
		958	no_reset = 1;
		959
		960	alloc ();
		961	in_memory = MAP_ACTIVE;
		962	}
		963
		964	~freed_map ()
		965	{
		966	destroy ();
		967	}
		968	} freed_map; // freed objects are moved here to avoid crashes
		969
901	void	970	void
902	object::do_destroy ()	971	object::do_destroy ()
903	{	972	{
904	attachable::do_destroy ();
905
906	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
907	remove_button_link (this);	974	remove_button_link (this);
908		975
909	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
910	remove_friendly_object (this);	977	remove_friendly_object (this);
911		978
912	if (!flag [FLAG_REMOVED])
913	remove ();	979	remove ();
914		980
915	destroy_inv (true);	981	attachable::do_destroy ();
916		982
917	deactivate ();	983	deactivate ();
918	unlink ();	984	unlink ();
919		985
920	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
921		987
922	// hack to ensure that freed objects still have a valid map	988	// hack to ensure that freed objects still have a valid map
923	{
924	static maptile *freed_map; // freed objects are moved here to avoid crashes
925
926	if (!freed_map)
927	{
928	freed_map = new maptile;
929
930	freed_map->path = "<freed objects map>";
931	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;
933	freed_map->height = 3;
934
935	freed_map->alloc ();
936	freed_map->in_memory = MAP_IN_MEMORY;
937	}
938
939	map = freed_map;	989	map = &freed_map;
940	x = 1;	990	x = 1;
941	y = 1;	991	y = 1;
942	}
943		992
944	if (more)	993	if (more)
945	{	994	{
946	more->destroy ();	995	more->destroy ();
947	more = 0;	996	more = 0;
…		…
960	object::destroy (bool destroy_inventory)	1009	object::destroy (bool destroy_inventory)
961	{	1010	{
962	if (destroyed ())	1011	if (destroyed ())
963	return;	1012	return;
964		1013
		1014	if (!is_head () && !head->destroyed ())
		1015	{
		1016	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1017	head->destroy (destroy_inventory);
		1018	return;
		1019	}
		1020
965	if (destroy_inventory)	1021	destroy_inv (!destroy_inventory);
966	destroy_inv (false);
967		1022
968	if (is_head ())	1023	if (is_head ())
969	if (sound_destroy)	1024	if (sound_destroy)
970	play_sound (sound_destroy);	1025	play_sound (sound_destroy);
971	else if (flag [FLAG_MONSTER])	1026	else if (flag [FLAG_MONSTER])
972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1027	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973		1028
974	attachable::destroy ();	1029	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	}	1030	}
993		1031
994	/* op->remove ():	1032	/* op->remove ():
995	* This function removes the object op from the linked list of objects	1033	* 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	1034	* which it is currently tied to. When this function is done, the
…		…
1002	object::do_remove ()	1040	object::do_remove ()
1003	{	1041	{
1004	object *tmp, *last = 0;	1042	object *tmp, *last = 0;
1005	object *otmp;	1043	object *otmp;
1006		1044
1007	if (QUERY_FLAG (this, FLAG_REMOVED))	1045	if (flag [FLAG_REMOVED])
1008	return;	1046	return;
1009		1047
1010	SET_FLAG (this, FLAG_REMOVED);
1011	INVOKE_OBJECT (REMOVE, this);	1048	INVOKE_OBJECT (REMOVE, this);
		1049
		1050	flag [FLAG_REMOVED] = true;
1012		1051
1013	if (more)	1052	if (more)
1014	more->remove ();	1053	more->remove ();
1015		1054
1016	/*	1055	/*
1017	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1018	* inventory.	1057	* inventory.
1019	*/	1058	*/
1020	if (env)	1059	if (env)
1021	{	1060	{
1022	if (nrof)	1061	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1023	sub_weight (env, weight * nrof);	1062	if (object *pl = visible_to ())
1024	else	1063	esrv_del_item (pl->contr, count);
1025	sub_weight (env, weight + carrying);	1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1065
		1066	adjust_weight (env, -total_weight ());
		1067
		1068	/* we set up values so that it could be inserted into
		1069	* the map, but we don't actually do that - it is up
		1070	* to the caller to decide what we want to do.
		1071	*/
		1072	map = env->map;
		1073	x = env->x;
		1074	y = env->y;
		1075
		1076	// make sure cmov optimisation is applicable
		1077	*(above ? &above->below : &env->inv) = below;
		1078	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1079
		1080	above = 0;
		1081	below = 0;
		1082	env = 0;
1026		1083
1027	/* NO_FIX_PLAYER is set when a great many changes are being	1084	/* NO_FIX_PLAYER is set when a great many changes are being
1028	* made to players inventory. If set, avoiding the call	1085	* made to players inventory. If set, avoiding the call
1029	* to save cpu time.	1086	* to save cpu time.
1030	*/	1087	*/
1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1032	otmp->update_stats ();	1089	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	}	1090	}
1051	else if (map)	1091	else if (map)
1052	{	1092	{
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;	1093	map->dirty = true;
1066	mapspace &ms = this->ms ();	1094	mapspace &ms = this->ms ();
1067		1095
		1096	if (object *pl = ms.player ())
		1097	{
		1098	if (type == PLAYER) // this == pl(!)
		1099	{
		1100	// leaving a spot always closes any open container on the ground
		1101	if (container && !container->env)
		1102	// this causes spurious floorbox updates, but it ensures
		1103	// that the CLOSE event is being sent.
		1104	close_container ();
		1105
		1106	--map->players;
		1107	map->touch ();
		1108	}
		1109	else if (pl->container == this)
		1110	{
		1111	// removing a container should close it
		1112	close_container ();
		1113	}
		1114
		1115	esrv_del_item (pl->contr, count);
		1116	}
		1117
1068	/* link the object above us */	1118	/* link the object above us */
1069	if (above)	1119	// re-link, make sure compiler can easily use cmove
1070	above->below = below;	1120	*(above ? &above->below : &ms.top) = below;
1071	else	1121	*(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		1122
1089	above = 0;	1123	above = 0;
1090	below = 0;	1124	below = 0;
1091		1125
1092	if (map->in_memory == MAP_SAVING)	1126	if (map->in_memory == MAP_SAVING)
…		…
1101	* removed (most likely destroyed), update the player view	1135	* removed (most likely destroyed), update the player view
1102	* appropriately.	1136	* appropriately.
1103	*/	1137	*/
1104	pl->close_container ();	1138	pl->close_container ();
1105		1139
		1140	//TODO: the floorbox prev/next might need updating
		1141	//esrv_del_item (pl->contr, count);
		1142	//TODO: update floorbox to preserve ordering
		1143	if (pl->contr->ns)
1106	pl->contr->ns->floorbox_update ();	1144	pl->contr->ns->floorbox_update ();
1107	}	1145	}
1108		1146
1109	for (tmp = ms.bot; tmp; tmp = tmp->above)	1147	for (tmp = ms.bot; tmp; tmp = tmp->above)
1110	{	1148	{
1111	/* No point updating the players look faces if he is the object	1149	/* No point updating the players look faces if he is the object
…		…
1155	if (!top)	1193	if (!top)
1156	for (top = op; top && top->above; top = top->above)	1194	for (top = op; top && top->above; top = top->above)
1157	;	1195	;
1158		1196
1159	for (; top; top = top->below)	1197	for (; top; top = top->below)
1160	{
1161	if (top == op)
1162	continue;
1163
1164	if (object::can_merge (op, top))	1198	if (object::can_merge (op, top))
1165	{	1199	{
1166	top->nrof += op->nrof;	1200	top->nrof += op->nrof;
1167		1201
1168	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1202	if (object *pl = top->visible_to ())
1169	op->weight = 0; /* Don't want any adjustements now */	1203	esrv_update_item (UPD_NROF, pl, top);
		1204
		1205	op->weight = 0; // cancel the addition above
		1206	op->carrying = 0; // must be 0 already
		1207
1170	op->destroy ();	1208	op->destroy (1);
		1209
1171	return top;	1210	return top;
1172	}	1211	}
1173	}
1174		1212
1175	return 0;	1213	return 0;
1176	}	1214	}
1177		1215
1178	void	1216	void
…		…
1235	* just 'op' otherwise	1273	* just 'op' otherwise
1236	*/	1274	*/
1237	object *	1275	object *
1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1276	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1239	{	1277	{
1240	assert (!op->flag [FLAG_FREED]);
1241
1242	object *top, *floor = NULL;
1243
1244	op->remove ();	1278	op->remove ();
1245		1279
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1280	/* 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	1281	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1282	* need extra work
1249	*/	1283	*/
1250	if (!xy_normalise (m, op->x, op->y))	1284	if (!xy_normalise (m, op->x, op->y))
1251	{	1285	{
1252	op->destroy ();	1286	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1253	return 0;	1287	return 0;
1254	}	1288	}
1255		1289
1256	if (object *more = op->more)	1290	if (object *more = op->more)
1257	if (!insert_ob_in_map (more, m, originator, flag))	1291	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1266	*/	1300	*/
1267	if (op->nrof && !(flag & INS_NO_MERGE))	1301	if (op->nrof && !(flag & INS_NO_MERGE))
1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1302	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269	if (object::can_merge (op, tmp))	1303	if (object::can_merge (op, tmp))
1270	{	1304	{
		1305	// TODO: we actually want to update tmp, not op,
		1306	// but some caller surely breaks when we return tmp
		1307	// from here :/
1271	op->nrof += tmp->nrof;	1308	op->nrof += tmp->nrof;
1272	tmp->destroy ();	1309	tmp->destroy (1);
1273	}	1310	}
1274		1311
1275	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1312	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1276	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1313	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1277		1314
…		…
1284	{	1321	{
1285	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1322	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1286	abort ();	1323	abort ();
1287	}	1324	}
1288		1325
		1326	if (!originator->is_on_map ())
		1327	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1328	op->debug_desc (), originator->debug_desc ());
		1329
1289	op->above = originator;	1330	op->above = originator;
1290	op->below = originator->below;	1331	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;	1332	originator->below = op;
		1333
		1334	*(op->below ? &op->below->above : &ms.bot) = op;
1299	}	1335	}
1300	else	1336	else
1301	{	1337	{
1302	top = ms.bot;	1338	object *floor = 0;
		1339	object *top = ms.top;
1303		1340
1304	/* If there are other objects, then */	1341	/* If there are other objects, then */
1305	if (top)	1342	if (top)
1306	{	1343	{
1307	object *last = 0;
1308
1309	/*	1344	/*
1310	* If there are multiple objects on this space, we do some trickier handling.	1345	* If there are multiple objects on this space, we do some trickier handling.
1311	* We've already dealt with merging if appropriate.	1346	* We've already dealt with merging if appropriate.
1312	* Generally, we want to put the new object on top. But if	1347	* Generally, we want to put the new object on top. But if
1313	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1348	* 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	1351	* 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	1352	* 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	1353	* when lots of spells are cast in one area. Currently, it is presumed
1319	* that flying non pickable objects are spell objects.	1354	* that flying non pickable objects are spell objects.
1320	*/	1355	*/
1321	for (top = ms.bot; top; top = top->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1322	{	1357	{
1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1358	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1324	floor = top;	1359	floor = tmp;
1325		1360
1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1361	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1327	{	1362	{
1328	/* We insert above top, so we want this object below this */	1363	/* We insert above top, so we want this object below this */
1329	top = top->below;	1364	top = tmp->below;
1330	break;	1365	break;
1331	}	1366	}
1332		1367
1333	last = top;	1368	top = tmp;
1334	}	1369	}
1335
1336	/* Don't want top to be NULL, so set it to the last valid object */
1337	top = last;
1338		1370
1339	/* We let update_position deal with figuring out what the space	1371	/* We let update_position deal with figuring out what the space
1340	* looks like instead of lots of conditions here.	1372	* looks like instead of lots of conditions here.
1341	* makes things faster, and effectively the same result.	1373	* makes things faster, and effectively the same result.
1342	*/	1374	*/
…		…
1349	*/	1381	*/
1350	if (!(flag & INS_ON_TOP)	1382	if (!(flag & INS_ON_TOP)
1351	&& ms.flags () & P_BLOCKSVIEW	1383	&& ms.flags () & P_BLOCKSVIEW
1352	&& (op->face && !faces [op->face].visibility))	1384	&& (op->face && !faces [op->face].visibility))
1353	{	1385	{
		1386	object *last;
		1387
1354	for (last = top; last != floor; last = last->below)	1388	for (last = top; last != floor; last = last->below)
1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1389	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1356	break;	1390	break;
1357		1391
1358	/* Check to see if we found the object that blocks view,	1392	/* Check to see if we found the object that blocks view,
…		…
1366	} /* If objects on this space */	1400	} /* If objects on this space */
1367		1401
1368	if (flag & INS_ABOVE_FLOOR_ONLY)	1402	if (flag & INS_ABOVE_FLOOR_ONLY)
1369	top = floor;	1403	top = floor;
1370		1404
1371	/* Top is the object that our object (op) is going to get inserted above.	1405	// insert object above top, or bottom-most if top = 0
1372	*/
1373
1374	/* First object on this space */
1375	if (!top)	1406	if (!top)
1376	{	1407	{
		1408	op->below = 0;
1377	op->above = ms.bot;	1409	op->above = ms.bot;
1378
1379	if (op->above)
1380	op->above->below = op;
1381
1382	op->below = 0;
1383	ms.bot = op;	1410	ms.bot = op;
		1411
		1412	*(op->above ? &op->above->below : &ms.top) = op;
1384	}	1413	}
1385	else	1414	else
1386	{ /* get inserted into the stack above top */	1415	{
1387	op->above = top->above;	1416	op->above = top->above;
1388
1389	if (op->above)
1390	op->above->below = op;	1417	top->above = op;
1391		1418
1392	op->below = top;	1419	op->below = top;
1393	top->above = op;	1420	*(op->above ? &op->above->below : &ms.top) = op;
1394	}	1421	}
1395		1422	}
1396	if (!op->above)
1397	ms.top = op;
1398	} /* else not INS_BELOW_ORIGINATOR */
1399		1423
1400	if (op->type == PLAYER)	1424	if (op->type == PLAYER)
1401	{	1425	{
1402	op->contr->do_los = 1;	1426	op->contr->do_los = 1;
1403	++op->map->players;	1427	++op->map->players;
…		…
1405	}	1429	}
1406		1430
1407	op->map->dirty = true;	1431	op->map->dirty = true;
1408		1432
1409	if (object *pl = ms.player ())	1433	if (object *pl = ms.player ())
		1434	//TODO: the floorbox prev/next might need updating
		1435	//esrv_send_item (pl, op);
		1436	//TODO: update floorbox to preserve ordering
		1437	if (pl->contr->ns)
1410	pl->contr->ns->floorbox_update ();	1438	pl->contr->ns->floorbox_update ();
1411		1439
1412	/* If this object glows, it may affect lighting conditions that are	1440	/* If this object glows, it may affect lighting conditions that are
1413	* visible to others on this map. But update_all_los is really	1441	* 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	1442	* 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	1443	* 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.	1485	* op is the object to insert it under: supplies x and the map.
1458	*/	1486	*/
1459	void	1487	void
1460	replace_insert_ob_in_map (const char *arch_string, object *op)	1488	replace_insert_ob_in_map (const char *arch_string, object *op)
1461	{	1489	{
1462	object *tmp, *tmp1;
1463
1464	/* first search for itself and remove any old instances */	1490	/* first search for itself and remove any old instances */
1465		1491
1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1492	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1468	tmp->destroy ();	1494	tmp->destroy (1);
1469		1495
1470	tmp1 = arch_to_object (archetype::find (arch_string));	1496	object *tmp = arch_to_object (archetype::find (arch_string));
1471		1497
1472	tmp1->x = op->x;	1498	tmp->x = op->x;
1473	tmp1->y = op->y;	1499	tmp->y = op->y;
		1500
1474	insert_ob_in_map (tmp1, op->map, op, 0);	1501	insert_ob_in_map (tmp, op->map, op, 0);
1475	}	1502	}
1476		1503
1477	object *	1504	object *
1478	object::insert_at (object *where, object *originator, int flags)	1505	object::insert_at (object *where, object *originator, int flags)
1479	{	1506	{
		1507	if (where->env)
		1508	return where->env->insert (this);
		1509	else
1480	return where->map->insert (this, where->x, where->y, originator, flags);	1510	return where->map->insert (this, where->x, where->y, originator, flags);
1481	}	1511	}
1482		1512
1483	/*	1513	/*
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	1514	* decrease(object, number) decreases a specified number from
1525	* the amount of an object. If the amount reaches 0, the object	1515	* the amount of an object. If the amount reaches 0, the object
1526	* is subsequently removed and freed.	1516	* is subsequently removed and freed.
1527	*	1517	*
1528	* Return value: 'op' if something is left, NULL if the amount reached 0	1518	* Return value: 'op' if something is left, NULL if the amount reached 0
1529	*/	1519	*/
		1520	bool
		1521	object::decrease (sint32 nr)
		1522	{
		1523	if (!nr)
		1524	return true;
		1525
		1526	nr = min (nr, nrof);
		1527
		1528	nrof -= nr;
		1529
		1530	if (nrof)
		1531	{
		1532	adjust_weight (env, -weight * nr); // carrying == 0
		1533
		1534	if (object *pl = visible_to ())
		1535	esrv_update_item (UPD_NROF, pl, this);
		1536
		1537	return true;
		1538	}
		1539	else
		1540	{
		1541	destroy (1);
		1542	return false;
		1543	}
		1544	}
		1545
		1546	/*
		1547	* split(ob,nr) splits up ob into two parts. The part which
		1548	* is returned contains nr objects, and the remaining parts contains
		1549	* the rest (or is removed and returned if that number is 0).
		1550	* On failure, NULL is returned.
		1551	*/
1530	object *	1552	object *
1531	decrease_ob_nr (object *op, uint32 i)	1553	object::split (sint32 nr)
1532	{	1554	{
1533	object *tmp;	1555	int have = number_of ();
1534		1556
1535	if (i == 0) /* objects with op->nrof require this check */	1557	if (have < nr)
1536	return op;	1558	return 0;
1537		1559	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	{	1560	{
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 ();	1561	remove ();
1573	op->nrof = 0;	1562	return this;
1574	if (tmp)
1575	esrv_del_item (tmp->contr, op->count);
1576	}
1577	}	1563	}
1578	else	1564	else
1579	{	1565	{
1580	object *above = op->above;	1566	decrease (nr);
1581		1567
1582	if (i < op->nrof)	1568	object *op = deep_clone ();
1583	op->nrof -= i;	1569	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;	1570	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	}	1571	}
1625	}	1572	}
1626		1573
1627	object *	1574	object *
1628	insert_ob_in_ob (object *op, object *where)	1575	insert_ob_in_ob (object *op, object *where)
…		…
1653	* be != op, if items are merged. -Tero	1600	* be != op, if items are merged. -Tero
1654	*/	1601	*/
1655	object *	1602	object *
1656	object::insert (object *op)	1603	object::insert (object *op)
1657	{	1604	{
1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1659	op->remove ();
1660
1661	if (op->more)	1605	if (op->more)
1662	{	1606	{
1663	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1607	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1664	return op;	1608	return op;
1665	}	1609	}
1666		1610
1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1611	op->remove ();
1668	CLEAR_FLAG (op, FLAG_REMOVED);	1612
		1613	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669		1614
1670	if (op->nrof)	1615	if (op->nrof)
1671	{
1672	for (object *tmp = inv; tmp; tmp = tmp->below)	1616	for (object *tmp = inv; tmp; tmp = tmp->below)
1673	if (object::can_merge (tmp, op))	1617	if (object::can_merge (tmp, op))
1674	{	1618	{
1675	/* return the original object and remove inserted object	1619	/* return the original object and remove inserted object
1676	(client needs the original object) */	1620	(client needs the original object) */
1677	tmp->nrof += op->nrof;	1621	tmp->nrof += op->nrof;
1678	/* Weight handling gets pretty funky. Since we are adding to	1622
1679	* tmp->nrof, we need to increase the weight.	1623	if (object *pl = tmp->visible_to ())
1680	*/	1624	esrv_update_item (UPD_NROF, pl, tmp);
		1625
1681	add_weight (this, op->weight * op->nrof);	1626	adjust_weight (this, op->total_weight ());
1682	SET_FLAG (op, FLAG_REMOVED);	1627
1683	op->destroy (); /* free the inserted object */	1628	op->destroy (1);
1684	op = tmp;	1629	op = tmp;
1685	op->remove (); /* and fix old object's links */	1630	goto inserted;
1686	CLEAR_FLAG (op, FLAG_REMOVED);
1687	break;
1688	}	1631	}
1689		1632
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.	1633	op->owner = 0; // it's his/hers now. period.
1706	op->map = 0;	1634	op->map = 0;
		1635	op->x = 0;
		1636	op->y = 0;
		1637
		1638	op->above = 0;
		1639	op->below = inv;
1707	op->env = this;	1640	op->env = this;
1708	op->above = 0;
1709	op->below = 0;
1710	op->x = op->y = 0;
1711		1641
		1642	if (inv)
		1643	inv->above = op;
		1644
		1645	inv = op;
		1646
		1647	op->flag [FLAG_REMOVED] = 0;
		1648
		1649	if (object *pl = op->visible_to ())
		1650	esrv_send_item (pl, op);
		1651
		1652	adjust_weight (this, op->total_weight ());
		1653
		1654	inserted:
1712	/* reset the light list and los of the players on the map */	1655	/* reset the light list and los of the players on the map */
1713	if (op->glow_radius && map)	1656	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);	1657	update_all_los (map, x, y);
1720	}
1721		1658
1722	/* Client has no idea of ordering so lets not bother ordering it here.	1659	// if this is a player's inventory, update stats
1723	* It sure simplifies this function...	1660	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1724	*/	1661	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		1662
1734	INVOKE_OBJECT (INSERT, this);	1663	INVOKE_OBJECT (INSERT, this);
1735		1664
1736	return op;	1665	return op;
1737	}	1666	}
…		…
1865	LOG (llevError, "Present_arch called outside map.\n");	1794	LOG (llevError, "Present_arch called outside map.\n");
1866	return NULL;	1795	return NULL;
1867	}	1796	}
1868		1797
1869	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1798	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1870	if (tmp->arch == at)	1799	if (tmp->arch->archname == at->archname)
1871	return tmp;	1800	return tmp;
1872		1801
1873	return NULL;	1802	return NULL;
1874	}	1803	}
1875		1804
…		…
1939	* The first matching object is returned, or NULL if none.	1868	* The first matching object is returned, or NULL if none.
1940	*/	1869	*/
1941	object *	1870	object *
1942	present_arch_in_ob (const archetype *at, const object *op)	1871	present_arch_in_ob (const archetype *at, const object *op)
1943	{	1872	{
1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1873	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945	if (tmp->arch == at)	1874	if (tmp->arch->archname == at->archname)
1946	return tmp;	1875	return tmp;
1947		1876
1948	return NULL;	1877	return NULL;
1949	}	1878	}
1950		1879
…		…
2012		1941
2013	/* However, often	1942	/* However, often
2014	* ob doesn't have any move type (when used to place exits)	1943	* ob doesn't have any move type (when used to place exits)
2015	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1944	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2016	*/	1945	*/
2017	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1946	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2018	{	1947	{
2019	altern [index++] = i;	1948	altern [index++] = i;
2020	continue;	1949	continue;
2021	}	1950	}
2022		1951
…		…
2359		2288
2360	/*	2289	/*
2361	* create clone from object to another	2290	* create clone from object to another
2362	*/	2291	*/
2363	object *	2292	object *
2364	object_create_clone (object *asrc)	2293	object::deep_clone ()
2365	{	2294	{
2366	object *dst = 0, *tmp, *src, *prev, *item;	2295	assert (("deep_clone called on non-head object", is_head ()));
2367		2296
2368	if (!asrc)	2297	object *dst = clone ();
2369	return 0;
2370		2298
2371	src = asrc->head_ ();	2299	object *prev = dst;
2372
2373	prev = 0;
2374	for (object *part = src; part; part = part->more)	2300	for (object *part = this->more; part; part = part->more)
2375	{	2301	{
2376	tmp = part->clone ();	2302	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;	2303	tmp->head = dst;
2387
2388	tmp->more = 0;
2389
2390	if (prev)
2391	prev->more = tmp;	2304	prev->more = tmp;
2392
2393	prev = tmp;	2305	prev = tmp;
2394	}	2306	}
2395		2307
2396	for (item = src->inv; item; item = item->below)	2308	for (object *item = inv; item; item = item->below)
2397	insert_ob_in_ob (object_create_clone (item), dst);	2309	insert_ob_in_ob (item->deep_clone (), dst);
2398		2310
2399	return dst;	2311	return dst;
2400	}	2312	}
2401		2313
2402	/* This returns the first object in who's inventory that	2314	/* This returns the first object in who's inventory that
…		…
2411	return tmp;	2323	return tmp;
2412		2324
2413	return 0;	2325	return 0;
2414	}	2326	}
2415		2327
2416	/* If ob has a field named key, return the link from the list,	2328	const shstr &
2417	* otherwise return NULL.	2329	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	{	2330	{
2425	for (key_value *link = ob->key_values; link; link = link->next)	2331	for (key_value *kv = key_values; kv; kv = kv->next)
2426	if (link->key == key)	2332	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;	2333	return kv->value;
2461		2334
2462	return 0;	2335	return shstr_null;
2463	}	2336	}
2464		2337
2465	/*	2338	void
2466	* Updates the canonical_key in op to value.	2339	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	{	2340	{
2478	key_value *field = NULL, *last = NULL;	2341	for (key_value *kv = key_values; kv; kv = kv->next)
2479		2342	if (kv->key == key)
2480	for (field = op->key_values; field != NULL; field = field->next)
2481	{
2482	if (field->key != canonical_key)
2483	{	2343	{
2484	last = field;	2344	kv->value = value;
2485	continue;	2345	return;
2486	}	2346	}
2487		2347
2488	if (value)	2348	key_value *kv = new key_value;
2489	field->value = value;	2349
2490	else	2350	kv->next = key_values;
		2351	kv->key = key;
		2352	kv->value = value;
		2353
		2354	key_values = kv;
		2355	}
		2356
		2357	void
		2358	object::kv_del (const shstr &key)
		2359	{
		2360	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2361	if ((*kvp)->key == key)
2491	{	2362	{
2492	/* Basically, if the archetype has this key set,	2363	key_value *kv = *kvp;
2493	* we need to store the null value so when we save	2364	*kvp = (*kvp)->next;
2494	* it, we save the empty value so that when we load,	2365	delete kv;
2495	* we get this value back again.	2366	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	}	2367	}
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	}	2368	}
2554		2369
2555	object::depth_iterator::depth_iterator (object *container)	2370	object::depth_iterator::depth_iterator (object *container)
2556	: iterator_base (container)	2371	: iterator_base (container)
2557	{	2372	{
…		…
2607	{	2422	{
2608	char flagdesc[512];	2423	char flagdesc[512];
2609	char info2[256 * 4];	2424	char info2[256 * 4];
2610	char *p = info;	2425	char *p = info;
2611		2426
2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2427	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2613	count, uuid.seq,	2428	count,
		2429	uuid.c_str (),
2614	&name,	2430	&name,
2615	title ? "\",title:\"" : "",	2431	title ? ",title:\"" : "",
2616	title ? (const char *)title : "",	2432	title ? (const char *)title : "",
		2433	title ? "\"" : "",
2617	flag_desc (flagdesc, 512), type);	2434	flag_desc (flagdesc, 512), type);
2618		2435
2619	if (!this->flag[FLAG_REMOVED] && env)	2436	if (!flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2437	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2438
2622	if (map)	2439	if (map)
2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2440	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624		2441
…		…
2654	object::open_container (object *new_container)	2471	object::open_container (object *new_container)
2655	{	2472	{
2656	if (container == new_container)	2473	if (container == new_container)
2657	return;	2474	return;
2658		2475
2659	if (object *old_container = container)	2476	object *old_container = container;
		2477
		2478	if (old_container)
2660	{	2479	{
2661	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2480	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2662	return;	2481	return;
2663		2482
2664	#if 0	2483	#if 0
…		…
2666	if (object *closer = old_container->inv)	2485	if (object *closer = old_container->inv)
2667	if (closer->type == CLOSE_CON)	2486	if (closer->type == CLOSE_CON)
2668	closer->destroy ();	2487	closer->destroy ();
2669	#endif	2488	#endif
2670		2489
		2490	// make sure the container is available
		2491	esrv_send_item (this, old_container);
		2492
2671	old_container->flag [FLAG_APPLIED] = 0;	2493	old_container->flag [FLAG_APPLIED] = false;
2672	container = 0;	2494	container = 0;
2673		2495
		2496	// client needs item update to make it work, client bug requires this to be separate
2674	esrv_update_item (UPD_FLAGS, this, old_container);	2497	esrv_update_item (UPD_FLAGS, this, old_container);
		2498
2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2499	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2676	play_sound (sound_find ("chest_close"));	2500	play_sound (sound_find ("chest_close"));
2677	}	2501	}
2678		2502
2679	if (new_container)	2503	if (new_container)
…		…
2692	}	2516	}
2693	#endif	2517	#endif
2694		2518
2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2519	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2696		2520
		2521	// make sure the container is available, client bug requires this to be separate
		2522	esrv_send_item (this, new_container);
		2523
2697	new_container->flag [FLAG_APPLIED] = 1;	2524	new_container->flag [FLAG_APPLIED] = true;
2698	container = new_container;	2525	container = new_container;
2699		2526
		2527	// client needs flag change
2700	esrv_update_item (UPD_FLAGS, this, new_container);	2528	esrv_update_item (UPD_FLAGS, this, new_container);
2701	esrv_send_inventory (this, new_container);	2529	esrv_send_inventory (this, new_container);
2702	play_sound (sound_find ("chest_open"));	2530	play_sound (sound_find ("chest_open"));
2703	}	2531	}
		2532	// else if (!old_container->env && contr && contr->ns)
		2533	// contr->ns->floorbox_reset ();
2704	}	2534	}
2705		2535
2706	object *	2536	object *
2707	object::force_find (const shstr name)	2537	object::force_find (const shstr name)
2708	{	2538	{
…		…
2734		2564
2735	insert (force);	2565	insert (force);
2736	}	2566	}
2737		2567
2738	void	2568	void
2739	object::play_sound (faceidx sound) const	2569	object::play_sound (faceidx sound)
2740	{	2570	{
2741	if (!sound)	2571	if (!sound)
2742	return;	2572	return;
2743		2573
2744	if (flag [FLAG_REMOVED])	2574	if (flag [FLAG_REMOVED])

Diff Legend

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