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.201 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.240 by root, Wed May 7 13:40:30 2008 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
…		…
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	46	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	52	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;
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	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	194	* nrof values.
211	*/	195	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	197	return 0;
214		198
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* 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	200	* 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	201	* 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	202	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	203	* flags lose any meaning.
220	*/	204	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		207
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		210
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	215	|| 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	216	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	232	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	235	return 0;
253		236
		237	if ((ob1->flag ^ ob2->flag)
		238	.reset (FLAG_INV_LOCKED)
		239	.reset (FLAG_CLIENT_SENT)
		240	.reset (FLAG_REMOVED)
		241	.any ())
		242	return 0;
		243
254	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
256	*/	247	*/
257	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
258	{	249	{
259	if (!(ob1->inv && ob2->inv))	250	if (!(ob1->inv && ob2->inv))
260	return 0; /* inventories differ in length */	251	return 0; /* inventories differ in length */
261		252
262	if (ob1->inv->below || ob2->inv->below)	253	if (ob1->inv->below || ob2->inv->below)
263	return 0; /* more than one object in inv */	254	return 0; /* more than one object in inv */
264		255
265	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0; /* inventory objexts differ */	257	return 0; /* inventory objects differ */
267		258
268	/* inventory ok - still need to check rest of this object to see	259	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	260	* if it is valid.
270	*/	261	*/
271	}	262	}
…		…
290	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
291	return 0;	282	return 0;
292	break;	283	break;
293	}	284	}
294		285
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
296	{	287	{
297	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
300	return 0;	291
301	else if (!compare_ob_value_lists (ob1, ob2))	292	if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	293	return 0;
303	}	294	}
304		295
305	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
306	{	297	{
…		…
312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314		305
315	if (k1 != k2)	306	if (k1 != k2)
316	return 0;	307	return 0;
		308
317	else if (k1 == 0)	309	if (k1 == 0)
318	return 1;	310	return 1;
		311
319	else if (!cfperl_can_merge (ob1, ob2))	312	if (!cfperl_can_merge (ob1, ob2))
320	return 0;	313	return 0;
321	}	314	}
322	}	315	}
323		316
324	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
325	return 1;	318	return 1;
326	}	319	}
327		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container || this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
		357	// adjust weight per container type ("of holding")
		358	static sint32
		359	weight_adjust_for (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
328	/*	366	/*
		367	* adjust_weight(object, weight) adds the specified weight to an object,
		368	* and also updates how much the environment(s) is/are carrying.
		369	*/
		370	static void
		371	adjust_weight (object *op, sint32 weight)
		372	{
		373	while (op)
		374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
		379
		380	if (!weight)
		381	return;
		382
		383	op->carrying += weight;
		384
		385	if (object *pl = op->visible_to ())
		386	if (pl != op) // player is handled lazily
		387	esrv_update_item (UPD_WEIGHT, pl, op);
		388
		389	op = op->env;
		390	}
		391	}
		392
		393	/*
329	* sum_weight() is a recursive function which calculates the weight	394	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	395	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	396	* containers are carrying, and sums it up.
332	*/	397	*/
333	long	398	void
334	sum_weight (object *op)	399	object::update_weight ()
335	{	400	{
336	long sum;	401	sint32 sum = 0;
337	object *inv;
338		402
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	403	for (object *op = inv; op; op = op->below)
340	{	404	{
341	if (inv->inv)	405	if (op->inv)
342	sum_weight (inv);	406	op->update_weight ();
343		407
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	408	sum += op->total_weight ();
		409	}
		410
		411	sum = weight_adjust_for (this, sum);
		412
		413	if (sum != carrying)
345	}	414	{
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;	415	carrying = sum;
352		416
353	return sum;	417	if (object *pl = visible_to ())
		418	if (pl != this) // player is handled lazily
		419	esrv_update_item (UPD_WEIGHT, pl, this);
		420	}
354	}	421	}
355		422
356	/**	423	/*
357	* Return the outermost environment object for a given object.	424	* 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	*/	425	*/
373	char *	426	char *
374	dump_object (object *op)	427	dump_object (object *op)
375	{	428	{
376	if (!op)	429	if (!op)
…		…
390	get_nearest_part (object *op, const object *pl)	443	get_nearest_part (object *op, const object *pl)
391	{	444	{
392	object *tmp, *closest;	445	object *tmp, *closest;
393	int last_dist, i;	446	int last_dist, i;
394		447
395	if (op->more == NULL)	448	if (!op->more)
396	return op;	449	return op;
		450
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	451	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		452	tmp;
		453	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	454	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	455	closest = tmp, last_dist = i;
		456
400	return closest;	457	return closest;
401	}	458	}
402		459
403	/*	460	/*
404	* Returns the object which has the count-variable equal to the argument.	461	* Returns the object which has the count-variable equal to the argument.
		462	* VERRRY slow.
405	*/	463	*/
406	object *	464	object *
407	find_object (tag_t i)	465	find_object (tag_t i)
408	{	466	{
409	for_all_objects (op)	467	for_all_objects (op)
…		…
427	for_all_objects (op)	485	for_all_objects (op)
428	if (op->name == str_)	486	if (op->name == str_)
429	break;	487	break;
430		488
431	return op;	489	return op;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	490	}
439		491
440	/*	492	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	493	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	494	* skill and experience objects.
…		…
540	}	592	}
541		593
542	op->key_values = 0;	594	op->key_values = 0;
543	}	595	}
544		596
545	object &	597	/*
546	object::operator =(const object &src)	598	* copy_to first frees everything allocated by the dst object,
		599	* and then copies the contents of itself into the second
		600	* object, allocating what needs to be allocated. Basically, any
		601	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		602	* if the first object is freed, the pointers in the new object
		603	* will point at garbage.
		604	*/
		605	void
		606	object::copy_to (object *dst)
547	{	607	{
548	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
549	bool is_removed = flag [FLAG_REMOVED];
550
551	*(object_copy *)this = src;	609	*(object_copy *)dst = *this;
552
553	flag [FLAG_FREED] = is_freed;
554	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
555		611
556	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
557	if (src.key_values)	613	if (key_values)
558	{	614	{
559	key_value *tail = 0;	615	key_value *tail = 0;
560	key_values = 0;	616	dst->key_values = 0;
561		617
562	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
563	{	619	{
564	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
565		621
566	new_link->next = 0;	622	new_link->next = 0;
567	new_link->key = i->key;	623	new_link->key = i->key;
568	new_link->value = i->value;	624	new_link->value = i->value;
569		625
570	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
571	if (!key_values)	627	if (!dst->key_values)
572	{	628	{
573	key_values = new_link;	629	dst->key_values = new_link;
574	tail = new_link;	630	tail = new_link;
575	}	631	}
576	else	632	else
577	{	633	{
578	tail->next = new_link;	634	tail->next = new_link;
579	tail = new_link;	635	tail = new_link;
580	}	636	}
581	}	637	}
582	}	638	}
583	}
584
585	/*
586	* copy_to first frees everything allocated by the dst object,
587	* and then copies the contents of itself into the second
588	* object, allocating what needs to be allocated. Basically, any
589	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
590	* if the first object is freed, the pointers in the new object
591	* will point at garbage.
592	*/
593	void
594	object::copy_to (object *dst)
595	{
596	*dst = *this;
597		639
598	if (speed < 0)	640	if (speed < 0)
599	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
600		642
601	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
603		645
604	void	646	void
605	object::instantiate ()	647	object::instantiate ()
606	{	648	{
607	if (!uuid.seq) // HACK	649	if (!uuid.seq) // HACK
608	uuid = gen_uuid ();	650	uuid = UUID::gen ();
609		651
610	speed_left = -0.1f;	652	speed_left = -0.1f;
611	/* copy the body_info to the body_used - this is only really	653	/* copy the body_info to the body_used - this is only really
612	* need for monsters, but doesn't hurt to do it for everything.	654	* need for monsters, but doesn't hurt to do it for everything.
613	* by doing so, when a monster is created, it has good starting	655	* by doing so, when a monster is created, it has good starting
…		…
623	object *	665	object *
624	object::clone ()	666	object::clone ()
625	{	667	{
626	object *neu = create ();	668	object *neu = create ();
627	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
628	return neu;	671	return neu;
629	}	672	}
630		673
631	/*	674	/*
632	* If an object with the IS_TURNABLE() flag needs to be turned due	675	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
683	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
684	*/	727	*/
685	void	728	void
686	update_object (object *op, int action)	729	update_object (object *op, int action)
687	{	730	{
688	if (op == NULL)	731	if (!op)
689	{	732	{
690	/* this should never happen */	733	/* this should never happen */
691	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
692	return;	735	return;
693	}	736	}
694		737
695	if (op->env)	738	if (!op->is_on_map ())
696	{	739	{
697	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
698	* to do in this case.	741	* to do in this case.
699	*/	742	*/
700	return;	743	return;
701	}	744	}
702
703	/* If the map is saving, don't do anything as everything is
704	* going to get freed anyways.
705	*/
706	if (!op->map || op->map->in_memory == MAP_SAVING)
707	return;
708		745
709	/* make sure the object is within map boundaries */	746	/* make sure the object is within map boundaries */
710	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	747	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
711	{	748	{
712	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
772	static int object_count;	809	static int object_count;
773		810
774	void object::link ()	811	void object::link ()
775	{	812	{
776	assert (!index);//D	813	assert (!index);//D
777	uuid = gen_uuid ();	814	uuid = UUID::gen ();
778	count = ++object_count;	815	count = ++object_count;
779		816
780	refcnt_inc ();	817	refcnt_inc ();
781	objects.insert (this);	818	objects.insert (this);
782	}	819	}
…		…
855	object::destroy_inv (bool drop_to_ground)	892	object::destroy_inv (bool drop_to_ground)
856	{	893	{
857	// need to check first, because the checks below might segfault	894	// need to check first, because the checks below might segfault
858	// as we might be on an invalid mapspace and crossfire code	895	// as we might be on an invalid mapspace and crossfire code
859	// is too buggy to ensure that the inventory is empty.	896	// is too buggy to ensure that the inventory is empty.
860	// corollary: if you create arrows etc. with stuff in tis inventory,	897	// corollary: if you create arrows etc. with stuff in its inventory,
861	// cf will crash below with off-map x and y	898	// cf will crash below with off-map x and y
862	if (!inv)	899	if (!inv)
863	return;	900	return;
864		901
865	/* Only if the space blocks everything do we not process -	902	/* Only if the space blocks everything do we not process -
866	* if some form of movement is allowed, let objects	903	* if some form of movement is allowed, let objects
867	* drop on that space.	904	* drop on that space.
868	*/	905	*/
869	if (!drop_to_ground	906	if (!drop_to_ground
870	|| !map	907	|| !map
871	|| map->in_memory != MAP_IN_MEMORY	908	|| map->in_memory != MAP_ACTIVE
872	|| map->nodrop	909	|| map->no_drop
873	|| ms ().move_block == MOVE_ALL)	910	|| ms ().move_block == MOVE_ALL)
874	{	911	{
875	while (inv)	912	while (inv)
876	{	913	{
877	inv->destroy_inv (drop_to_ground);	914	inv->destroy_inv (false);
878	inv->destroy ();	915	inv->destroy ();
879	}	916	}
880	}	917	}
881	else	918	else
882	{ /* Put objects in inventory onto this space */	919	{ /* Put objects in inventory onto this space */
…		…
888	|| op->flag [FLAG_NO_DROP]	925	|| op->flag [FLAG_NO_DROP]
889	|| op->type == RUNE	926	|| op->type == RUNE
890	|| op->type == TRAP	927	|| op->type == TRAP
891	|| op->flag [FLAG_IS_A_TEMPLATE]	928	|| op->flag [FLAG_IS_A_TEMPLATE]
892	|| op->flag [FLAG_DESTROY_ON_DEATH])	929	|| op->flag [FLAG_DESTROY_ON_DEATH])
893	op->destroy ();	930	op->destroy (true);
894	else	931	else
895	map->insert (op, x, y);	932	map->insert (op, x, y);
896	}	933	}
897	}	934	}
898	}	935	}
…		…
902	object *op = new object;	939	object *op = new object;
903	op->link ();	940	op->link ();
904	return op;	941	return op;
905	}	942	}
906		943
		944	static struct freed_map : maptile
		945	{
		946	freed_map ()
		947	{
		948	path = "<freed objects map>";
		949	name = "/internal/freed_objects_map";
		950	width = 3;
		951	height = 3;
		952	no_drop = 1;
		953	no_reset = 1;
		954
		955	alloc ();
		956	in_memory = MAP_ACTIVE;
		957	}
		958
		959	~freed_map ()
		960	{
		961	destroy ();
		962	}
		963	} freed_map; // freed objects are moved here to avoid crashes
		964
907	void	965	void
908	object::do_destroy ()	966	object::do_destroy ()
909	{	967	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	968	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	969	remove_button_link (this);
914		970
915	if (flag [FLAG_FRIENDLY])	971	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	972	remove_friendly_object (this);
917		973
918	if (!flag [FLAG_REMOVED])
919	remove ();	974	remove ();
920		975
921	destroy_inv (true);	976	attachable::do_destroy ();
922		977
923	deactivate ();	978	deactivate ();
924	unlink ();	979	unlink ();
925		980
926	flag [FLAG_FREED] = 1;	981	flag [FLAG_FREED] = 1;
927		982
928	// hack to ensure that freed objects still have a valid map	983	// hack to ensure that freed objects still have a valid map
929	{
930	static maptile *freed_map; // freed objects are moved here to avoid crashes
931
932	if (!freed_map)
933	{
934	freed_map = new maptile;
935
936	freed_map->path = "<freed objects map>";
937	freed_map->name = "/internal/freed_objects_map";
938	freed_map->width = 3;
939	freed_map->height = 3;
940	freed_map->nodrop = 1;
941
942	freed_map->alloc ();
943	freed_map->in_memory = MAP_IN_MEMORY;
944	}
945
946	map = freed_map;	984	map = &freed_map;
947	x = 1;	985	x = 1;
948	y = 1;	986	y = 1;
949	}
950		987
951	if (more)	988	if (more)
952	{	989	{
953	more->destroy ();	990	more->destroy ();
954	more = 0;	991	more = 0;
…		…
967	object::destroy (bool destroy_inventory)	1004	object::destroy (bool destroy_inventory)
968	{	1005	{
969	if (destroyed ())	1006	if (destroyed ())
970	return;	1007	return;
971		1008
		1009	if (!is_head () && !head->destroyed ())
		1010	{
		1011	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1012	head->destroy (destroy_inventory);
		1013	return;
		1014	}
		1015
972	if (destroy_inventory)	1016	destroy_inv (!destroy_inventory);
973	destroy_inv (false);
974		1017
975	if (is_head ())	1018	if (is_head ())
976	if (sound_destroy)	1019	if (sound_destroy)
977	play_sound (sound_destroy);	1020	play_sound (sound_destroy);
978	else if (flag [FLAG_MONSTER])	1021	else if (flag [FLAG_MONSTER])
979	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1022	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
980		1023
981	attachable::destroy ();	1024	attachable::destroy ();
982	}
983
984	/*
985	* sub_weight() recursively (outwards) subtracts a number from the
986	* weight of an object (and what is carried by it's environment(s)).
987	*/
988	void
989	sub_weight (object *op, signed long weight)
990	{
991	while (op != NULL)
992	{
993	if (op->type == CONTAINER)
994	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
995
996	op->carrying -= weight;
997	op = op->env;
998	}
999	}	1025	}
1000		1026
1001	/* op->remove ():	1027	/* op->remove ():
1002	* This function removes the object op from the linked list of objects	1028	* This function removes the object op from the linked list of objects
1003	* which it is currently tied to. When this function is done, the	1029	* which it is currently tied to. When this function is done, the
…		…
1009	object::do_remove ()	1035	object::do_remove ()
1010	{	1036	{
1011	object *tmp, *last = 0;	1037	object *tmp, *last = 0;
1012	object *otmp;	1038	object *otmp;
1013		1039
1014	if (QUERY_FLAG (this, FLAG_REMOVED))	1040	if (flag [FLAG_REMOVED])
1015	return;	1041	return;
1016		1042
1017	SET_FLAG (this, FLAG_REMOVED);
1018	INVOKE_OBJECT (REMOVE, this);	1043	INVOKE_OBJECT (REMOVE, this);
		1044
		1045	flag [FLAG_REMOVED] = true;
1019		1046
1020	if (more)	1047	if (more)
1021	more->remove ();	1048	more->remove ();
1022		1049
1023	/*	1050	/*
1024	* In this case, the object to be removed is in someones	1051	* In this case, the object to be removed is in someones
1025	* inventory.	1052	* inventory.
1026	*/	1053	*/
1027	if (env)	1054	if (env)
1028	{	1055	{
1029	if (nrof)	1056	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1030	sub_weight (env, weight * nrof);	1057	if (object *pl = visible_to ())
1031	else	1058	esrv_del_item (pl->contr, count);
1032	sub_weight (env, weight + carrying);	1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1060
		1061	adjust_weight (env, -total_weight ());
		1062
		1063	/* we set up values so that it could be inserted into
		1064	* the map, but we don't actually do that - it is up
		1065	* to the caller to decide what we want to do.
		1066	*/
		1067	map = env->map;
		1068	x = env->x;
		1069	y = env->y;
		1070
		1071	// make sure cmov optimisation is applicable
		1072	*(above ? &above->below : &env->inv) = below;
		1073	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1074
		1075	above = 0;
		1076	below = 0;
		1077	env = 0;
1033		1078
1034	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
1035	* made to players inventory. If set, avoiding the call	1080	* made to players inventory. If set, avoiding the call
1036	* to save cpu time.	1081	* to save cpu time.
1037	*/	1082	*/
1038	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1039	otmp->update_stats ();	1084	otmp->update_stats ();
1040
1041	if (above)
1042	above->below = below;
1043	else
1044	env->inv = below;
1045
1046	if (below)
1047	below->above = above;
1048
1049	/* we set up values so that it could be inserted into
1050	* the map, but we don't actually do that - it is up
1051	* to the caller to decide what we want to do.
1052	*/
1053	x = env->x, y = env->y;
1054	map = env->map;
1055	above = 0, below = 0;
1056	env = 0;
1057	}	1085	}
1058	else if (map)	1086	else if (map)
1059	{	1087	{
1060	if (type == PLAYER)
1061	{
1062	// leaving a spot always closes any open container on the ground
1063	if (container && !container->env)
1064	// this causes spurious floorbox updates, but it ensures
1065	// that the CLOSE event is being sent.
1066	close_container ();
1067
1068	--map->players;
1069	map->touch ();
1070	}
1071
1072	map->dirty = true;	1088	map->dirty = true;
1073	mapspace &ms = this->ms ();	1089	mapspace &ms = this->ms ();
1074		1090
		1091	if (object *pl = ms.player ())
		1092	{
		1093	if (type == PLAYER) // this == pl(!)
		1094	{
		1095	// leaving a spot always closes any open container on the ground
		1096	if (container && !container->env)
		1097	// this causes spurious floorbox updates, but it ensures
		1098	// that the CLOSE event is being sent.
		1099	close_container ();
		1100
		1101	--map->players;
		1102	map->touch ();
		1103	}
		1104	else if (pl->container == this)
		1105	{
		1106	// removing a container should close it
		1107	close_container ();
		1108	}
		1109
		1110	esrv_del_item (pl->contr, count);
		1111	}
		1112
1075	/* link the object above us */	1113	/* link the object above us */
1076	if (above)	1114	// re-link, make sure compiler can easily use cmove
1077	above->below = below;	1115	*(above ? &above->below : &ms.top) = below;
1078	else	1116	*(below ? &below->above : &ms.bot) = above;
1079	ms.top = below; /* we were top, set new top */
1080
1081	/* Relink the object below us, if there is one */
1082	if (below)
1083	below->above = above;
1084	else
1085	{
1086	/* Nothing below, which means we need to relink map object for this space
1087	* use translated coordinates in case some oddness with map tiling is
1088	* evident
1089	*/
1090	if (GET_MAP_OB (map, x, y) != this)
1091	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 ());
1092
1093	ms.bot = above; /* goes on above it. */
1094	}
1095		1117
1096	above = 0;	1118	above = 0;
1097	below = 0;	1119	below = 0;
1098		1120
1099	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
…		…
1108	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1109	* appropriately.	1131	* appropriately.
1110	*/	1132	*/
1111	pl->close_container ();	1133	pl->close_container ();
1112		1134
		1135	//TODO: the floorbox prev/next might need updating
		1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
1113	pl->contr->ns->floorbox_update ();	1139	pl->contr->ns->floorbox_update ();
1114	}	1140	}
1115		1141
1116	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1117	{	1143	{
1118	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
…		…
1162	if (!top)	1188	if (!top)
1163	for (top = op; top && top->above; top = top->above)	1189	for (top = op; top && top->above; top = top->above)
1164	;	1190	;
1165		1191
1166	for (; top; top = top->below)	1192	for (; top; top = top->below)
1167	{
1168	if (top == op)
1169	continue;
1170
1171	if (object::can_merge (op, top))	1193	if (object::can_merge (op, top))
1172	{	1194	{
1173	top->nrof += op->nrof;	1195	top->nrof += op->nrof;
1174		1196
1175	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1197	if (object *pl = top->visible_to ())
1176	op->weight = 0; /* Don't want any adjustements now */	1198	esrv_update_item (UPD_NROF, pl, top);
		1199
		1200	op->weight = 0; // cancel the addition above
		1201	op->carrying = 0; // must be 0 already
		1202
1177	op->destroy ();	1203	op->destroy (1);
		1204
1178	return top;	1205	return top;
1179	}	1206	}
1180	}
1181		1207
1182	return 0;	1208	return 0;
1183	}	1209	}
1184		1210
1185	void	1211	void
…		…
1242	* just 'op' otherwise	1268	* just 'op' otherwise
1243	*/	1269	*/
1244	object *	1270	object *
1245	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1271	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1246	{	1272	{
1247	assert (!op->flag [FLAG_FREED]);
1248
1249	object *top, *floor = NULL;
1250
1251	op->remove ();	1273	op->remove ();
1252		1274
1253	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* Ideally, the caller figures this out. However, it complicates a lot
1254	* of areas of callers (eg, anything that uses find_free_spot would now	1276	* of areas of callers (eg, anything that uses find_free_spot would now
1255	* need extra work	1277	* need extra work
1256	*/	1278	*/
1257	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1258	{	1280	{
1259	op->destroy ();	1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1260	return 0;	1282	return 0;
1261	}	1283	}
1262		1284
1263	if (object *more = op->more)	1285	if (object *more = op->more)
1264	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1273	*/	1295	*/
1274	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1276	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1277	{	1299	{
		1300	// TODO: we actually want to update tmp, not op,
		1301	// but some caller surely breaks when we return tmp
		1302	// from here :/
1278	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1279	tmp->destroy ();	1304	tmp->destroy (1);
1280	}	1305	}
1281		1306
1282	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1283	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1284		1309
1285	if (!QUERY_FLAG (op, FLAG_ALIVE))	1310	if (!QUERY_FLAG (op, FLAG_ALIVE))
1286	CLEAR_FLAG (op, FLAG_NO_STEAL);	1311	CLEAR_FLAG (op, FLAG_NO_STEAL);
1287		1312
1288	if (flag & INS_BELOW_ORIGINATOR)	1313	if (flag & INS_BELOW_ORIGINATOR)
1289	{	1314	{
1290	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1315	if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ())
1291	{	1316	{
1292	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1293	abort ();	1318	abort ();
1294	}	1319	}
1295		1320
1296	op->above = originator;	1321	op->above = originator;
1297	op->below = originator->below;	1322	op->below = originator->below;
1298
1299	if (op->below)
1300	op->below->above = op;
1301	else
1302	ms.bot = op;
1303
1304	/* since *below* originator, no need to update top */
1305	originator->below = op;	1323	originator->below = op;
		1324
		1325	*(op->below ? &op->below->above : &ms.bot) = op;
1306	}	1326	}
1307	else	1327	else
1308	{	1328	{
1309	top = ms.bot;	1329	object *floor = 0;
		1330	object *top = ms.top;
1310		1331
1311	/* If there are other objects, then */	1332	/* If there are other objects, then */
1312	if (top)	1333	if (top)
1313	{	1334	{
1314	object *last = 0;
1315
1316	/*	1335	/*
1317	* If there are multiple objects on this space, we do some trickier handling.	1336	* If there are multiple objects on this space, we do some trickier handling.
1318	* We've already dealt with merging if appropriate.	1337	* We've already dealt with merging if appropriate.
1319	* Generally, we want to put the new object on top. But if	1338	* Generally, we want to put the new object on top. But if
1320	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1339	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1323	* once we get to them. This reduces the need to traverse over all of	1342	* once we get to them. This reduces the need to traverse over all of
1324	* them when adding another one - this saves quite a bit of cpu time	1343	* them when adding another one - this saves quite a bit of cpu time
1325	* when lots of spells are cast in one area. Currently, it is presumed	1344	* when lots of spells are cast in one area. Currently, it is presumed
1326	* that flying non pickable objects are spell objects.	1345	* that flying non pickable objects are spell objects.
1327	*/	1346	*/
1328	for (top = ms.bot; top; top = top->above)	1347	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	{	1348	{
1330	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1349	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1331	floor = top;	1350	floor = tmp;
1332		1351
1333	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1352	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1334	{	1353	{
1335	/* We insert above top, so we want this object below this */	1354	/* We insert above top, so we want this object below this */
1336	top = top->below;	1355	top = tmp->below;
1337	break;	1356	break;
1338	}	1357	}
1339		1358
1340	last = top;	1359	top = tmp;
1341	}	1360	}
1342
1343	/* Don't want top to be NULL, so set it to the last valid object */
1344	top = last;
1345		1361
1346	/* We let update_position deal with figuring out what the space	1362	/* We let update_position deal with figuring out what the space
1347	* looks like instead of lots of conditions here.	1363	* looks like instead of lots of conditions here.
1348	* makes things faster, and effectively the same result.	1364	* makes things faster, and effectively the same result.
1349	*/	1365	*/
…		…
1356	*/	1372	*/
1357	if (!(flag & INS_ON_TOP)	1373	if (!(flag & INS_ON_TOP)
1358	&& ms.flags () & P_BLOCKSVIEW	1374	&& ms.flags () & P_BLOCKSVIEW
1359	&& (op->face && !faces [op->face].visibility))	1375	&& (op->face && !faces [op->face].visibility))
1360	{	1376	{
		1377	object *last;
		1378
1361	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1362	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1363	break;	1381	break;
1364		1382
1365	/* Check to see if we found the object that blocks view,	1383	/* Check to see if we found the object that blocks view,
…		…
1373	} /* If objects on this space */	1391	} /* If objects on this space */
1374		1392
1375	if (flag & INS_ABOVE_FLOOR_ONLY)	1393	if (flag & INS_ABOVE_FLOOR_ONLY)
1376	top = floor;	1394	top = floor;
1377		1395
1378	/* Top is the object that our object (op) is going to get inserted above.	1396	// insert object above top, or bottom-most if top = 0
1379	*/
1380
1381	/* First object on this space */
1382	if (!top)	1397	if (!top)
1383	{	1398	{
		1399	op->below = 0;
1384	op->above = ms.bot;	1400	op->above = ms.bot;
1385
1386	if (op->above)
1387	op->above->below = op;
1388
1389	op->below = 0;
1390	ms.bot = op;	1401	ms.bot = op;
		1402
		1403	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1404	}
1392	else	1405	else
1393	{ /* get inserted into the stack above top */	1406	{
1394	op->above = top->above;	1407	op->above = top->above;
1395
1396	if (op->above)
1397	op->above->below = op;	1408	top->above = op;
1398		1409
1399	op->below = top;	1410	op->below = top;
1400	top->above = op;	1411	*(op->above ? &op->above->below : &ms.top) = op;
1401	}	1412	}
1402		1413	}
1403	if (!op->above)
1404	ms.top = op;
1405	} /* else not INS_BELOW_ORIGINATOR */
1406		1414
1407	if (op->type == PLAYER)	1415	if (op->type == PLAYER)
1408	{	1416	{
1409	op->contr->do_los = 1;	1417	op->contr->do_los = 1;
1410	++op->map->players;	1418	++op->map->players;
…		…
1412	}	1420	}
1413		1421
1414	op->map->dirty = true;	1422	op->map->dirty = true;
1415		1423
1416	if (object *pl = ms.player ())	1424	if (object *pl = ms.player ())
		1425	//TODO: the floorbox prev/next might need updating
		1426	//esrv_send_item (pl, op);
		1427	//TODO: update floorbox to preserve ordering
		1428	if (pl->contr->ns)
1417	pl->contr->ns->floorbox_update ();	1429	pl->contr->ns->floorbox_update ();
1418		1430
1419	/* If this object glows, it may affect lighting conditions that are	1431	/* If this object glows, it may affect lighting conditions that are
1420	* visible to others on this map. But update_all_los is really	1432	* visible to others on this map. But update_all_los is really
1421	* an inefficient way to do this, as it means los for all players	1433	* an inefficient way to do this, as it means los for all players
1422	* on the map will get recalculated. The players could very well	1434	* on the map will get recalculated. The players could very well
…		…
1464	* op is the object to insert it under: supplies x and the map.	1476	* op is the object to insert it under: supplies x and the map.
1465	*/	1477	*/
1466	void	1478	void
1467	replace_insert_ob_in_map (const char *arch_string, object *op)	1479	replace_insert_ob_in_map (const char *arch_string, object *op)
1468	{	1480	{
1469	object *tmp, *tmp1;
1470
1471	/* first search for itself and remove any old instances */	1481	/* first search for itself and remove any old instances */
1472		1482
1473	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1483	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1474	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1484	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1475	tmp->destroy ();	1485	tmp->destroy (1);
1476		1486
1477	tmp1 = arch_to_object (archetype::find (arch_string));	1487	object *tmp = arch_to_object (archetype::find (arch_string));
1478		1488
1479	tmp1->x = op->x;	1489	tmp->x = op->x;
1480	tmp1->y = op->y;	1490	tmp->y = op->y;
		1491
1481	insert_ob_in_map (tmp1, op->map, op, 0);	1492	insert_ob_in_map (tmp, op->map, op, 0);
1482	}	1493	}
1483		1494
1484	object *	1495	object *
1485	object::insert_at (object *where, object *originator, int flags)	1496	object::insert_at (object *where, object *originator, int flags)
1486	{	1497	{
		1498	if (where->env)
		1499	return where->env->insert (this);
		1500	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1501	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1502	}
1489		1503
1490	/*	1504	/*
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1492	* is returned contains nr objects, and the remaining parts contains
1493	* the rest (or is removed and freed if that number is 0).
1494	* On failure, NULL is returned, and the reason put into the
1495	* global static errmsg array.
1496	*/
1497	object *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{
1500	object *newob;
1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503	if (orig_ob->nrof < nr)
1504	{
1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506	return NULL;
1507	}
1508
1509	newob = object_create_clone (orig_ob);
1510
1511	if ((orig_ob->nrof -= nr) < 1)
1512	orig_ob->destroy (1);
1513	else if (!is_removed)
1514	{
1515	if (orig_ob->env != NULL)
1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1518	{
1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521	return NULL;
1522	}
1523	}
1524
1525	newob->nrof = nr;
1526
1527	return newob;
1528	}
1529
1530	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1505	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1506	* the amount of an object. If the amount reaches 0, the object
1533	* is subsequently removed and freed.	1507	* is subsequently removed and freed.
1534	*	1508	*
1535	* Return value: 'op' if something is left, NULL if the amount reached 0	1509	* Return value: 'op' if something is left, NULL if the amount reached 0
1536	*/	1510	*/
		1511	bool
		1512	object::decrease (sint32 nr)
		1513	{
		1514	if (!nr)
		1515	return true;
		1516
		1517	nr = min (nr, nrof);
		1518
		1519	nrof -= nr;
		1520
		1521	if (nrof)
		1522	{
		1523	adjust_weight (env, -weight * nr); // carrying == 0
		1524
		1525	if (object *pl = visible_to ())
		1526	esrv_update_item (UPD_NROF, pl, this);
		1527
		1528	return true;
		1529	}
		1530	else
		1531	{
		1532	destroy (1);
		1533	return false;
		1534	}
		1535	}
		1536
		1537	/*
		1538	* split(ob,nr) splits up ob into two parts. The part which
		1539	* is returned contains nr objects, and the remaining parts contains
		1540	* the rest (or is removed and returned if that number is 0).
		1541	* On failure, NULL is returned.
		1542	*/
1537	object *	1543	object *
1538	decrease_ob_nr (object *op, uint32 i)	1544	object::split (sint32 nr)
1539	{	1545	{
1540	object *tmp;	1546	int have = number_of ();
1541		1547
1542	if (i == 0) /* objects with op->nrof require this check */	1548	if (have < nr)
1543	return op;	1549	return 0;
1544		1550	else if (have == nr)
1545	if (i > op->nrof)
1546	i = op->nrof;
1547
1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1549	op->nrof -= i;
1550	else if (op->env)
1551	{	1551	{
1552	/* is this object in the players inventory, or sub container
1553	* therein?
1554	*/
1555	tmp = op->in_player ();
1556	/* nope. Is this a container the player has opened?
1557	* If so, set tmp to that player.
1558	* IMO, searching through all the players will mostly
1559	* likely be quicker than following op->env to the map,
1560	* and then searching the map for a player.
1561	*/
1562	if (!tmp)
1563	for_all_players (pl)
1564	if (pl->ob->container == op->env)
1565	{
1566	tmp = pl->ob;
1567	break;
1568	}
1569
1570	if (i < op->nrof)
1571	{
1572	sub_weight (op->env, op->weight * i);
1573	op->nrof -= i;
1574	if (tmp)
1575	esrv_send_item (tmp, op);
1576	}
1577	else
1578	{
1579	op->remove ();	1552	remove ();
1580	op->nrof = 0;	1553	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1554	}
1585	else	1555	else
1586	{	1556	{
1587	object *above = op->above;	1557	decrease (nr);
1588		1558
1589	if (i < op->nrof)	1559	object *op = deep_clone ();
1590	op->nrof -= i;	1560	op->nrof = nr;
1591	else
1592	{
1593	op->remove ();
1594	op->nrof = 0;
1595	}
1596
1597	/* Since we just removed op, op->above is null */
1598	for (tmp = above; tmp; tmp = tmp->above)
1599	if (tmp->type == PLAYER)
1600	{
1601	if (op->nrof)
1602	esrv_send_item (tmp, op);
1603	else
1604	esrv_del_item (tmp->contr, op->count);
1605	}
1606	}
1607
1608	if (op->nrof)
1609	return op;	1561	return op;
1610	else
1611	{
1612	op->destroy ();
1613	return 0;
1614	}
1615	}
1616
1617	/*
1618	* add_weight(object, weight) adds the specified weight to an object,
1619	* and also updates how much the environment(s) is/are carrying.
1620	*/
1621	void
1622	add_weight (object *op, signed long weight)
1623	{
1624	while (op != NULL)
1625	{
1626	if (op->type == CONTAINER)
1627	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629	op->carrying += weight;
1630	op = op->env;
1631	}	1562	}
1632	}	1563	}
1633		1564
1634	object *	1565	object *
1635	insert_ob_in_ob (object *op, object *where)	1566	insert_ob_in_ob (object *op, object *where)
…		…
1660	* be != op, if items are merged. -Tero	1591	* be != op, if items are merged. -Tero
1661	*/	1592	*/
1662	object *	1593	object *
1663	object::insert (object *op)	1594	object::insert (object *op)
1664	{	1595	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1596	if (op->more)
1669	{	1597	{
1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1598	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671	return op;	1599	return op;
1672	}	1600	}
1673		1601
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1602	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1603
		1604	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1605
1677	if (op->nrof)	1606	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1607	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1608	if (object::can_merge (tmp, op))
1681	{	1609	{
1682	/* return the original object and remove inserted object	1610	/* return the original object and remove inserted object
1683	(client needs the original object) */	1611	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1612	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to	1613
1686	* tmp->nrof, we need to increase the weight.	1614	if (object *pl = tmp->visible_to ())
1687	*/	1615	esrv_update_item (UPD_NROF, pl, tmp);
		1616
1688	add_weight (this, op->weight * op->nrof);	1617	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1618
1690	op->destroy (); /* free the inserted object */	1619	op->destroy (1);
1691	op = tmp;	1620	op = tmp;
1692	op->remove (); /* and fix old object's links */	1621	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1622	}
1696		1623
1697	/* I assume combined objects have no inventory
1698	* We add the weight - this object could have just been removed
1699	* (if it was possible to merge). calling remove_ob will subtract
1700	* the weight, so we need to add it in again, since we actually do
1701	* the linking below
1702	*/
1703	add_weight (this, op->weight * op->nrof);
1704	}
1705	else
1706	add_weight (this, (op->weight + op->carrying));
1707
1708	if (object *otmp = this->in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.	1624	op->owner = 0; // it's his/hers now. period.
1713	op->map = 0;	1625	op->map = 0;
		1626	op->x = 0;
		1627	op->y = 0;
		1628
		1629	op->above = 0;
		1630	op->below = inv;
1714	op->env = this;	1631	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718		1632
		1633	if (inv)
		1634	inv->above = op;
		1635
		1636	inv = op;
		1637
		1638	op->flag [FLAG_REMOVED] = 0;
		1639
		1640	if (object *pl = op->visible_to ())
		1641	esrv_send_item (pl, op);
		1642
		1643	adjust_weight (this, op->total_weight ());
		1644
		1645	inserted:
1719	/* reset the light list and los of the players on the map */	1646	/* reset the light list and los of the players on the map */
1720	if (op->glow_radius && map)	1647	if (op->glow_radius && map && map->darkness)
1721	{
1722	#ifdef DEBUG_LIGHTS
1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724	#endif /* DEBUG_LIGHTS */
1725	if (map->darkness)
1726	update_all_los (map, x, y);	1648	update_all_los (map, x, y);
1727	}
1728		1649
1729	/* Client has no idea of ordering so lets not bother ordering it here.	1650	// if this is a player's inventory, update stats
1730	* It sure simplifies this function...	1651	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1731	*/	1652	update_stats ();
1732	if (!inv)
1733	inv = op;
1734	else
1735	{
1736	op->below = inv;
1737	op->below->above = op;
1738	inv = op;
1739	}
1740		1653
1741	INVOKE_OBJECT (INSERT, this);	1654	INVOKE_OBJECT (INSERT, this);
1742		1655
1743	return op;	1656	return op;
1744	}	1657	}
…		…
1872	LOG (llevError, "Present_arch called outside map.\n");	1785	LOG (llevError, "Present_arch called outside map.\n");
1873	return NULL;	1786	return NULL;
1874	}	1787	}
1875		1788
1876	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1789	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->arch == at)	1790	if (tmp->arch->archname == at->archname)
1878	return tmp;	1791	return tmp;
1879		1792
1880	return NULL;	1793	return NULL;
1881	}	1794	}
1882		1795
…		…
1946	* The first matching object is returned, or NULL if none.	1859	* The first matching object is returned, or NULL if none.
1947	*/	1860	*/
1948	object *	1861	object *
1949	present_arch_in_ob (const archetype *at, const object *op)	1862	present_arch_in_ob (const archetype *at, const object *op)
1950	{	1863	{
1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1864	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952	if (tmp->arch == at)	1865	if (tmp->arch->archname == at->archname)
1953	return tmp;	1866	return tmp;
1954		1867
1955	return NULL;	1868	return NULL;
1956	}	1869	}
1957		1870
…		…
2366		2279
2367	/*	2280	/*
2368	* create clone from object to another	2281	* create clone from object to another
2369	*/	2282	*/
2370	object *	2283	object *
2371	object_create_clone (object *asrc)	2284	object::deep_clone ()
2372	{	2285	{
2373	object *dst = 0, *tmp, *src, *prev, *item;	2286	assert (("deep_clone called on non-head object", is_head ()));
2374		2287
2375	if (!asrc)	2288	object *dst = clone ();
2376	return 0;
2377		2289
2378	src = asrc->head_ ();	2290	object *prev = dst;
2379
2380	prev = 0;
2381	for (object *part = src; part; part = part->more)	2291	for (object *part = this->more; part; part = part->more)
2382	{	2292	{
2383	tmp = part->clone ();	2293	object *tmp = part->clone ();
2384	tmp->x -= src->x;
2385	tmp->y -= src->y;
2386
2387	if (!part->head)
2388	{
2389	dst = tmp;
2390	tmp->head = 0;
2391	}
2392	else
2393	tmp->head = dst;	2294	tmp->head = dst;
2394
2395	tmp->more = 0;
2396
2397	if (prev)
2398	prev->more = tmp;	2295	prev->more = tmp;
2399
2400	prev = tmp;	2296	prev = tmp;
2401	}	2297	}
2402		2298
2403	for (item = src->inv; item; item = item->below)	2299	for (object *item = inv; item; item = item->below)
2404	insert_ob_in_ob (object_create_clone (item), dst);	2300	insert_ob_in_ob (item->deep_clone (), dst);
2405		2301
2406	return dst;	2302	return dst;
2407	}	2303	}
2408		2304
2409	/* This returns the first object in who's inventory that	2305	/* This returns the first object in who's inventory that
…		…
2418	return tmp;	2314	return tmp;
2419		2315
2420	return 0;	2316	return 0;
2421	}	2317	}
2422		2318
2423	/* If ob has a field named key, return the link from the list,	2319	const shstr &
2424	* otherwise return NULL.	2320	object::kv_get (const shstr &key) const
2425	*
2426	* key must be a passed in shared string - otherwise, this won't
2427	* do the desired thing.
2428	*/
2429	key_value *
2430	get_ob_key_link (const object *ob, const char *key)
2431	{	2321	{
2432	for (key_value *link = ob->key_values; link; link = link->next)	2322	for (key_value *kv = key_values; kv; kv = kv->next)
2433	if (link->key == key)	2323	if (kv->key == key)
2434	return link;
2435
2436	return 0;
2437	}
2438
2439	/*
2440	* Returns the value of op has an extra_field for key, or NULL.
2441	*
2442	* The argument doesn't need to be a shared string.
2443	*
2444	* The returned string is shared.
2445	*/
2446	const char *
2447	get_ob_key_value (const object *op, const char *const key)
2448	{
2449	key_value *link;
2450	shstr_cmp canonical_key (key);
2451
2452	if (!canonical_key)
2453	{
2454	/* 1. There being a field named key on any object
2455	* implies there'd be a shared string to find.
2456	* 2. Since there isn't, no object has this field.
2457	* 3. Therefore, *this* object doesn't have this field.
2458	*/
2459	return 0;
2460	}
2461
2462	/* This is copied from get_ob_key_link() above -
2463	* only 4 lines, and saves the function call overhead.
2464	*/
2465	for (link = op->key_values; link; link = link->next)
2466	if (link->key == canonical_key)
2467	return link->value;	2324	return kv->value;
2468		2325
2469	return 0;	2326	return shstr_null;
2470	}	2327	}
2471		2328
2472	/*	2329	void
2473	* Updates the canonical_key in op to value.	2330	object::kv_set (const shstr &key, const shstr &value)
2474	*
2475	* canonical_key is a shared string (value doesn't have to be).
2476	*
2477	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2478	* keys.
2479	*
2480	* Returns TRUE on success.
2481	*/
2482	int
2483	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2484	{	2331	{
2485	key_value *field = NULL, *last = NULL;	2332	for (key_value *kv = key_values; kv; kv = kv->next)
2486		2333	if (kv->key == key)
2487	for (field = op->key_values; field != NULL; field = field->next)
2488	{
2489	if (field->key != canonical_key)
2490	{	2334	{
2491	last = field;	2335	kv->value = value;
2492	continue;	2336	return;
2493	}	2337	}
2494		2338
2495	if (value)	2339	key_value *kv = new key_value;
2496	field->value = value;	2340
2497	else	2341	kv->next = key_values;
		2342	kv->key = key;
		2343	kv->value = value;
		2344
		2345	key_values = kv;
		2346	}
		2347
		2348	void
		2349	object::kv_del (const shstr &key)
		2350	{
		2351	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2352	if ((*kvp)->key == key)
2498	{	2353	{
2499	/* Basically, if the archetype has this key set,	2354	key_value *kv = *kvp;
2500	* we need to store the null value so when we save	2355	*kvp = (*kvp)->next;
2501	* it, we save the empty value so that when we load,	2356	delete kv;
2502	* we get this value back again.	2357	return;
2503	*/
2504	if (get_ob_key_link (op->arch, canonical_key))
2505	field->value = 0;
2506	else
2507	{
2508	if (last)
2509	last->next = field->next;
2510	else
2511	op->key_values = field->next;
2512
2513	delete field;
2514	}
2515	}	2358	}
2516	return TRUE;
2517	}
2518	/* IF we get here, key doesn't exist */
2519
2520	/* No field, we'll have to add it. */
2521
2522	if (!add_key)
2523	return FALSE;
2524
2525	/* There isn't any good reason to store a null
2526	* value in the key/value list. If the archetype has
2527	* this key, then we should also have it, so shouldn't
2528	* be here. If user wants to store empty strings,
2529	* should pass in ""
2530	*/
2531	if (value == NULL)
2532	return TRUE;
2533
2534	field = new key_value;
2535
2536	field->key = canonical_key;
2537	field->value = value;
2538	/* Usual prepend-addition. */
2539	field->next = op->key_values;
2540	op->key_values = field;
2541
2542	return TRUE;
2543	}
2544
2545	/*
2546	* Updates the key in op to value.
2547	*
2548	* If add_key is FALSE, this will only update existing keys,
2549	* and not add new ones.
2550	* In general, should be little reason FALSE is ever passed in for add_key
2551	*
2552	* Returns TRUE on success.
2553	*/
2554	int
2555	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2556	{
2557	shstr key_ (key);
2558
2559	return set_ob_key_value_s (op, key_, value, add_key);
2560	}	2359	}
2561		2360
2562	object::depth_iterator::depth_iterator (object *container)	2361	object::depth_iterator::depth_iterator (object *container)
2563	: iterator_base (container)	2362	: iterator_base (container)
2564	{	2363	{
…		…
2614	{	2413	{
2615	char flagdesc[512];	2414	char flagdesc[512];
2616	char info2[256 * 4];	2415	char info2[256 * 4];
2617	char *p = info;	2416	char *p = info;
2618		2417
2619	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2418	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2620	count, uuid.seq,	2419	count,
		2420	uuid.c_str (),
2621	&name,	2421	&name,
2622	title ? "\",title:\"" : "",	2422	title ? "\",title:\"" : "",
2623	title ? (const char *)title : "",	2423	title ? (const char *)title : "",
2624	flag_desc (flagdesc, 512), type);	2424	flag_desc (flagdesc, 512), type);
2625		2425
2626	if (!this->flag[FLAG_REMOVED] && env)	2426	if (!flag[FLAG_REMOVED] && env)
2627	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2427	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2628		2428
2629	if (map)	2429	if (map)
2630	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2430	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2631		2431
…		…
2661	object::open_container (object *new_container)	2461	object::open_container (object *new_container)
2662	{	2462	{
2663	if (container == new_container)	2463	if (container == new_container)
2664	return;	2464	return;
2665		2465
2666	if (object *old_container = container)	2466	object *old_container = container;
		2467
		2468	if (old_container)
2667	{	2469	{
2668	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2470	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2669	return;	2471	return;
2670		2472
2671	#if 0	2473	#if 0
…		…
2673	if (object *closer = old_container->inv)	2475	if (object *closer = old_container->inv)
2674	if (closer->type == CLOSE_CON)	2476	if (closer->type == CLOSE_CON)
2675	closer->destroy ();	2477	closer->destroy ();
2676	#endif	2478	#endif
2677		2479
		2480	// make sure the container is available
		2481	esrv_send_item (this, old_container);
		2482
2678	old_container->flag [FLAG_APPLIED] = 0;	2483	old_container->flag [FLAG_APPLIED] = false;
2679	container = 0;	2484	container = 0;
2680		2485
		2486	// client needs item update to make it work, client bug requires this to be separate
2681	esrv_update_item (UPD_FLAGS, this, old_container);	2487	esrv_update_item (UPD_FLAGS, this, old_container);
		2488
2682	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2489	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683	play_sound (sound_find ("chest_close"));	2490	play_sound (sound_find ("chest_close"));
2684	}	2491	}
2685		2492
2686	if (new_container)	2493	if (new_container)
…		…
2699	}	2506	}
2700	#endif	2507	#endif
2701		2508
2702	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2703		2510
		2511	// make sure the container is available, client bug requires this to be separate
		2512	esrv_send_item (this, new_container);
		2513
2704	new_container->flag [FLAG_APPLIED] = 1;	2514	new_container->flag [FLAG_APPLIED] = true;
2705	container = new_container;	2515	container = new_container;
2706		2516
		2517	// client needs flag change
2707	esrv_update_item (UPD_FLAGS, this, new_container);	2518	esrv_update_item (UPD_FLAGS, this, new_container);
2708	esrv_send_inventory (this, new_container);	2519	esrv_send_inventory (this, new_container);
2709	play_sound (sound_find ("chest_open"));	2520	play_sound (sound_find ("chest_open"));
2710	}	2521	}
		2522	// else if (!old_container->env && contr && contr->ns)
		2523	// contr->ns->floorbox_reset ();
2711	}	2524	}
2712		2525
2713	object *	2526	object *
2714	object::force_find (const shstr name)	2527	object::force_find (const shstr name)
2715	{	2528	{
…		…
2741		2554
2742	insert (force);	2555	insert (force);
2743	}	2556	}
2744		2557
2745	void	2558	void
2746	object::play_sound (faceidx sound) const	2559	object::play_sound (faceidx sound)
2747	{	2560	{
2748	if (!sound)	2561	if (!sound)
2749	return;	2562	return;
2750		2563
2751	if (flag [FLAG_REMOVED])	2564	if (flag [FLAG_REMOVED])

Diff Legend

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