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.198 by root, Mon Oct 22 02:52:48 2007 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 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 (!(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->nodrop
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	nodrop = 1;
		953
		954	alloc ();
		955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
		962	} freed_map; // freed objects are moved here to avoid crashes
		963
907	void	964	void
908	object::do_destroy ()	965	object::do_destroy ()
909	{	966	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	968	remove_button_link (this);
914		969
915	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	971	remove_friendly_object (this);
917		972
918	if (!flag [FLAG_REMOVED])
919	remove ();	973	remove ();
920		974
921	destroy_inv (true);	975	attachable::do_destroy ();
922		976
923	deactivate ();	977	deactivate ();
924	unlink ();	978	unlink ();
925		979
926	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
927		981
928	// hack to ensure that freed objects still have a valid map	982	// 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
941	freed_map->alloc ();
942	freed_map->in_memory = MAP_IN_MEMORY;
943	}
944
945	map = freed_map;	983	map = &freed_map;
946	x = 1;	984	x = 1;
947	y = 1;	985	y = 1;
948	}
949		986
950	if (more)	987	if (more)
951	{	988	{
952	more->destroy ();	989	more->destroy ();
953	more = 0;	990	more = 0;
…		…
966	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
967	{	1004	{
968	if (destroyed ())	1005	if (destroyed ())
969	return;	1006	return;
970		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
971	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
972	destroy_inv (false);
973		1016
974	if (is_head ())	1017	if (is_head ())
975	if (sound_destroy)	1018	if (sound_destroy)
976	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
977	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
978	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1021	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
979		1022
980	attachable::destroy ();	1023	attachable::destroy ();
981	}
982
983	/*
984	* sub_weight() recursively (outwards) subtracts a number from the
985	* weight of an object (and what is carried by it's environment(s)).
986	*/
987	void
988	sub_weight (object *op, signed long weight)
989	{
990	while (op != NULL)
991	{
992	if (op->type == CONTAINER)
993	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
994
995	op->carrying -= weight;
996	op = op->env;
997	}
998	}	1024	}
999		1025
1000	/* op->remove ():	1026	/* op->remove ():
1001	* This function removes the object op from the linked list of objects	1027	* This function removes the object op from the linked list of objects
1002	* which it is currently tied to. When this function is done, the	1028	* which it is currently tied to. When this function is done, the
…		…
1008	object::do_remove ()	1034	object::do_remove ()
1009	{	1035	{
1010	object *tmp, *last = 0;	1036	object *tmp, *last = 0;
1011	object *otmp;	1037	object *otmp;
1012		1038
1013	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
1014	return;	1040	return;
1015		1041
1016	SET_FLAG (this, FLAG_REMOVED);
1017	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
1018		1045
1019	if (more)	1046	if (more)
1020	more->remove ();	1047	more->remove ();
1021		1048
1022	/*	1049	/*
1023	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1024	* inventory.	1051	* inventory.
1025	*/	1052	*/
1026	if (env)	1053	if (env)
1027	{	1054	{
1028	if (nrof)	1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1029	sub_weight (env, weight * nrof);	1056	if (object *pl = visible_to ())
1030	else	1057	esrv_del_item (pl->contr, count);
1031	sub_weight (env, weight + carrying);	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
		1060	adjust_weight (env, -total_weight ());
		1061
		1062	// make sure cmov optimisation is applicable
		1063	*(above ? &above->below : &env->inv) = below;
		1064	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1065
		1066	above = 0;
		1067	below = 0;
		1068	env = 0;
		1069
		1070	/* we set up values so that it could be inserted into
		1071	* the map, but we don't actually do that - it is up
		1072	* to the caller to decide what we want to do.
		1073	*/
		1074	map = env->map;
		1075	x = env->x;
		1076	y = env->y;
1032		1077
1033	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
1034	* made to players inventory. If set, avoiding the call	1079	* made to players inventory. If set, avoiding the call
1035	* to save cpu time.	1080	* to save cpu time.
1036	*/	1081	*/
1037	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1038	otmp->update_stats ();	1083	otmp->update_stats ();
1039
1040	if (above)
1041	above->below = below;
1042	else
1043	env->inv = below;
1044
1045	if (below)
1046	below->above = above;
1047
1048	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.
1051	*/
1052	x = env->x, y = env->y;
1053	map = env->map;
1054	above = 0, below = 0;
1055	env = 0;
1056	}	1084	}
1057	else if (map)	1085	else if (map)
1058	{	1086	{
1059	if (type == PLAYER)
1060	{
1061	// leaving a spot always closes any open container on the ground
1062	if (container && !container->env)
1063	// this causes spurious floorbox updates, but it ensures
1064	// that the CLOSE event is being sent.
1065	close_container ();
1066
1067	--map->players;
1068	map->touch ();
1069	}
1070
1071	map->dirty = true;	1087	map->dirty = true;
1072	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
1073		1089
		1090	if (object *pl = ms.player ())
		1091	{
		1092	if (type == PLAYER) // this == pl(!)
		1093	{
		1094	// leaving a spot always closes any open container on the ground
		1095	if (container && !container->env)
		1096	// this causes spurious floorbox updates, but it ensures
		1097	// that the CLOSE event is being sent.
		1098	close_container ();
		1099
		1100	--map->players;
		1101	map->touch ();
		1102	}
		1103	else if (pl->container == this)
		1104	{
		1105	// removing a container should close it
		1106	close_container ();
		1107	}
		1108
		1109	esrv_del_item (pl->contr, count);
		1110	}
		1111
1074	/* link the object above us */	1112	/* link the object above us */
1075	if (above)	1113	// re-link, make sure compiler can easily use cmove
1076	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1077	else	1115	*(below ? &below->above : &ms.bot) = above;
1078	ms.top = below; /* we were top, set new top */
1079
1080	/* Relink the object below us, if there is one */
1081	if (below)
1082	below->above = above;
1083	else
1084	{
1085	/* Nothing below, which means we need to relink map object for this space
1086	* use translated coordinates in case some oddness with map tiling is
1087	* evident
1088	*/
1089	if (GET_MAP_OB (map, x, y) != this)
1090	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 ());
1091
1092	ms.bot = above; /* goes on above it. */
1093	}
1094		1116
1095	above = 0;	1117	above = 0;
1096	below = 0;	1118	below = 0;
1097		1119
1098	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
…		…
1107	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1108	* appropriately.	1130	* appropriately.
1109	*/	1131	*/
1110	pl->close_container ();	1132	pl->close_container ();
1111		1133
		1134	//TODO: the floorbox prev/next might need updating
		1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
1112	pl->contr->ns->floorbox_update ();	1138	pl->contr->ns->floorbox_update ();
1113	}	1139	}
1114		1140
1115	for (tmp = ms.bot; tmp; tmp = tmp->above)	1141	for (tmp = ms.bot; tmp; tmp = tmp->above)
1116	{	1142	{
1117	/* No point updating the players look faces if he is the object	1143	/* No point updating the players look faces if he is the object
…		…
1161	if (!top)	1187	if (!top)
1162	for (top = op; top && top->above; top = top->above)	1188	for (top = op; top && top->above; top = top->above)
1163	;	1189	;
1164		1190
1165	for (; top; top = top->below)	1191	for (; top; top = top->below)
1166	{
1167	if (top == op)
1168	continue;
1169
1170	if (object::can_merge (op, top))	1192	if (object::can_merge (op, top))
1171	{	1193	{
1172	top->nrof += op->nrof;	1194	top->nrof += op->nrof;
1173		1195
1174	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1196	if (object *pl = top->visible_to ())
1175	op->weight = 0; /* Don't want any adjustements now */	1197	esrv_update_item (UPD_NROF, pl, top);
		1198
		1199	op->weight = 0; // cancel the addition above
		1200	op->carrying = 0; // must be 0 already
		1201
1176	op->destroy ();	1202	op->destroy (1);
		1203
1177	return top;	1204	return top;
1178	}	1205	}
1179	}
1180		1206
1181	return 0;	1207	return 0;
1182	}	1208	}
1183		1209
1184	void	1210	void
…		…
1243	object *	1269	object *
1244	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1270	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1245	{	1271	{
1246	assert (!op->flag [FLAG_FREED]);	1272	assert (!op->flag [FLAG_FREED]);
1247		1273
1248	object *top, *floor = NULL;
1249
1250	op->remove ();	1274	op->remove ();
1251		1275
1252	/* Ideally, the caller figures this out. However, it complicates a lot	1276	/* Ideally, the caller figures this out. However, it complicates a lot
1253	* of areas of callers (eg, anything that uses find_free_spot would now	1277	* of areas of callers (eg, anything that uses find_free_spot would now
1254	* need extra work	1278	* need extra work
1255	*/	1279	*/
1256	if (!xy_normalise (m, op->x, op->y))	1280	if (!xy_normalise (m, op->x, op->y))
1257	{	1281	{
1258	op->destroy ();	1282	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1259	return 0;	1283	return 0;
1260	}	1284	}
1261		1285
1262	if (object *more = op->more)	1286	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))	1287	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1272	*/	1296	*/
1273	if (op->nrof && !(flag & INS_NO_MERGE))	1297	if (op->nrof && !(flag & INS_NO_MERGE))
1274	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1298	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1275	if (object::can_merge (op, tmp))	1299	if (object::can_merge (op, tmp))
1276	{	1300	{
		1301	// TODO: we atcually want to update tmp, not op,
		1302	// but some caller surely breaks when we return tmp
		1303	// from here :/
1277	op->nrof += tmp->nrof;	1304	op->nrof += tmp->nrof;
1278	tmp->destroy ();	1305	tmp->destroy (1);
1279	}	1306	}
1280		1307
1281	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1308	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1282	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1309	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1283		1310
…		…
1303	/* since *below* originator, no need to update top */	1330	/* since *below* originator, no need to update top */
1304	originator->below = op;	1331	originator->below = op;
1305	}	1332	}
1306	else	1333	else
1307	{	1334	{
		1335	object *top, *floor = NULL;
		1336
1308	top = ms.bot;	1337	top = ms.bot;
1309		1338
1310	/* If there are other objects, then */	1339	/* If there are other objects, then */
1311	if (top)	1340	if (top)
1312	{	1341	{
…		…
1411	}	1440	}
1412		1441
1413	op->map->dirty = true;	1442	op->map->dirty = true;
1414		1443
1415	if (object *pl = ms.player ())	1444	if (object *pl = ms.player ())
		1445	//TODO: the floorbox prev/next might need updating
		1446	//esrv_send_item (pl, op);
		1447	//TODO: update floorbox to preserve ordering
		1448	if (pl->contr->ns)
1416	pl->contr->ns->floorbox_update ();	1449	pl->contr->ns->floorbox_update ();
1417		1450
1418	/* If this object glows, it may affect lighting conditions that are	1451	/* If this object glows, it may affect lighting conditions that are
1419	* visible to others on this map. But update_all_los is really	1452	* visible to others on this map. But update_all_los is really
1420	* an inefficient way to do this, as it means los for all players	1453	* an inefficient way to do this, as it means los for all players
1421	* on the map will get recalculated. The players could very well	1454	* on the map will get recalculated. The players could very well
…		…
1463	* op is the object to insert it under: supplies x and the map.	1496	* op is the object to insert it under: supplies x and the map.
1464	*/	1497	*/
1465	void	1498	void
1466	replace_insert_ob_in_map (const char *arch_string, object *op)	1499	replace_insert_ob_in_map (const char *arch_string, object *op)
1467	{	1500	{
1468	object *tmp, *tmp1;
1469
1470	/* first search for itself and remove any old instances */	1501	/* first search for itself and remove any old instances */
1471		1502
1472	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1473	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1474	tmp->destroy ();	1505	tmp->destroy (1);
1475		1506
1476	tmp1 = arch_to_object (archetype::find (arch_string));	1507	object *tmp = arch_to_object (archetype::find (arch_string));
1477		1508
1478	tmp1->x = op->x;	1509	tmp->x = op->x;
1479	tmp1->y = op->y;	1510	tmp->y = op->y;
		1511
1480	insert_ob_in_map (tmp1, op->map, op, 0);	1512	insert_ob_in_map (tmp, op->map, op, 0);
1481	}	1513	}
1482		1514
1483	object *	1515	object *
1484	object::insert_at (object *where, object *originator, int flags)	1516	object::insert_at (object *where, object *originator, int flags)
1485	{	1517	{
		1518	if (where->env)
		1519	return where->env->insert (this);
		1520	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1521	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1522	}
1488		1523
1489	/*	1524	/*
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523
1524	newob->nrof = nr;
1525
1526	return newob;
1527	}
1528
1529	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1525	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1526	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1527	* is subsequently removed and freed.
1533	*	1528	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1529	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1530	*/
		1531	bool
		1532	object::decrease (sint32 nr)
		1533	{
		1534	if (!nr)
		1535	return true;
		1536
		1537	nr = min (nr, nrof);
		1538
		1539	nrof -= nr;
		1540
		1541	if (nrof)
		1542	{
		1543	adjust_weight (env, -weight * nr); // carrying == 0
		1544
		1545	if (object *pl = visible_to ())
		1546	esrv_update_item (UPD_NROF, pl, this);
		1547
		1548	return true;
		1549	}
		1550	else
		1551	{
		1552	destroy (1);
		1553	return false;
		1554	}
		1555	}
		1556
		1557	/*
		1558	* split(ob,nr) splits up ob into two parts. The part which
		1559	* is returned contains nr objects, and the remaining parts contains
		1560	* the rest (or is removed and returned if that number is 0).
		1561	* On failure, NULL is returned.
		1562	*/
1536	object *	1563	object *
1537	decrease_ob_nr (object *op, uint32 i)	1564	object::split (sint32 nr)
1538	{	1565	{
1539	object *tmp;	1566	int have = number_of ();
1540		1567
1541	if (i == 0) /* objects with op->nrof require this check */	1568	if (have < nr)
1542	return op;	1569	return 0;
1543		1570	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1571	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1572	remove ();
1579	op->nrof = 0;	1573	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1574	}
1584	else	1575	else
1585	{	1576	{
1586	object *above = op->above;	1577	decrease (nr);
1587		1578
1588	if (i < op->nrof)	1579	object *op = deep_clone ();
1589	op->nrof -= i;	1580	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1581	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}
1614	}
1615
1616	/*
1617	* add_weight(object, weight) adds the specified weight to an object,
1618	* and also updates how much the environment(s) is/are carrying.
1619	*/
1620	void
1621	add_weight (object *op, signed long weight)
1622	{
1623	while (op != NULL)
1624	{
1625	if (op->type == CONTAINER)
1626	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1627
1628	op->carrying += weight;
1629	op = op->env;
1630	}	1582	}
1631	}	1583	}
1632		1584
1633	object *	1585	object *
1634	insert_ob_in_ob (object *op, object *where)	1586	insert_ob_in_ob (object *op, object *where)
…		…
1659	* be != op, if items are merged. -Tero	1611	* be != op, if items are merged. -Tero
1660	*/	1612	*/
1661	object *	1613	object *
1662	object::insert (object *op)	1614	object::insert (object *op)
1663	{	1615	{
1664	if (!QUERY_FLAG (op, FLAG_REMOVED))
1665	op->remove ();
1666
1667	if (op->more)	1616	if (op->more)
1668	{	1617	{
1669	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1618	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1670	return op;	1619	return op;
1671	}	1620	}
1672		1621
1673	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1622	op->remove ();
1674	CLEAR_FLAG (op, FLAG_REMOVED);	1623
		1624	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1675		1625
1676	if (op->nrof)	1626	if (op->nrof)
1677	{
1678	for (object *tmp = inv; tmp; tmp = tmp->below)	1627	for (object *tmp = inv; tmp; tmp = tmp->below)
1679	if (object::can_merge (tmp, op))	1628	if (object::can_merge (tmp, op))
1680	{	1629	{
1681	/* return the original object and remove inserted object	1630	/* return the original object and remove inserted object
1682	(client needs the original object) */	1631	(client needs the original object) */
1683	tmp->nrof += op->nrof;	1632	tmp->nrof += op->nrof;
1684	/* Weight handling gets pretty funky. Since we are adding to	1633
1685	* tmp->nrof, we need to increase the weight.	1634	if (object *pl = tmp->visible_to ())
1686	*/	1635	esrv_update_item (UPD_NROF, pl, tmp);
		1636
1687	add_weight (this, op->weight * op->nrof);	1637	adjust_weight (this, op->total_weight ());
1688	SET_FLAG (op, FLAG_REMOVED);	1638
1689	op->destroy (); /* free the inserted object */	1639	op->destroy (1);
1690	op = tmp;	1640	op = tmp;
1691	op->remove (); /* and fix old object's links */	1641	goto inserted;
1692	CLEAR_FLAG (op, FLAG_REMOVED);
1693	break;
1694	}	1642	}
1695		1643
1696	/* I assume combined objects have no inventory
1697	* We add the weight - this object could have just been removed
1698	* (if it was possible to merge). calling remove_ob will subtract
1699	* the weight, so we need to add it in again, since we actually do
1700	* the linking below
1701	*/
1702	add_weight (this, op->weight * op->nrof);
1703	}
1704	else
1705	add_weight (this, (op->weight + op->carrying));
1706
1707	if (object *otmp = this->in_player ())
1708	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1709	otmp->update_stats ();
1710
1711	op->owner = 0; // its his/hers now. period.	1644	op->owner = 0; // it's his/hers now. period.
1712	op->map = 0;	1645	op->map = 0;
		1646	op->x = 0;
		1647	op->y = 0;
		1648
		1649	op->above = 0;
		1650	op->below = inv;
1713	op->env = this;	1651	op->env = this;
1714	op->above = 0;
1715	op->below = 0;
1716	op->x = op->y = 0;
1717		1652
		1653	if (inv)
		1654	inv->above = op;
		1655
		1656	inv = op;
		1657
		1658	op->flag [FLAG_REMOVED] = 0;
		1659
		1660	if (object *pl = op->visible_to ())
		1661	esrv_send_item (pl, op);
		1662
		1663	adjust_weight (this, op->total_weight ());
		1664
		1665	inserted:
1718	/* reset the light list and los of the players on the map */	1666	/* reset the light list and los of the players on the map */
1719	if (op->glow_radius && map)	1667	if (op->glow_radius && map && map->darkness)
1720	{
1721	#ifdef DEBUG_LIGHTS
1722	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1723	#endif /* DEBUG_LIGHTS */
1724	if (map->darkness)
1725	update_all_los (map, x, y);	1668	update_all_los (map, x, y);
1726	}
1727		1669
1728	/* Client has no idea of ordering so lets not bother ordering it here.	1670	// if this is a player's inventory, update stats
1729	* It sure simplifies this function...	1671	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1730	*/	1672	update_stats ();
1731	if (!inv)
1732	inv = op;
1733	else
1734	{
1735	op->below = inv;
1736	op->below->above = op;
1737	inv = op;
1738	}
1739		1673
1740	INVOKE_OBJECT (INSERT, this);	1674	INVOKE_OBJECT (INSERT, this);
1741		1675
1742	return op;	1676	return op;
1743	}	1677	}
…		…
1871	LOG (llevError, "Present_arch called outside map.\n");	1805	LOG (llevError, "Present_arch called outside map.\n");
1872	return NULL;	1806	return NULL;
1873	}	1807	}
1874		1808
1875	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1809	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1876	if (tmp->arch == at)	1810	if (tmp->arch->archname == at->archname)
1877	return tmp;	1811	return tmp;
1878		1812
1879	return NULL;	1813	return NULL;
1880	}	1814	}
1881		1815
…		…
1945	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
1946	*/	1880	*/
1947	object *	1881	object *
1948	present_arch_in_ob (const archetype *at, const object *op)	1882	present_arch_in_ob (const archetype *at, const object *op)
1949	{	1883	{
1950	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1951	if (tmp->arch == at)	1885	if (tmp->arch->archname == at->archname)
1952	return tmp;	1886	return tmp;
1953		1887
1954	return NULL;	1888	return NULL;
1955	}	1889	}
1956		1890
…		…
2018		1952
2019	/* However, often	1953	/* However, often
2020	* ob doesn't have any move type (when used to place exits)	1954	* ob doesn't have any move type (when used to place exits)
2021	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1955	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022	*/	1956	*/
2023	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1957	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024	{	1958	{
2025	altern [index++] = i;	1959	altern [index++] = i;
2026	continue;	1960	continue;
2027	}	1961	}
2028		1962
…		…
2365		2299
2366	/*	2300	/*
2367	* create clone from object to another	2301	* create clone from object to another
2368	*/	2302	*/
2369	object *	2303	object *
2370	object_create_clone (object *asrc)	2304	object::deep_clone ()
2371	{	2305	{
2372	object *dst = 0, *tmp, *src, *prev, *item;	2306	assert (("deep_clone called on non-head object", is_head ()));
2373		2307
2374	if (!asrc)	2308	object *dst = clone ();
2375	return 0;
2376		2309
2377	src = asrc->head_ ();	2310	object *prev = dst;
2378
2379	prev = 0;
2380	for (object *part = src; part; part = part->more)	2311	for (object *part = this->more; part; part = part->more)
2381	{	2312	{
2382	tmp = part->clone ();	2313	object *tmp = part->clone ();
2383	tmp->x -= src->x;
2384	tmp->y -= src->y;
2385
2386	if (!part->head)
2387	{
2388	dst = tmp;
2389	tmp->head = 0;
2390	}
2391	else
2392	tmp->head = dst;	2314	tmp->head = dst;
2393
2394	tmp->more = 0;
2395
2396	if (prev)
2397	prev->more = tmp;	2315	prev->more = tmp;
2398
2399	prev = tmp;	2316	prev = tmp;
2400	}	2317	}
2401		2318
2402	for (item = src->inv; item; item = item->below)	2319	for (object *item = inv; item; item = item->below)
2403	insert_ob_in_ob (object_create_clone (item), dst);	2320	insert_ob_in_ob (item->deep_clone (), dst);
2404		2321
2405	return dst;	2322	return dst;
2406	}	2323	}
2407		2324
2408	/* This returns the first object in who's inventory that	2325	/* This returns the first object in who's inventory that
…		…
2417	return tmp;	2334	return tmp;
2418		2335
2419	return 0;	2336	return 0;
2420	}	2337	}
2421		2338
2422	/* If ob has a field named key, return the link from the list,	2339	const shstr &
2423	* otherwise return NULL.	2340	object::kv_get (const shstr &key) const
2424	*
2425	* key must be a passed in shared string - otherwise, this won't
2426	* do the desired thing.
2427	*/
2428	key_value *
2429	get_ob_key_link (const object *ob, const char *key)
2430	{	2341	{
2431	for (key_value *link = ob->key_values; link; link = link->next)	2342	for (key_value *kv = key_values; kv; kv = kv->next)
2432	if (link->key == key)	2343	if (kv->key == key)
2433	return link;
2434
2435	return 0;
2436	}
2437
2438	/*
2439	* Returns the value of op has an extra_field for key, or NULL.
2440	*
2441	* The argument doesn't need to be a shared string.
2442	*
2443	* The returned string is shared.
2444	*/
2445	const char *
2446	get_ob_key_value (const object *op, const char *const key)
2447	{
2448	key_value *link;
2449	shstr_cmp canonical_key (key);
2450
2451	if (!canonical_key)
2452	{
2453	/* 1. There being a field named key on any object
2454	* implies there'd be a shared string to find.
2455	* 2. Since there isn't, no object has this field.
2456	* 3. Therefore, *this* object doesn't have this field.
2457	*/
2458	return 0;
2459	}
2460
2461	/* This is copied from get_ob_key_link() above -
2462	* only 4 lines, and saves the function call overhead.
2463	*/
2464	for (link = op->key_values; link; link = link->next)
2465	if (link->key == canonical_key)
2466	return link->value;	2344	return kv->value;
2467		2345
2468	return 0;	2346	return shstr_null;
2469	}	2347	}
2470		2348
2471	/*	2349	void
2472	* Updates the canonical_key in op to value.	2350	object::kv_set (const shstr &key, const shstr &value)
2473	*
2474	* canonical_key is a shared string (value doesn't have to be).
2475	*
2476	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2477	* keys.
2478	*
2479	* Returns TRUE on success.
2480	*/
2481	int
2482	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2483	{	2351	{
2484	key_value *field = NULL, *last = NULL;	2352	for (key_value *kv = key_values; kv; kv = kv->next)
2485		2353	if (kv->key == key)
2486	for (field = op->key_values; field != NULL; field = field->next)
2487	{
2488	if (field->key != canonical_key)
2489	{	2354	{
2490	last = field;	2355	kv->value = value;
2491	continue;	2356	return;
2492	}	2357	}
2493		2358
2494	if (value)	2359	key_value *kv = new key_value;
2495	field->value = value;	2360
2496	else	2361	kv->next = key_values;
		2362	kv->key = key;
		2363	kv->value = value;
		2364
		2365	key_values = kv;
		2366	}
		2367
		2368	void
		2369	object::kv_del (const shstr &key)
		2370	{
		2371	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2372	if ((*kvp)->key == key)
2497	{	2373	{
2498	/* Basically, if the archetype has this key set,	2374	key_value *kv = *kvp;
2499	* we need to store the null value so when we save	2375	*kvp = (*kvp)->next;
2500	* it, we save the empty value so that when we load,	2376	delete kv;
2501	* we get this value back again.	2377	return;
2502	*/
2503	if (get_ob_key_link (op->arch, canonical_key))
2504	field->value = 0;
2505	else
2506	{
2507	if (last)
2508	last->next = field->next;
2509	else
2510	op->key_values = field->next;
2511
2512	delete field;
2513	}
2514	}	2378	}
2515	return TRUE;
2516	}
2517	/* IF we get here, key doesn't exist */
2518
2519	/* No field, we'll have to add it. */
2520
2521	if (!add_key)
2522	return FALSE;
2523
2524	/* There isn't any good reason to store a null
2525	* value in the key/value list. If the archetype has
2526	* this key, then we should also have it, so shouldn't
2527	* be here. If user wants to store empty strings,
2528	* should pass in ""
2529	*/
2530	if (value == NULL)
2531	return TRUE;
2532
2533	field = new key_value;
2534
2535	field->key = canonical_key;
2536	field->value = value;
2537	/* Usual prepend-addition. */
2538	field->next = op->key_values;
2539	op->key_values = field;
2540
2541	return TRUE;
2542	}
2543
2544	/*
2545	* Updates the key in op to value.
2546	*
2547	* If add_key is FALSE, this will only update existing keys,
2548	* and not add new ones.
2549	* In general, should be little reason FALSE is ever passed in for add_key
2550	*
2551	* Returns TRUE on success.
2552	*/
2553	int
2554	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2555	{
2556	shstr key_ (key);
2557
2558	return set_ob_key_value_s (op, key_, value, add_key);
2559	}	2379	}
2560		2380
2561	object::depth_iterator::depth_iterator (object *container)	2381	object::depth_iterator::depth_iterator (object *container)
2562	: iterator_base (container)	2382	: iterator_base (container)
2563	{	2383	{
…		…
2613	{	2433	{
2614	char flagdesc[512];	2434	char flagdesc[512];
2615	char info2[256 * 4];	2435	char info2[256 * 4];
2616	char *p = info;	2436	char *p = info;
2617		2437
2618	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2438	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619	count, uuid.seq,	2439	count,
		2440	uuid.c_str (),
2620	&name,	2441	&name,
2621	title ? "\",title:\"" : "",	2442	title ? "\",title:\"" : "",
2622	title ? (const char *)title : "",	2443	title ? (const char *)title : "",
2623	flag_desc (flagdesc, 512), type);	2444	flag_desc (flagdesc, 512), type);
2624		2445
2625	if (!this->flag[FLAG_REMOVED] && env)	2446	if (!flag[FLAG_REMOVED] && env)
2626	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2627		2448
2628	if (map)	2449	if (map)
2629	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2450	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2630		2451
…		…
2660	object::open_container (object *new_container)	2481	object::open_container (object *new_container)
2661	{	2482	{
2662	if (container == new_container)	2483	if (container == new_container)
2663	return;	2484	return;
2664		2485
2665	if (object *old_container = container)	2486	object *old_container = container;
		2487
		2488	if (old_container)
2666	{	2489	{
2667	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2490	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2668	return;	2491	return;
2669		2492
2670	#if 0	2493	#if 0
…		…
2672	if (object *closer = old_container->inv)	2495	if (object *closer = old_container->inv)
2673	if (closer->type == CLOSE_CON)	2496	if (closer->type == CLOSE_CON)
2674	closer->destroy ();	2497	closer->destroy ();
2675	#endif	2498	#endif
2676		2499
		2500	// make sure the container is available
		2501	esrv_send_item (this, old_container);
		2502
2677	old_container->flag [FLAG_APPLIED] = 0;	2503	old_container->flag [FLAG_APPLIED] = false;
2678	container = 0;	2504	container = 0;
2679		2505
		2506	// client needs item update to make it work, client bug requires this to be separate
2680	esrv_update_item (UPD_FLAGS, this, old_container);	2507	esrv_update_item (UPD_FLAGS, this, old_container);
		2508
2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2682	play_sound (sound_find ("chest_close"));	2510	play_sound (sound_find ("chest_close"));
2683	}	2511	}
2684		2512
2685	if (new_container)	2513	if (new_container)
…		…
2698	}	2526	}
2699	#endif	2527	#endif
2700		2528
2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2529	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2702		2530
		2531	// make sure the container is available, client bug requires this to be separate
		2532	esrv_send_item (this, new_container);
		2533
2703	new_container->flag [FLAG_APPLIED] = 1;	2534	new_container->flag [FLAG_APPLIED] = true;
2704	container = new_container;	2535	container = new_container;
2705		2536
		2537	// client needs flag change
2706	esrv_update_item (UPD_FLAGS, this, new_container);	2538	esrv_update_item (UPD_FLAGS, this, new_container);
2707	esrv_send_inventory (this, new_container);	2539	esrv_send_inventory (this, new_container);
2708	play_sound (sound_find ("chest_open"));	2540	play_sound (sound_find ("chest_open"));
2709	}	2541	}
		2542	// else if (!old_container->env && contr && contr->ns)
		2543	// contr->ns->floorbox_reset ();
2710	}	2544	}
2711		2545
2712	object *	2546	object *
2713	object::force_find (const shstr name)	2547	object::force_find (const shstr name)
2714	{	2548	{
…		…
2740		2574
2741	insert (force);	2575	insert (force);
2742	}	2576	}
2743		2577
2744	void	2578	void
2745	object::play_sound (faceidx sound) const	2579	object::play_sound (faceidx sound)
2746	{	2580	{
2747	if (!sound)	2581	if (!sound)
2748	return;	2582	return;
2749		2583
2750	if (flag [FLAG_REMOVED])	2584	if (flag [FLAG_REMOVED])

Diff Legend

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