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.190 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.231 by root, Sun May 4 11:12:40 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	/* 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 one object has inventory but the other doesn't, not equiv */	250	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	251	return 0; /* inventories differ in length */
261	return 0;
262		252
263	/* Now check to see if the two inventory objects could merge */	253	if (ob1->inv->below || ob2->inv->below)
		254	return 0; /* more than one object in inv */
		255
264	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	257	return 0; /* inventory objects differ */
266		258
267	/* 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
268	* if it is valid.	260	* if it is valid.
269	*/	261	*/
270	}	262	}
…		…
289	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
290	return 0;	282	return 0;
291	break;	283	break;
292	}	284	}
293		285
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
295	{	287	{
296	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	291
300	else if (!compare_ob_value_lists (ob1, ob2))	292	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	293	return 0;
302	}	294	}
303		295
304	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
305	{	297	{
306	ob1->optimise ();	298	ob1->optimise ();
307	ob2->optimise ();	299	ob2->optimise ();
308		300
309	if (ob1->self || ob2->self)	301	if (ob1->self || ob2->self)
		302	{
		303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		305
		306	if (k1 != k2)
		307	return 0;
		308
		309	if (k1 == 0)
		310	return 1;
		311
310	if (!cfperl_can_merge (ob1, ob2))	312	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	313	return 0;
		314	}
312	}	315	}
313		316
314	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
315	return 1;	318	return 1;
316	}	319	}
317		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 (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
318	/*	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	weight = weight_adjust (op, weight);
		376
		377	if (!weight)
		378	return;
		379
		380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
		386	op = op->env;
		387	}
		388	}
		389
		390	/*
319	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	392	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
322	*/	394	*/
323	long	395	void
324	sum_weight (object *op)	396	object::update_weight ()
325	{	397	{
326	long sum;	398	sint32 sum = 0;
327	object *inv;
328		399
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
330	{	401	{
331	if (inv->inv)	402	if (op->inv)
332	sum_weight (inv);	403	op->update_weight ();
333		404
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
335	}	411	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	412	carrying = sum;
342		413
343	return sum;	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
344	}	418	}
345		419
346	/**	420	/*
347	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	422	*/
363	char *	423	char *
364	dump_object (object *op)	424	dump_object (object *op)
365	{	425	{
366	if (!op)	426	if (!op)
…		…
380	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
381	{	441	{
382	object *tmp, *closest;	442	object *tmp, *closest;
383	int last_dist, i;	443	int last_dist, i;
384		444
385	if (op->more == NULL)	445	if (!op->more)
386	return op;	446	return op;
		447
387	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		449	tmp;
		450	tmp = tmp->more)
388	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
390	return closest;	454	return closest;
391	}	455	}
392		456
393	/*	457	/*
394	* Returns the object which has the count-variable equal to the argument.	458	* Returns the object which has the count-variable equal to the argument.
		459	* VERRRY slow.
395	*/	460	*/
396	object *	461	object *
397	find_object (tag_t i)	462	find_object (tag_t i)
398	{	463	{
399	for_all_objects (op)	464	for_all_objects (op)
…		…
417	for_all_objects (op)	482	for_all_objects (op)
418	if (op->name == str_)	483	if (op->name == str_)
419	break;	484	break;
420		485
421	return op;	486	return op;
422	}
423
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}	487	}
429		488
430	/*	489	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	490	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	491	* skill and experience objects.
…		…
437	{	496	{
438	// allow objects which own objects	497	// allow objects which own objects
439	if (owner)	498	if (owner)
440	while (owner->owner)	499	while (owner->owner)
441	owner = owner->owner;	500	owner = owner->owner;
		501
		502	if (flag [FLAG_FREED])
		503	{
		504	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		505	return;
		506	}
442		507
443	this->owner = owner;	508	this->owner = owner;
444	}	509	}
445		510
446	int	511	int
…		…
524	}	589	}
525		590
526	op->key_values = 0;	591	op->key_values = 0;
527	}	592	}
528		593
529	object &	594	/*
530	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
531	{	604	{
532	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
533	bool is_removed = flag [FLAG_REMOVED];
534
535	*(object_copy *)this = src;	606	*(object_copy *)dst = *this;
536
537	flag [FLAG_FREED] = is_freed;
538	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
539		608
540	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
541	if (src.key_values)	610	if (key_values)
542	{	611	{
543	key_value *tail = 0;	612	key_value *tail = 0;
544	key_values = 0;	613	dst->key_values = 0;
545		614
546	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
547	{	616	{
548	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
549		618
550	new_link->next = 0;	619	new_link->next = 0;
551	new_link->key = i->key;	620	new_link->key = i->key;
552	new_link->value = i->value;	621	new_link->value = i->value;
553		622
554	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
555	if (!key_values)	624	if (!dst->key_values)
556	{	625	{
557	key_values = new_link;	626	dst->key_values = new_link;
558	tail = new_link;	627	tail = new_link;
559	}	628	}
560	else	629	else
561	{	630	{
562	tail->next = new_link;	631	tail->next = new_link;
563	tail = new_link;	632	tail = new_link;
564	}	633	}
565	}	634	}
566	}	635	}
567	}
568
569	/*
570	* copy_to first frees everything allocated by the dst object,
571	* and then copies the contents of itself into the second
572	* object, allocating what needs to be allocated. Basically, any
573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
574	* if the first object is freed, the pointers in the new object
575	* will point at garbage.
576	*/
577	void
578	object::copy_to (object *dst)
579	{
580	*dst = *this;
581		636
582	if (speed < 0)	637	if (speed < 0)
583	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
584		639
585	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
587		642
588	void	643	void
589	object::instantiate ()	644	object::instantiate ()
590	{	645	{
591	if (!uuid.seq) // HACK	646	if (!uuid.seq) // HACK
592	uuid = gen_uuid ();	647	uuid = UUID::gen ();
593		648
594	speed_left = -0.1f;	649	speed_left = -0.1f;
595	/* copy the body_info to the body_used - this is only really	650	/* copy the body_info to the body_used - this is only really
596	* need for monsters, but doesn't hurt to do it for everything.	651	* need for monsters, but doesn't hurt to do it for everything.
597	* by doing so, when a monster is created, it has good starting	652	* by doing so, when a monster is created, it has good starting
…		…
607	object *	662	object *
608	object::clone ()	663	object::clone ()
609	{	664	{
610	object *neu = create ();	665	object *neu = create ();
611	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
612	return neu;	668	return neu;
613	}	669	}
614		670
615	/*	671	/*
616	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
667	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
668	*/	724	*/
669	void	725	void
670	update_object (object *op, int action)	726	update_object (object *op, int action)
671	{	727	{
672	if (op == NULL)	728	if (!op)
673	{	729	{
674	/* this should never happen */	730	/* this should never happen */
675	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
676	return;	732	return;
677	}	733	}
678		734
679	if (op->env)	735	if (!op->is_on_map ())
680	{	736	{
681	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
682	* to do in this case.	738	* to do in this case.
683	*/	739	*/
684	return;	740	return;
685	}	741	}
686
687	/* If the map is saving, don't do anything as everything is
688	* going to get freed anyways.
689	*/
690	if (!op->map || op->map->in_memory == MAP_SAVING)
691	return;
692		742
693	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
694	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	744	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
695	{	745	{
696	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
756	static int object_count;	806	static int object_count;
757		807
758	void object::link ()	808	void object::link ()
759	{	809	{
760	assert (!index);//D	810	assert (!index);//D
761	uuid = gen_uuid ();	811	uuid = UUID::gen ();
762	count = ++object_count;	812	count = ++object_count;
763		813
764	refcnt_inc ();	814	refcnt_inc ();
765	objects.insert (this);	815	objects.insert (this);
766	}	816	}
…		…
839	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
840	{	890	{
841	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
842	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
843	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
844	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
845	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
846	if (!inv)	896	if (!inv)
847	return;	897	return;
848		898
849	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
850	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
851	* drop on that space.	901	* drop on that space.
852	*/	902	*/
853	if (!drop_to_ground	903	if (!drop_to_ground
854	|| !map	904	|| !map
855	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
856	|| map->nodrop	906	|| map->nodrop
857	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
858	{	908	{
859	while (inv)	909	while (inv)
860	{	910	{
861	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
862	inv->destroy ();	912	inv->destroy ();
863	}	913	}
864	}	914	}
865	else	915	else
866	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
872	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
873	|| op->type == RUNE	923	|| op->type == RUNE
874	|| op->type == TRAP	924	|| op->type == TRAP
875	|| op->flag [FLAG_IS_A_TEMPLATE]	925	|| op->flag [FLAG_IS_A_TEMPLATE]
876	|| op->flag [FLAG_DESTROY_ON_DEATH])	926	|| op->flag [FLAG_DESTROY_ON_DEATH])
877	op->destroy ();	927	op->destroy (true);
878	else	928	else
879	map->insert (op, x, y);	929	map->insert (op, x, y);
880	}	930	}
881	}	931	}
882	}	932	}
…		…
886	object *op = new object;	936	object *op = new object;
887	op->link ();	937	op->link ();
888	return op;	938	return op;
889	}	939	}
890		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954
		955	~freed_map ()
		956	{
		957	destroy ();
		958	}
		959	} freed_map; // freed objects are moved here to avoid crashes
		960
891	void	961	void
892	object::do_destroy ()	962	object::do_destroy ()
893	{	963	{
894	attachable::do_destroy ();
895
896	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
897	remove_button_link (this);	965	remove_button_link (this);
898		966
899	if (flag [FLAG_FRIENDLY])	967	if (flag [FLAG_FRIENDLY])
900	remove_friendly_object (this);	968	remove_friendly_object (this);
901		969
902	if (!flag [FLAG_REMOVED])
903	remove ();	970	remove ();
904		971
905	destroy_inv (true);	972	attachable::do_destroy ();
906		973
907	deactivate ();	974	deactivate ();
908	unlink ();	975	unlink ();
909		976
910	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
911		978
912	// hack to ensure that freed objects still have a valid map	979	// hack to ensure that freed objects still have a valid map
913	{
914	static maptile *freed_map; // freed objects are moved here to avoid crashes
915
916	if (!freed_map)
917	{
918	freed_map = new maptile;
919
920	freed_map->path = "<freed objects map>";
921	freed_map->name = "/internal/freed_objects_map";
922	freed_map->width = 3;
923	freed_map->height = 3;
924
925	freed_map->alloc ();
926	freed_map->in_memory = MAP_IN_MEMORY;
927	}
928
929	map = freed_map;	980	map = &freed_map;
930	x = 1;	981	x = 1;
931	y = 1;	982	y = 1;
932	}
933		983
934	if (more)	984	if (more)
935	{	985	{
936	more->destroy ();	986	more->destroy ();
937	more = 0;	987	more = 0;
…		…
950	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
951	{	1001	{
952	if (destroyed ())	1002	if (destroyed ())
953	return;	1003	return;
954		1004
		1005	if (!is_head () && !head->destroyed ())
		1006	{
		1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1008	head->destroy (destroy_inventory);
		1009	return;
		1010	}
		1011
955	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
956	destroy_inv (false);
957		1013
958	if (is_head ())	1014	if (is_head ())
959	if (sound_destroy)	1015	if (sound_destroy)
960	play_sound (sound_destroy);	1016	play_sound (sound_destroy);
961	else if (flag [FLAG_MONSTER])	1017	else if (flag [FLAG_MONSTER])
962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1018	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963		1019
964	attachable::destroy ();	1020	attachable::destroy ();
965	}
966
967	/*
968	* sub_weight() recursively (outwards) subtracts a number from the
969	* weight of an object (and what is carried by it's environment(s)).
970	*/
971	void
972	sub_weight (object *op, signed long weight)
973	{
974	while (op != NULL)
975	{
976	if (op->type == CONTAINER)
977	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979	op->carrying -= weight;
980	op = op->env;
981	}
982	}	1021	}
983		1022
984	/* op->remove ():	1023	/* op->remove ():
985	* This function removes the object op from the linked list of objects	1024	* This function removes the object op from the linked list of objects
986	* which it is currently tied to. When this function is done, the	1025	* which it is currently tied to. When this function is done, the
…		…
992	object::do_remove ()	1031	object::do_remove ()
993	{	1032	{
994	object *tmp, *last = 0;	1033	object *tmp, *last = 0;
995	object *otmp;	1034	object *otmp;
996		1035
997	if (QUERY_FLAG (this, FLAG_REMOVED))	1036	if (flag [FLAG_REMOVED])
998	return;	1037	return;
999		1038
1000	SET_FLAG (this, FLAG_REMOVED);
1001	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
		1040
		1041	flag [FLAG_REMOVED] = true;
1002		1042
1003	if (more)	1043	if (more)
1004	more->remove ();	1044	more->remove ();
1005		1045
1006	/*	1046	/*
1007	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1008	* inventory.	1048	* inventory.
1009	*/	1049	*/
1010	if (env)	1050	if (env)
1011	{	1051	{
		1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1053	if (object *pl = visible_to ())
		1054	esrv_del_item (pl->contr, count);
		1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1056
		1057	adjust_weight (env, -total_weight ());
		1058
		1059	*(above ? &above->below : &env->inv) = below;
		1060
1012	if (nrof)	1061	if (below)
1013	sub_weight (env, weight * nrof);	1062	below->above = above;
1014	else	1063
1015	sub_weight (env, weight + carrying);	1064	/* we set up values so that it could be inserted into
		1065	* the map, but we don't actually do that - it is up
		1066	* to the caller to decide what we want to do.
		1067	*/
		1068	map = env->map;
		1069	x = env->x;
		1070	y = env->y;
		1071	above = 0;
		1072	below = 0;
		1073	env = 0;
1016		1074
1017	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* NO_FIX_PLAYER is set when a great many changes are being
1018	* made to players inventory. If set, avoiding the call	1076	* made to players inventory. If set, avoiding the call
1019	* to save cpu time.	1077	* to save cpu time.
1020	*/	1078	*/
1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022	otmp->update_stats ();	1080	otmp->update_stats ();
1023
1024	if (above)
1025	above->below = below;
1026	else
1027	env->inv = below;
1028
1029	if (below)
1030	below->above = above;
1031
1032	/* we set up values so that it could be inserted into
1033	* the map, but we don't actually do that - it is up
1034	* to the caller to decide what we want to do.
1035	*/
1036	x = env->x, y = env->y;
1037	map = env->map;
1038	above = 0, below = 0;
1039	env = 0;
1040	}	1081	}
1041	else if (map)	1082	else if (map)
1042	{	1083	{
1043	if (type == PLAYER)
1044	{
1045	// leaving a spot always closes any open container on the ground
1046	if (container && !container->env)
1047	// this causes spurious floorbox updates, but it ensures
1048	// that the CLOSE event is being sent.
1049	close_container ();
1050
1051	--map->players;
1052	map->touch ();
1053	}
1054
1055	map->dirty = true;	1084	map->dirty = true;
1056	mapspace &ms = this->ms ();	1085	mapspace &ms = this->ms ();
		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (type == PLAYER) // this == pl(!)
		1090	{
		1091	// leaving a spot always closes any open container on the ground
		1092	if (container && !container->env)
		1093	// this causes spurious floorbox updates, but it ensures
		1094	// that the CLOSE event is being sent.
		1095	close_container ();
		1096
		1097	--map->players;
		1098	map->touch ();
		1099	}
		1100	else if (pl->container == this)
		1101	{
		1102	// removing a container should close it
		1103	close_container ();
		1104	}
		1105
		1106	esrv_del_item (pl->contr, count);
		1107	}
1057		1108
1058	/* link the object above us */	1109	/* link the object above us */
1059	if (above)	1110	if (above)
1060	above->below = below;	1111	above->below = below;
1061	else	1112	else
…		…
1091	* removed (most likely destroyed), update the player view	1142	* removed (most likely destroyed), update the player view
1092	* appropriately.	1143	* appropriately.
1093	*/	1144	*/
1094	pl->close_container ();	1145	pl->close_container ();
1095		1146
		1147	//TODO: the floorbox prev/next might need updating
		1148	//esrv_del_item (pl->contr, count);
		1149	//TODO: update floorbox to preserve ordering
		1150	if (pl->contr->ns)
1096	pl->contr->ns->floorbox_update ();	1151	pl->contr->ns->floorbox_update ();
1097	}	1152	}
1098		1153
1099	for (tmp = ms.bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1100	{	1155	{
1101	/* No point updating the players look faces if he is the object	1156	/* No point updating the players look faces if he is the object
…		…
1140	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1141	{	1196	{
1142	if (!op->nrof)	1197	if (!op->nrof)
1143	return 0;	1198	return 0;
1144		1199
1145	if (top)	1200	if (!top)
1146	for (top = op; top && top->above; top = top->above)	1201	for (top = op; top && top->above; top = top->above)
1147	;	1202	;
1148		1203
1149	for (; top; top = top->below)	1204	for (; top; top = top->below)
1150	{
1151	if (top == op)
1152	continue;
1153
1154	if (object::can_merge (op, top))	1205	if (object::can_merge (op, top))
1155	{	1206	{
1156	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1157		1208
1158	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	if (object *pl = top->visible_to ())
1159	op->weight = 0; /* Don't want any adjustements now */	1210	esrv_update_item (UPD_NROF, pl, top);
		1211
		1212	op->weight = 0; // cancel the addition above
		1213	op->carrying = 0; // must be 0 already
		1214
1160	op->destroy ();	1215	op->destroy (1);
		1216
1161	return top;	1217	return top;
1162	}	1218	}
1163	}
1164		1219
1165	return 0;	1220	return 0;
1166	}	1221	}
1167		1222
1168	void	1223	void
…		…
1227	object *	1282	object *
1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1283	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1229	{	1284	{
1230	assert (!op->flag [FLAG_FREED]);	1285	assert (!op->flag [FLAG_FREED]);
1231		1286
1232	object *top, *floor = NULL;
1233
1234	op->remove ();	1287	op->remove ();
1235		1288
1236	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1237	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1238	* need extra work	1291	* need extra work
1239	*/	1292	*/
1240	if (!xy_normalise (m, op->x, op->y))	1293	if (!xy_normalise (m, op->x, op->y))
1241	{	1294	{
1242	op->destroy ();	1295	op->destroy (1);
1243	return 0;	1296	return 0;
1244	}	1297	}
1245		1298
1246	if (object *more = op->more)	1299	if (object *more = op->more)
1247	if (!insert_ob_in_map (more, m, originator, flag))	1300	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1256	*/	1309	*/
1257	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1259	if (object::can_merge (op, tmp))	1312	if (object::can_merge (op, tmp))
1260	{	1313	{
		1314	// TODO: we atcually want to update tmp, not op,
		1315	// but some caller surely breaks when we return tmp
		1316	// from here :/
1261	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1262	tmp->destroy ();	1318	tmp->destroy (1);
1263	}	1319	}
1264		1320
1265	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1266	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1267		1323
…		…
1287	/* since *below* originator, no need to update top */	1343	/* since *below* originator, no need to update top */
1288	originator->below = op;	1344	originator->below = op;
1289	}	1345	}
1290	else	1346	else
1291	{	1347	{
		1348	object *top, *floor = NULL;
		1349
1292	top = ms.bot;	1350	top = ms.bot;
1293		1351
1294	/* If there are other objects, then */	1352	/* If there are other objects, then */
1295	if ((!(flag & INS_MAP_LOAD)) && top)	1353	if (top)
1296	{	1354	{
1297	object *last = 0;	1355	object *last = 0;
1298		1356
1299	/*	1357	/*
1300	* If there are multiple objects on this space, we do some trickier handling.	1358	* If there are multiple objects on this space, we do some trickier handling.
…		…
1352	*/	1410	*/
1353	if (last && last->below && last != floor)	1411	if (last && last->below && last != floor)
1354	top = last->below;	1412	top = last->below;
1355	}	1413	}
1356	} /* If objects on this space */	1414	} /* If objects on this space */
1357	if (flag & INS_MAP_LOAD)
1358	top = ms.top;
1359		1415
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1417	top = floor;
1362		1418
1363	/* Top is the object that our object (op) is going to get inserted above.	1419	/* Top is the object that our object (op) is going to get inserted above.
…		…
1396	op->map->touch ();	1452	op->map->touch ();
1397	}	1453	}
1398		1454
1399	op->map->dirty = true;	1455	op->map->dirty = true;
1400		1456
1401	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = ms.player ())	1457	if (object *pl = ms.player ())
		1458	//TODO: the floorbox prev/next might need updating
		1459	//esrv_send_item (pl, op);
		1460	//TODO: update floorbox to preserve ordering
		1461	if (pl->contr->ns)
1403	pl->contr->ns->floorbox_update ();	1462	pl->contr->ns->floorbox_update ();
1404		1463
1405	/* If this object glows, it may affect lighting conditions that are	1464	/* If this object glows, it may affect lighting conditions that are
1406	* visible to others on this map. But update_all_los is really	1465	* visible to others on this map. But update_all_los is really
1407	* an inefficient way to do this, as it means los for all players	1466	* an inefficient way to do this, as it means los for all players
…		…
1450	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1451	*/	1510	*/
1452	void	1511	void
1453	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (const char *arch_string, object *op)
1454	{	1513	{
1455	object *tmp, *tmp1;
1456
1457	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1458		1515
1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461	tmp->destroy ();	1518	tmp->destroy (1);
1462		1519
1463	tmp1 = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (arch_string));
1464		1521
1465	tmp1->x = op->x;	1522	tmp->x = op->x;
1466	tmp1->y = op->y;	1523	tmp->y = op->y;
		1524
1467	insert_ob_in_map (tmp1, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
1468	}	1526	}
1469		1527
1470	object *	1528	object *
1471	object::insert_at (object *where, object *originator, int flags)	1529	object::insert_at (object *where, object *originator, int flags)
1472	{	1530	{
		1531	if (where->env)
		1532	return where->env->insert (this);
		1533	else
1473	return where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1535	}
1475		1536
1476	/*	1537	/*
1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1478	* is returned contains nr objects, and the remaining parts contains
1479	* the rest (or is removed and freed if that number is 0).
1480	* On failure, NULL is returned, and the reason put into the
1481	* global static errmsg array.
1482	*/
1483	object *
1484	get_split_ob (object *orig_ob, uint32 nr)
1485	{
1486	object *newob;
1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1488
1489	if (orig_ob->nrof < nr)
1490	{
1491	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1492	return NULL;
1493	}
1494
1495	newob = object_create_clone (orig_ob);
1496
1497	if ((orig_ob->nrof -= nr) < 1)
1498	orig_ob->destroy (1);
1499	else if (!is_removed)
1500	{
1501	if (orig_ob->env != NULL)
1502	sub_weight (orig_ob->env, orig_ob->weight * nr);
1503	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1504	{
1505	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1506	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1507	return NULL;
1508	}
1509	}
1510
1511	newob->nrof = nr;
1512
1513	return newob;
1514	}
1515
1516	/*
1517	* decrease_ob_nr(object, number) decreases a specified number from	1538	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1539	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1540	* is subsequently removed and freed.
1520	*	1541	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1542	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1543	*/
		1544	bool
		1545	object::decrease (sint32 nr)
		1546	{
		1547	if (!nr)
		1548	return true;
		1549
		1550	nr = min (nr, nrof);
		1551
		1552	nrof -= nr;
		1553
		1554	if (nrof)
		1555	{
		1556	adjust_weight (env, -weight * nr); // carrying == 0
		1557
		1558	if (object *pl = visible_to ())
		1559	esrv_update_item (UPD_NROF, pl, this);
		1560
		1561	return true;
		1562	}
		1563	else
		1564	{
		1565	destroy (1);
		1566	return false;
		1567	}
		1568	}
		1569
		1570	/*
		1571	* split(ob,nr) splits up ob into two parts. The part which
		1572	* is returned contains nr objects, and the remaining parts contains
		1573	* the rest (or is removed and returned if that number is 0).
		1574	* On failure, NULL is returned.
		1575	*/
1523	object *	1576	object *
1524	decrease_ob_nr (object *op, uint32 i)	1577	object::split (sint32 nr)
1525	{	1578	{
1526	object *tmp;	1579	int have = number_of ();
1527		1580
1528	if (i == 0) /* objects with op->nrof require this check */	1581	if (have < nr)
1529	return op;	1582	return 0;
1530		1583	else if (have == nr)
1531	if (i > op->nrof)
1532	i = op->nrof;
1533
1534	if (QUERY_FLAG (op, FLAG_REMOVED))
1535	op->nrof -= i;
1536	else if (op->env)
1537	{	1584	{
1538	/* is this object in the players inventory, or sub container
1539	* therein?
1540	*/
1541	tmp = op->in_player ();
1542	/* nope. Is this a container the player has opened?
1543	* If so, set tmp to that player.
1544	* IMO, searching through all the players will mostly
1545	* likely be quicker than following op->env to the map,
1546	* and then searching the map for a player.
1547	*/
1548	if (!tmp)
1549	for_all_players (pl)
1550	if (pl->ob->container == op->env)
1551	{
1552	tmp = pl->ob;
1553	break;
1554	}
1555
1556	if (i < op->nrof)
1557	{
1558	sub_weight (op->env, op->weight * i);
1559	op->nrof -= i;
1560	if (tmp)
1561	esrv_send_item (tmp, op);
1562	}
1563	else
1564	{
1565	op->remove ();	1585	remove ();
1566	op->nrof = 0;	1586	return this;
1567	if (tmp)
1568	esrv_del_item (tmp->contr, op->count);
1569	}
1570	}	1587	}
1571	else	1588	else
1572	{	1589	{
1573	object *above = op->above;	1590	decrease (nr);
1574		1591
1575	if (i < op->nrof)	1592	object *op = deep_clone ();
1576	op->nrof -= i;	1593	op->nrof = nr;
1577	else
1578	{
1579	op->remove ();
1580	op->nrof = 0;
1581	}
1582
1583	/* Since we just removed op, op->above is null */
1584	for (tmp = above; tmp; tmp = tmp->above)
1585	if (tmp->type == PLAYER)
1586	{
1587	if (op->nrof)
1588	esrv_send_item (tmp, op);
1589	else
1590	esrv_del_item (tmp->contr, op->count);
1591	}
1592	}
1593
1594	if (op->nrof)
1595	return op;	1594	return op;
1596	else
1597	{
1598	op->destroy ();
1599	return 0;
1600	}
1601	}
1602
1603	/*
1604	* add_weight(object, weight) adds the specified weight to an object,
1605	* and also updates how much the environment(s) is/are carrying.
1606	*/
1607	void
1608	add_weight (object *op, signed long weight)
1609	{
1610	while (op != NULL)
1611	{
1612	if (op->type == CONTAINER)
1613	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1614
1615	op->carrying += weight;
1616	op = op->env;
1617	}	1595	}
1618	}	1596	}
1619		1597
1620	object *	1598	object *
1621	insert_ob_in_ob (object *op, object *where)	1599	insert_ob_in_ob (object *op, object *where)
…		…
1646	* be != op, if items are merged. -Tero	1624	* be != op, if items are merged. -Tero
1647	*/	1625	*/
1648	object *	1626	object *
1649	object::insert (object *op)	1627	object::insert (object *op)
1650	{	1628	{
1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1652	op->remove ();
1653
1654	if (op->more)	1629	if (op->more)
1655	{	1630	{
1656	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1631	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1657	return op;	1632	return op;
1658	}	1633	}
1659		1634
1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1635	op->remove ();
1661	CLEAR_FLAG (op, FLAG_REMOVED);	1636
		1637	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1662		1638
1663	if (op->nrof)	1639	if (op->nrof)
1664	{
1665	for (object *tmp = inv; tmp; tmp = tmp->below)	1640	for (object *tmp = inv; tmp; tmp = tmp->below)
1666	if (object::can_merge (tmp, op))	1641	if (object::can_merge (tmp, op))
1667	{	1642	{
1668	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1669	(client needs the original object) */	1644	(client needs the original object) */
1670	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1671	/* Weight handling gets pretty funky. Since we are adding to	1646
1672	* tmp->nrof, we need to increase the weight.	1647	if (object *pl = tmp->visible_to ())
1673	*/	1648	esrv_update_item (UPD_NROF, pl, tmp);
		1649
1674	add_weight (this, op->weight * op->nrof);	1650	adjust_weight (this, op->total_weight ());
1675	SET_FLAG (op, FLAG_REMOVED);	1651
1676	op->destroy (); /* free the inserted object */	1652	op->destroy (1);
1677	op = tmp;	1653	op = tmp;
1678	op->remove (); /* and fix old object's links */	1654	goto inserted;
1679	CLEAR_FLAG (op, FLAG_REMOVED);
1680	break;
1681	}	1655	}
1682		1656
1683	/* I assume combined objects have no inventory
1684	* We add the weight - this object could have just been removed
1685	* (if it was possible to merge). calling remove_ob will subtract
1686	* the weight, so we need to add it in again, since we actually do
1687	* the linking below
1688	*/
1689	add_weight (this, op->weight * op->nrof);
1690	}
1691	else
1692	add_weight (this, (op->weight + op->carrying));
1693
1694	if (object *otmp = this->in_player ())
1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1696	otmp->update_stats ();
1697
1698	op->owner = 0; // its his/hers now. period.	1657	op->owner = 0; // it's his/hers now. period.
1699	op->map = 0;	1658	op->map = 0;
		1659	op->x = 0;
		1660	op->y = 0;
		1661
		1662	op->above = 0;
		1663	op->below = inv;
1700	op->env = this;	1664	op->env = this;
1701	op->above = 0;
1702	op->below = 0;
1703	op->x = op->y = 0;
1704		1665
		1666	if (inv)
		1667	inv->above = op;
		1668
		1669	inv = op;
		1670
		1671	op->flag [FLAG_REMOVED] = 0;
		1672
		1673	if (object *pl = op->visible_to ())
		1674	esrv_send_item (pl, op);
		1675
		1676	adjust_weight (this, op->total_weight ());
		1677
		1678	inserted:
1705	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1706	if (op->glow_radius && map)	1680	if (op->glow_radius && map && map->darkness)
1707	{
1708	#ifdef DEBUG_LIGHTS
1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1710	#endif /* DEBUG_LIGHTS */
1711	if (map->darkness)
1712	update_all_los (map, x, y);	1681	update_all_los (map, x, y);
1713	}
1714		1682
1715	/* Client has no idea of ordering so lets not bother ordering it here.	1683	// if this is a player's inventory, update stats
1716	* It sure simplifies this function...	1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1717	*/	1685	update_stats ();
1718	if (!inv)
1719	inv = op;
1720	else
1721	{
1722	op->below = inv;
1723	op->below->above = op;
1724	inv = op;
1725	}
1726		1686
1727	INVOKE_OBJECT (INSERT, this);	1687	INVOKE_OBJECT (INSERT, this);
1728		1688
1729	return op;	1689	return op;
1730	}	1690	}
…		…
1858	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1859	return NULL;	1819	return NULL;
1860	}	1820	}
1861		1821
1862	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1863	if (tmp->arch == at)	1823	if (tmp->arch->archname == at->archname)
1864	return tmp;	1824	return tmp;
1865		1825
1866	return NULL;	1826	return NULL;
1867	}	1827	}
1868		1828
…		…
1932	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
1933	*/	1893	*/
1934	object *	1894	object *
1935	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
1936	{	1896	{
1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1938	if (tmp->arch == at)	1898	if (tmp->arch->archname == at->archname)
1939	return tmp;	1899	return tmp;
1940		1900
1941	return NULL;	1901	return NULL;
1942	}	1902	}
1943		1903
…		…
1945	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
1946	*/	1906	*/
1947	void	1907	void
1948	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
1949	{	1909	{
1950	if (op->inv)
1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952	{	1911	{
1953	SET_FLAG (tmp, flag);	1912	SET_FLAG (tmp, flag);
1954	flag_inv (tmp, flag);	1913	flag_inv (tmp, flag);
1955	}	1914	}
1956	}	1915	}
1957		1916
1958	/*	1917	/*
1959	* deactivate recursively a flag on an object inventory	1918	* deactivate recursively a flag on an object inventory
1960	*/	1919	*/
1961	void	1920	void
1962	unflag_inv (object *op, int flag)	1921	unflag_inv (object *op, int flag)
1963	{	1922	{
1964	if (op->inv)
1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966	{	1924	{
1967	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
1968	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
1969	}	1927	}
1970	}	1928	}
1971		1929
1972	/*	1930	/*
1973	* find_free_spot(object, map, x, y, start, stop) will search for	1931	* find_free_spot(object, map, x, y, start, stop) will search for
1974	* a spot at the given map and coordinates which will be able to contain	1932	* a spot at the given map and coordinates which will be able to contain
…		…
1976	* to search (see the freearr_x/y[] definition).	1934	* to search (see the freearr_x/y[] definition).
1977	* It returns a random choice among the alternatives found.	1935	* It returns a random choice among the alternatives found.
1978	* start and stop are where to start relative to the free_arr array (1,9	1936	* start and stop are where to start relative to the free_arr array (1,9
1979	* does all 4 immediate directions). This returns the index into the	1937	* does all 4 immediate directions). This returns the index into the
1980	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1938	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1981	* Note - this only checks to see if there is space for the head of the
1982	* object - if it is a multispace object, this should be called for all
1983	* pieces.
1984	* Note2: This function does correctly handle tiled maps, but does not	1939	* Note: This function does correctly handle tiled maps, but does not
1985	* inform the caller. However, insert_ob_in_map will update as	1940	* inform the caller. However, insert_ob_in_map will update as
1986	* necessary, so the caller shouldn't need to do any special work.	1941	* necessary, so the caller shouldn't need to do any special work.
1987	* Note - updated to take an object instead of archetype - this is necessary	1942	* Note - updated to take an object instead of archetype - this is necessary
1988	* because arch_blocked (now ob_blocked) needs to know the movement type	1943	* because arch_blocked (now ob_blocked) needs to know the movement type
1989	* to know if the space in question will block the object. We can't use	1944	* to know if the space in question will block the object. We can't use
…		…
2010		1965
2011	/* However, often	1966	/* However, often
2012	* ob doesn't have any move type (when used to place exits)	1967	* ob doesn't have any move type (when used to place exits)
2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1968	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014	*/	1969	*/
2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1970	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2016	{	1971	{
2017	altern [index++] = i;	1972	altern [index++] = i;
2018	continue;	1973	continue;
2019	}	1974	}
2020		1975
…		…
2034		1989
2035	/* Note it is intentional that we check ob - the movement type of the	1990	/* Note it is intentional that we check ob - the movement type of the
2036	* head of the object should correspond for the entire object.	1991	* head of the object should correspond for the entire object.
2037	*/	1992	*/
2038	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1994	continue;
		1995
		1996	if (ob->blocked (m, pos.x, pos.y))
2039	continue;	1997	continue;
2040		1998
2041	altern [index++] = i;	1999	altern [index++] = i;
2042	}	2000	}
2043		2001
…		…
2354		2312
2355	/*	2313	/*
2356	* create clone from object to another	2314	* create clone from object to another
2357	*/	2315	*/
2358	object *	2316	object *
2359	object_create_clone (object *asrc)	2317	object::deep_clone ()
2360	{	2318	{
2361	object *dst = 0, *tmp, *src, *prev, *item;	2319	assert (("deep_clone called on non-head object", is_head ()));
2362		2320
2363	if (!asrc)	2321	object *dst = clone ();
2364	return 0;
2365		2322
2366	src = asrc->head_ ();	2323	object *prev = dst;
2367
2368	prev = 0;
2369	for (object *part = src; part; part = part->more)	2324	for (object *part = this->more; part; part = part->more)
2370	{	2325	{
2371	tmp = part->clone ();	2326	object *tmp = part->clone ();
2372	tmp->x -= src->x;
2373	tmp->y -= src->y;
2374
2375	if (!part->head)
2376	{
2377	dst = tmp;
2378	tmp->head = 0;
2379	}
2380	else
2381	tmp->head = dst;	2327	tmp->head = dst;
2382
2383	tmp->more = 0;
2384
2385	if (prev)
2386	prev->more = tmp;	2328	prev->more = tmp;
2387
2388	prev = tmp;	2329	prev = tmp;
2389	}	2330	}
2390		2331
2391	for (item = src->inv; item; item = item->below)	2332	for (object *item = inv; item; item = item->below)
2392	insert_ob_in_ob (object_create_clone (item), dst);	2333	insert_ob_in_ob (item->deep_clone (), dst);
2393		2334
2394	return dst;	2335	return dst;
2395	}	2336	}
2396		2337
2397	/* This returns the first object in who's inventory that	2338	/* This returns the first object in who's inventory that
…		…
2406	return tmp;	2347	return tmp;
2407		2348
2408	return 0;	2349	return 0;
2409	}	2350	}
2410		2351
2411	/* If ob has a field named key, return the link from the list,	2352	const shstr &
2412	* otherwise return NULL.	2353	object::kv_get (const shstr &key) const
2413	*
2414	* key must be a passed in shared string - otherwise, this won't
2415	* do the desired thing.
2416	*/
2417	key_value *
2418	get_ob_key_link (const object *ob, const char *key)
2419	{	2354	{
2420	for (key_value *link = ob->key_values; link; link = link->next)	2355	for (key_value *kv = key_values; kv; kv = kv->next)
2421	if (link->key == key)	2356	if (kv->key == key)
2422	return link;
2423
2424	return 0;
2425	}
2426
2427	/*
2428	* Returns the value of op has an extra_field for key, or NULL.
2429	*
2430	* The argument doesn't need to be a shared string.
2431	*
2432	* The returned string is shared.
2433	*/
2434	const char *
2435	get_ob_key_value (const object *op, const char *const key)
2436	{
2437	key_value *link;
2438	shstr_cmp canonical_key (key);
2439
2440	if (!canonical_key)
2441	{
2442	/* 1. There being a field named key on any object
2443	* implies there'd be a shared string to find.
2444	* 2. Since there isn't, no object has this field.
2445	* 3. Therefore, *this* object doesn't have this field.
2446	*/
2447	return 0;
2448	}
2449
2450	/* This is copied from get_ob_key_link() above -
2451	* only 4 lines, and saves the function call overhead.
2452	*/
2453	for (link = op->key_values; link; link = link->next)
2454	if (link->key == canonical_key)
2455	return link->value;	2357	return kv->value;
2456		2358
2457	return 0;	2359	return shstr_null;
2458	}	2360	}
2459		2361
2460	/*	2362	void
2461	* Updates the canonical_key in op to value.	2363	object::kv_set (const shstr &key, const shstr &value)
2462	*
2463	* canonical_key is a shared string (value doesn't have to be).
2464	*
2465	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2466	* keys.
2467	*
2468	* Returns TRUE on success.
2469	*/
2470	int
2471	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2472	{	2364	{
2473	key_value *field = NULL, *last = NULL;	2365	for (key_value *kv = key_values; kv; kv = kv->next)
2474		2366	if (kv->key == key)
2475	for (field = op->key_values; field != NULL; field = field->next)
2476	{
2477	if (field->key != canonical_key)
2478	{	2367	{
2479	last = field;	2368	kv->value = value;
2480	continue;	2369	return;
2481	}	2370	}
2482		2371
2483	if (value)	2372	key_value *kv = new key_value;
2484	field->value = value;	2373
2485	else	2374	kv->next = key_values;
		2375	kv->key = key;
		2376	kv->value = value;
		2377
		2378	key_values = kv;
		2379	}
		2380
		2381	void
		2382	object::kv_del (const shstr &key)
		2383	{
		2384	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2385	if ((*kvp)->key == key)
2486	{	2386	{
2487	/* Basically, if the archetype has this key set,	2387	key_value *kv = *kvp;
2488	* we need to store the null value so when we save	2388	*kvp = (*kvp)->next;
2489	* it, we save the empty value so that when we load,	2389	delete kv;
2490	* we get this value back again.	2390	return;
2491	*/
2492	if (get_ob_key_link (op->arch, canonical_key))
2493	field->value = 0;
2494	else
2495	{
2496	if (last)
2497	last->next = field->next;
2498	else
2499	op->key_values = field->next;
2500
2501	delete field;
2502	}
2503	}	2391	}
2504	return TRUE;
2505	}
2506	/* IF we get here, key doesn't exist */
2507
2508	/* No field, we'll have to add it. */
2509
2510	if (!add_key)
2511	return FALSE;
2512
2513	/* There isn't any good reason to store a null
2514	* value in the key/value list. If the archetype has
2515	* this key, then we should also have it, so shouldn't
2516	* be here. If user wants to store empty strings,
2517	* should pass in ""
2518	*/
2519	if (value == NULL)
2520	return TRUE;
2521
2522	field = new key_value;
2523
2524	field->key = canonical_key;
2525	field->value = value;
2526	/* Usual prepend-addition. */
2527	field->next = op->key_values;
2528	op->key_values = field;
2529
2530	return TRUE;
2531	}
2532
2533	/*
2534	* Updates the key in op to value.
2535	*
2536	* If add_key is FALSE, this will only update existing keys,
2537	* and not add new ones.
2538	* In general, should be little reason FALSE is ever passed in for add_key
2539	*
2540	* Returns TRUE on success.
2541	*/
2542	int
2543	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2544	{
2545	shstr key_ (key);
2546
2547	return set_ob_key_value_s (op, key_, value, add_key);
2548	}	2392	}
2549		2393
2550	object::depth_iterator::depth_iterator (object *container)	2394	object::depth_iterator::depth_iterator (object *container)
2551	: iterator_base (container)	2395	: iterator_base (container)
2552	{	2396	{
…		…
2602	{	2446	{
2603	char flagdesc[512];	2447	char flagdesc[512];
2604	char info2[256 * 4];	2448	char info2[256 * 4];
2605	char *p = info;	2449	char *p = info;
2606		2450
2607	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2608	count, uuid.seq,	2452	count,
		2453	uuid.c_str (),
2609	&name,	2454	&name,
2610	title ? "\",title:\"" : "",	2455	title ? "\",title:\"" : "",
2611	title ? (const char *)title : "",	2456	title ? (const char *)title : "",
2612	flag_desc (flagdesc, 512), type);	2457	flag_desc (flagdesc, 512), type);
2613		2458
2614	if (!this->flag[FLAG_REMOVED] && env)	2459	if (!flag[FLAG_REMOVED] && env)
2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616		2461
2617	if (map)	2462	if (map)
2618	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2463	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619		2464
…		…
2649	object::open_container (object *new_container)	2494	object::open_container (object *new_container)
2650	{	2495	{
2651	if (container == new_container)	2496	if (container == new_container)
2652	return;	2497	return;
2653		2498
2654	if (object *old_container = container)	2499	object *old_container = container;
		2500
		2501	if (old_container)
2655	{	2502	{
2656	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2503	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2657	return;	2504	return;
2658		2505
2659	#if 0	2506	#if 0
…		…
2661	if (object *closer = old_container->inv)	2508	if (object *closer = old_container->inv)
2662	if (closer->type == CLOSE_CON)	2509	if (closer->type == CLOSE_CON)
2663	closer->destroy ();	2510	closer->destroy ();
2664	#endif	2511	#endif
2665		2512
		2513	// make sure the container is available
		2514	esrv_send_item (this, old_container);
		2515
2666	old_container->flag [FLAG_APPLIED] = 0;	2516	old_container->flag [FLAG_APPLIED] = false;
2667	container = 0;	2517	container = 0;
2668		2518
		2519	// client needs item update to make it work, client bug requires this to be separate
2669	esrv_update_item (UPD_FLAGS, this, old_container);	2520	esrv_update_item (UPD_FLAGS, this, old_container);
		2521
2670	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2671	play_sound (sound_find ("chest_close"));	2523	play_sound (sound_find ("chest_close"));
2672	}	2524	}
2673		2525
2674	if (new_container)	2526	if (new_container)
…		…
2687	}	2539	}
2688	#endif	2540	#endif
2689		2541
2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2542	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2691		2543
		2544	// make sure the container is available, client bug requires this to be separate
		2545	esrv_send_item (this, new_container);
		2546
2692	new_container->flag [FLAG_APPLIED] = 1;	2547	new_container->flag [FLAG_APPLIED] = true;
2693	container = new_container;	2548	container = new_container;
2694		2549
		2550	// client needs flag change
2695	esrv_update_item (UPD_FLAGS, this, new_container);	2551	esrv_update_item (UPD_FLAGS, this, new_container);
2696	esrv_send_inventory (this, new_container);	2552	esrv_send_inventory (this, new_container);
2697	play_sound (sound_find ("chest_open"));	2553	play_sound (sound_find ("chest_open"));
2698	}	2554	}
		2555	// else if (!old_container->env && contr && contr->ns)
		2556	// contr->ns->floorbox_reset ();
2699	}	2557	}
2700		2558
2701	object *	2559	object *
2702	object::force_find (const shstr name)	2560	object::force_find (const shstr name)
2703	{	2561	{
…		…
2729		2587
2730	insert (force);	2588	insert (force);
2731	}	2589	}
2732		2590
2733	void	2591	void
2734	object::play_sound (faceidx sound) const	2592	object::play_sound (faceidx sound)
2735	{	2593	{
2736	if (!sound)	2594	if (!sound)
2737	return;	2595	return;
2738		2596
2739	if (flag [FLAG_REMOVED])	2597	if (flag [FLAG_REMOVED])

Diff Legend

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